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 nodes = new ArrayList<>(); nodes.add("进窗"); nodes.add("退窗"); + nodes.add("重新进窗"); LambdaQueryWrapper messages = new LambdaQueryWrapper(); 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, + + + + COALESCE(GREATEST(flow.areport_time, reentry.reentryTime), + flow.areport_time, reentry.reentryTime) as time, + + + flow.areport_time as time, + + 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 + + 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 + flow.is_init IS NULL AND project.delete_flag = 0 @@ -77,7 +94,7 @@ - ORDER BY flow.areport_time DESC + ORDER BY time DESC