From 2c7186835fc3e466e9218322403bc2e97cfb9a9a Mon Sep 17 00:00:00 2001
From: buaixuexideshitongxue <2936013465@qq.com>
Date: Thu, 8 Oct 2026 18:22:22 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../report/ReportFlowController.java          |  1 +
 .../resources/mapper/ReportProjectMapper.xml  | 21 +++++++++++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/biutag/supervision/controller/report/ReportFlowController.java b/src/main/java/com/biutag/supervision/controller/report/ReportFlowController.java
index 1db11ee..f354017 100644
--- a/src/main/java/com/biutag/supervision/controller/report/ReportFlowController.java
+++ b/src/main/java/com/biutag/supervision/controller/report/ReportFlowController.java
@@ -84,6 +84,7 @@ public class ReportFlowController {
         List<String> nodes = new ArrayList<>();
         nodes.add("进窗");
         nodes.add("退窗");
+        nodes.add("重新进窗");
         LambdaQueryWrapper<InformMessage> messages = new LambdaQueryWrapper<InformMessage>();
         messages.eq(InformMessage::getReportId,param.getId())
                 .in(InformMessage::getNode,nodes);
diff --git a/src/main/resources/mapper/ReportProjectMapper.xml b/src/main/resources/mapper/ReportProjectMapper.xml
index acdeae1..53c4d8a 100644
--- a/src/main/resources/mapper/ReportProjectMapper.xml
+++ b/src/main/resources/mapper/ReportProjectMapper.xml
@@ -54,13 +54,30 @@
             project.report_name as reportName,
             project.report_type as reportType,
             flow.report_code as work,
-            flow.areport_time as time,
+            <choose>
+                <when test="code == 'first'">
+                    <!-- 待办恢复后显示较新的流转/重新进窗时间，兼容缺失时间。 -->
+                    COALESCE(GREATEST(flow.areport_time, reentry.reentryTime),
+                             flow.areport_time, reentry.reentryTime) as time,
+                </when>
+                <otherwise>
+                    flow.areport_time as time,
+                </otherwise>
+            </choose>
             flow.approver_state as approverState,
             flow.report_link as flowCode,
             flow.report_id as warningId,
             (CASE WHEN flow.type = 'warning' THEN 1 ELSE 0 END) as isWarning
         FROM report_flow flow
         LEFT JOIN report_project project ON project.id = flow.report_id
+        <if test="code == 'first'">
+            LEFT JOIN (
+                SELECT report_id, MAX(crt_time) as reentryTime
+                FROM inform_message
+                WHERE node = '重新进窗'
+                GROUP BY report_id
+            ) reentry ON reentry.report_id = project.id
+        </if>
         <where>
             flow.is_init IS NULL
             AND project.delete_flag = 0
@@ -77,7 +94,7 @@
                 </if>
             </if>
         </where>
-        ORDER BY flow.areport_time DESC
+        ORDER BY time DESC
     </select>
 
     <select id="getProjectTabWorkVo" resultType="com.biutag.supervision.pojo.vo.work.ProjectTabWorkVo">