From b418d6928d3c1ac9419b174a61e7e67938481d44 Mon Sep 17 00:00:00 2001
From: 86156 <823267011@qq.com>
Date: Wed, 30 Jul 2025 21:10:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=BA=E5=B0=91=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/oa/SysOaTaskMapper.xml   | 90 ++++++++++++-------
 1 file changed, 58 insertions(+), 32 deletions(-)

diff --git a/ruoyi-oa/src/main/resources/mapper/oa/SysOaTaskMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/SysOaTaskMapper.xml
index d87c451..93cd403 100644
--- a/ruoyi-oa/src/main/resources/mapper/oa/SysOaTaskMapper.xml
+++ b/ruoyi-oa/src/main/resources/mapper/oa/SysOaTaskMapper.xml
@@ -50,38 +50,64 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="selectListVoPage" resultType="com.ruoyi.oa.domain.vo.SysOaTaskVo">
-        SELECT
-            sot.task_id,
-            sot.project_id,
-            sot.create_user_id,
-            sot.worker_id,
-            sot.task_title,
-            sot.task_type,
-            sot.task_grade,
-            sot.collaborator,
-            sot.finish_time,
-            sot.temp_time,
-            sot.begin_time,
-            sot.origin_finish_time,
-            sot.postponements,
-            sot.completed_time,
-            sot.rank_number,
-            sot.remark,
-            sot.task_rank,
-            sot.state,
-            sot.time_gap,
-            sot.status,
-            sot.accessory,
-            sot.create_by,
-            sot.create_time,
-            sot.update_by,
-            sot.update_time,
-            sot.del_flag,
-            sot.own_rank,
-            sop.project_name,
-            sop.project_num,
-            su1.nick_name AS createUserNickName,
-            su2.nick_name AS workerNickName
+        SELECT sot.task_id,
+               sot.project_id,
+               sot.create_user_id,
+               sot.worker_id,
+               sot.task_title,
+               sot.task_type,
+               sot.task_grade,
+               sot.collaborator,
+               sot.finish_time,
+               sot.temp_time,
+               sot.begin_time,
+               sot.origin_finish_time,
+               sot.postponements,
+               sot.completed_time,
+               sot.rank_number,
+               sot.remark,
+               sot.task_rank,
+               sot.state,
+               sot.time_gap,
+               sot.status,
+               sot.accessory,
+               sot.create_by,
+               sot.create_time,
+               sot.update_by,
+               sot.update_time,
+               sot.del_flag,
+               sot.own_rank,
+               sop.project_name,
+               sop.project_num,
+               su1.nick_name                        AS createUserNickName,
+               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