src/main/java/com/biutag/supervision/flow/action/ConfirmationCompletionAction.java

@@ -107,6 +107,15 @@ public class ConfirmationCompletionAction implements Action {
     public void updateNegative(String negativeId, ConfirmationCompletionData completionData) {
         Negative negative = negativeService.getById(negativeId);
         LocalDateTime now = LocalDateTime.now();
+        Long firstApproveTime = negative.getFirstApproveTime();
+        // 覆盖制：每次重新计算，超时锁定则不更新
+        if (TimeUtil.canUpdateApproveTime(firstApproveTime) && negative.getLatestProcessTime() != null) {
+            firstApproveTime = TimeUtil.calculateWorkdayDuration(negative.getLatestProcessTime(), now);
+        }
+        Long secondApprovalTime = negative.getSecondApprovalTime();
+        if (TimeUtil.canUpdateApproveTime(secondApprovalTime) && negative.getLatestProcessTime() != null) {
+            secondApprovalTime = TimeUtil.calculateWorkdayDuration(negative.getLatestProcessTime(), now);
+        }
         LambdaUpdateWrapper<Negative> updateWrapper = new LambdaUpdateWrapper<Negative>()
                 .eq(Negative::getId, negativeId)
                 .set(Negative::getProcessingStatus, ProcessingStatusEnum.completed.name())
@@ -118,21 +127,15 @@ public class ConfirmationCompletionAction implements Action {
                 .set(Negative::getFlowKey, FlowNodeEnum.COMPLETED.getKey())
                 .set(Negative::getUpdTime, LocalDateTime.now());
         if ("2".equals(negative.getApprovalFlow())){
-            // 只有超过24小时工作日才记录
+            // 超时锁定时，不更新审批时长字段
-            if (negative.getLatestProcessTime() != null) {
+            if (TimeUtil.canUpdateApproveTime(secondApprovalTime)) {
-                long newDuration = TimeUtil.calculateWorkdayDuration(negative.getLatestProcessTime(), now);
+                updateWrapper.set(Negative::getSecondApprovalTime, secondApprovalTime);
-                if (newDuration >= TimeUtil.SECONDS_OF_A_DAY) {
-                    updateWrapper.set(Negative::getSecondApprovalTime, newDuration);
-                }
             }
         }
         if ("3".equals(negative.getApprovalFlow())){
-            // 只有超过24小时工作日才记录
+            // 超时锁定时，不更新审批时长字段
-            if (negative.getLatestProcessTime() != null) {
+            if (TimeUtil.canUpdateApproveTime(firstApproveTime)) {
-                long newDuration = TimeUtil.calculateWorkdayDuration(negative.getLatestProcessTime(), now);
+                updateWrapper.set(Negative::getFirstApproveTime, firstApproveTime);
-                if (newDuration >= TimeUtil.SECONDS_OF_A_DAY) {
-                    updateWrapper.set(Negative::getFirstApproveTime, newDuration);
-                }
             }
         }
         negativeService.update(updateWrapper);

src/main/java/com/biutag/supervision/flow/action/FirstApproveReturnAction.java

@@ -46,23 +46,18 @@ public class FirstApproveReturnAction implements Action {
     public void updateNegative(String negativeId, String nextFlowKey) {
         Negative negative = negativeService.getById(negativeId);
         LocalDateTime now = LocalDateTime.now();
-
+        Long firstApproveTime = negative.getFirstApproveTime();
-        Long newFirstApproveTime = null;
+        // 覆盖制：每次重新计算，超时锁定则不更新
-        // 只有超过24小时工作日才记录
+        if (TimeUtil.canUpdateApproveTime(firstApproveTime) && negative.getLatestProcessTime() != null) {
-        if (negative.getLatestProcessTime() != null) {
+            firstApproveTime = TimeUtil.calculateWorkdayDuration(negative.getLatestProcessTime(), now);
-            long newDuration = TimeUtil.calculateWorkdayDuration(negative.getLatestProcessTime(), now);
-            if (newDuration >= TimeUtil.SECONDS_OF_A_DAY) {
-                newFirstApproveTime = newDuration;
-            }
         }
-
         negativeService.update(new LambdaUpdateWrapper<Negative>()
                 .set(Negative::getFlowKey, negative.getIsSecondHandle() ? FlowNodeEnum.VERIFY.getKey() : nextFlowKey)
                 .set(Negative::getUpdTime, LocalDateTime.now())
                 // 当前处理对象
                 .set(Negative::getCurrentProcessingObject, String.format("%s专班", negative.getHandleSecondDepartName()))
                 .eq(Negative::getId, negativeId)
-                .set(newFirstApproveTime != null, Negative::getFirstApproveTime, newFirstApproveTime)
+                .set(TimeUtil.canUpdateApproveTime(firstApproveTime), Negative::getFirstApproveTime, firstApproveTime)
                 .set(Negative::getLatestProcessTime, now));
     }
 

src/main/java/com/biutag/supervision/flow/action/SecondApproveAction.java

@@ -53,17 +53,20 @@ public class SecondApproveAction implements Action {
     public void updateNegative(String negativeId, String nextFlowKey) {
         Negative negative = negativeService.getById(negativeId);
         LocalDateTime now = LocalDateTime.now();
+        Long secondApprovalTime = negative.getSecondApprovalTime();
+        // 覆盖制：每次重新计算，超时锁定则不更新
+        if (TimeUtil.canUpdateApproveTime(secondApprovalTime) && negative.getLatestProcessTime() != null) {
+            secondApprovalTime = TimeUtil.calculateWorkdayDuration(negative.getLatestProcessTime(), now);
+        }
         LambdaUpdateWrapper<Negative> updateWrapper = new LambdaUpdateWrapper<Negative>()
                 .set(Negative::getFlowKey, nextFlowKey)
                 .set(Negative::getUpdTime, LocalDateTime.now())
                 .eq(Negative::getId, negativeId);
-        // 只有超过24小时工作日才记录
+        // 超时锁定时，不更新审批时长字段
-        if (negative.getLatestProcessTime() != null) {
+        if (TimeUtil.canUpdateApproveTime(secondApprovalTime)) {
-            long newDuration = TimeUtil.calculateWorkdayDuration(negative.getLatestProcessTime(), now);
+            updateWrapper.set(Negative::getSecondApprovalTime, secondApprovalTime);
-            if (newDuration >= TimeUtil.SECONDS_OF_A_DAY) {
-                updateWrapper.set(Negative::getSecondApprovalTime, newDuration);
-            }
         }
+//        Negative negative = negativeService.getById(negativeId);
         if (ApprovalFlowEnum.SECOND_APPROVAL.getValue().equals(negative.getApprovalFlow())) {
             updateWrapper.set(Negative::getFlowKey, FlowNodeEnum.COMPLETED.getKey())
                     .set(Negative::getProcessingStatus, ProcessingStatusEnum.completed.name())

src/main/java/com/biutag/supervision/flow/action/SecondApproveReturnAction.java

@@ -47,23 +47,18 @@ public class SecondApproveReturnAction implements Action {
     public void updateNegative(String negativeId, String nextFlowKey) {
         Negative negative = negativeService.getById(negativeId);
         LocalDateTime now = LocalDateTime.now();
-
+        Long secondApprovalTime = negative.getSecondApprovalTime();
-        Long newSecondApprovalTime = null;
+        // 覆盖制：每次重新计算，超时锁定则不更新
-        // 只有超过24小时工作日才记录
+        if (TimeUtil.canUpdateApproveTime(secondApprovalTime) && negative.getLatestProcessTime() != null) {
-        if (negative.getLatestProcessTime() != null) {
+            secondApprovalTime = TimeUtil.calculateWorkdayDuration(negative.getLatestProcessTime(), now);
-            long newDuration = TimeUtil.calculateWorkdayDuration(negative.getLatestProcessTime(), now);
-            if (newDuration >= TimeUtil.SECONDS_OF_A_DAY) {
-                newSecondApprovalTime = newDuration;
-            }
         }
-
         negativeService.update(new LambdaUpdateWrapper<Negative>()
                 .set(Negative::getFlowKey, nextFlowKey)
                 .set(Negative::getUpdTime, LocalDateTime.now())
                 .set(Negative::getProcessingStatus, ProcessingStatusEnum.processing.name())
                 // 当前处理对象
                 .set(Negative::getCurrentProcessingObject, String.format("%s专班", negative.getHandleThreeDepartName()))
-                .set(newSecondApprovalTime != null, Negative::getSecondApprovalTime, newSecondApprovalTime)
+                .set(TimeUtil.canUpdateApproveTime(secondApprovalTime), Negative::getSecondApprovalTime, secondApprovalTime)
                 .eq(Negative::getId, negativeId));
     }
 

src/main/resources/mapper/ComplaintCollectionMapper.xml

@@ -363,11 +363,9 @@
         FROM complaint_collection cc
         LEFT JOIN negative n ON n.id = cc.negative_id
         <where>
-            <!-- 至少有一个参数非空时，生成括号包裹的 OR 条件 -->
+            <choose>
-            <if test="(param.responderIdCode != null and param.responderIdCode != '')
+                <when test="(param.responderIdCode != null and param.responderIdCode != '') or (param.responderName != null and param.responderName != '') or (param.responderPhone != null and param.responderPhone != '')">
-                  or (param.responderName != null and param.responderName != '')
+                    1=1
-                  or (param.responderPhone != null and param.responderPhone != '')">
-                <trim prefix="(" suffix=")" prefixOverrides="OR">
                     <if test="param.responderIdCode != null and param.responderIdCode != ''">
                         OR cc.responder_id_code = #{param.responderIdCode}
                     </if>
@@ -377,14 +375,11 @@
                     <if test="param.responderPhone != null and param.responderPhone != ''">
                         OR n.contactPhone = #{param.responderPhone}
                     </if>
-                </trim>
+                </when>
-            </if>
+                <otherwise>
-            <!-- 三个参数全为空时，强制无结果 -->
-            <if test="(param.responderIdCode == null or param.responderIdCode == '')
-                  and (param.responderName == null or param.responderName == '')
-                  and (param.responderPhone == null or param.responderPhone == '')">
                     1=0
-            </if>
+                </otherwise>
+            </choose>
         </where>
         ORDER BY cc.create_time DESC
         LIMIT 100