修复缺少字段
This commit is contained in:
@@ -50,8 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
|
||||
|
||||
<select id="selectListVoPage" resultType="com.ruoyi.oa.domain.vo.SysOaTaskVo">
|
||||
SELECT
|
||||
sot.task_id,
|
||||
SELECT sot.task_id,
|
||||
sot.project_id,
|
||||
sot.create_user_id,
|
||||
sot.worker_id,
|
||||
@@ -81,7 +80,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
sop.project_name,
|
||||
sop.project_num,
|
||||
su1.nick_name AS createUserNickName,
|
||||
su2.nick_name AS workerNickName
|
||||
su2.nick_name AS workerNickName,
|
||||
IF(
|
||||
sot.completed_time IS NULL,
|
||||
IF(
|
||||
-- 子查询取第一个未完成 item 的 end_time
|
||||
(
|
||||
SELECT a.end_time
|
||||
FROM sys_oa_task_item a
|
||||
WHERE a.task_id = sot.task_id
|
||||
AND a.completed_time IS NULL
|
||||
LIMIT 1
|
||||
) IS NOT NULL,
|
||||
-- 如果子查询有值,就用它来算超期天数
|
||||
DATEDIFF(
|
||||
NOW(),
|
||||
(
|
||||
SELECT a.end_time
|
||||
FROM sys_oa_task_item a
|
||||
WHERE a.task_id = sot.task_id
|
||||
AND a.completed_time IS NULL
|
||||
LIMIT 1
|
||||
)
|
||||
),
|
||||
-- 否则就退回到 sot.finish_time(如果它也可能为 NULL,可再加一层 IF 或 COALESCE)
|
||||
DATEDIFF(NOW(), sot.finish_time)
|
||||
),
|
||||
0
|
||||
) AS overDays
|
||||
FROM sys_oa_task sot
|
||||
LEFT JOIN sys_user su1 ON su1.user_id = sot.create_user_id
|
||||
LEFT JOIN sys_user su2 ON su2.user_id = sot.worker_id
|
||||
|
||||
Reference in New Issue
Block a user