From 66bfbdb9251c22ffa2b5f05595a76a3547a2f5eb Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 09 Feb 2026 11:00:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderFlowServiceImpl.java | 13 -------------
1 files changed, 0 insertions(+), 13 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderFlowServiceImpl.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderFlowServiceImpl.java
index d5bd587..b6c4ac5 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderFlowServiceImpl.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderFlowServiceImpl.java
@@ -136,18 +136,6 @@
private WorkOrderStageVO buildStage(String stageName, List<String> statusNames, List<GdWorkOrderFlowEntity> actualFlows, String flowStatus, String currentStageCode) {
List<WorkOrderStatusDetailVO> statuses = new ArrayList<>();
- // 检查该阶段是否在当前阶段之后
- // 注意：即使流程回退，之前到达过的阶段仍然需要显示其记录
- // 而是让所有阶段都能显示其已到达的状态，只对未到达的状态进行处理
- // boolean isStageAfterCurrent = false;
- // try {
- // int stageCode = Integer.parseInt(flowStatus);
- // int currentCode = Integer.parseInt(currentStageCode);
- // isStageAfterCurrent = stageCode > currentCode;
- // } catch (NumberFormatException e) {
- // // 如果转换失败，默认不视为在当前阶段之后
- // }
-
// 临时列表，用于收集所有状态详情
List<WorkOrderStatusDetailVO> tempStatuses = new ArrayList<>();
@@ -169,7 +157,6 @@
}
});
- // 为每个排序后的流程记录创建状态详情
// 无论阶段是否在当前阶段之后，只要有匹配的流程记录，就标记为已到达
for (GdWorkOrderFlowEntity matchingFlow : matchingFlows) {
tempStatuses.add(new WorkOrderStatusDetailVO(
--
Gitblit v1.9.3