Explorar o código

优化工单管理

zengy hai 1 semana
pai
achega
4fa26a4b09

+ 5 - 2
pipe-network-service/zksy-system/src/main/java/com/zksy/ops/service/impl/WorkOrderServiceImpl.java

@@ -474,8 +474,11 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
             throw new ServiceException("当前工单状态不允许处置");
         }
 
-        // 已接单 → 处理中;处理中/延期中 保持原状态,支持多次处置
-        Integer targetStatus = Objects.equals(WorkOrderStatusEnum.ACCEPTED.getCode(), status) ? WorkOrderStatusEnum.PROCESSING.getCode() : status;
+        // 已接单/延期中 → 处理中;处理中保持原状态,支持多次处置
+        Integer targetStatus = (Objects.equals(WorkOrderStatusEnum.ACCEPTED.getCode(), status)
+                || Objects.equals(WorkOrderStatusEnum.DELAYING.getCode(), status))
+                ? WorkOrderStatusEnum.PROCESSING.getCode()
+                : status;
         boolean updated = transition(order.getOrderId(), status, targetStatus, null);
 
         syncHazardStatus(order, "整改中", dto.getContent());