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 | 102 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 81 insertions(+), 21 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 f7caeb7..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
@@ -16,6 +16,7 @@
*/
package org.sxkj.gd.workorder.service.impl;
+import lombok.extern.slf4j.Slf4j;
import org.sxkj.gd.workorder.entity.GdWorkOrderFlowEntity;
import org.sxkj.gd.workorder.vo.GdWorkOrderFlowVO;
import org.sxkj.gd.workorder.vo.WorkOrderStageVO;
@@ -38,6 +39,7 @@
* @author lw
* @since 2026-01-14
*/
+@Slf4j
@Service
public class GdWorkOrderFlowServiceImpl extends BaseServiceImpl<GdWorkOrderFlowMapper, GdWorkOrderFlowEntity> implements IGdWorkOrderFlowService {
@@ -74,12 +76,20 @@
private List<WorkOrderStageVO> buildHierarchicalFlow(List<GdWorkOrderFlowEntity> actualFlows) {
List<WorkOrderStageVO> stages = new ArrayList<>();
+ // 确定当前阶段代码
+ String currentStageCode = "0"; // 默认未开始
+ if (actualFlows != null && !actualFlows.isEmpty()) {
+ // 获取最后一个流程的状态作为当前阶段
+ GdWorkOrderFlowEntity lastFlow = actualFlows.get(actualFlows.size() - 1);
+ currentStageCode = lastFlow.getFlowStatus();
+ }
+
// 3. 遍历所有工单阶段
// 工单发布阶段
stages.add(buildStage(WorkOrderStatusEnum.STAGE_WORK_ORDER_RELEASE.getStageDesc(), Arrays.asList(
WorkOrderStatusEnum.PUBLISHING_ACCEPTING.getStageDesc(),
WorkOrderStatusEnum.PUBLISHING_REJECTING.getStageDesc()
- ), actualFlows, "1"));
+ ), actualFlows, WorkOrderStatusEnum.STAGE_WORK_ORDER_RELEASE.getMaxCode(), currentStageCode));
// 接单响应阶段
stages.add(buildStage(WorkOrderStatusEnum.STAGE_ORDER_RESPONSE.getStageDesc(), Arrays.asList(
@@ -87,28 +97,28 @@
WorkOrderStatusEnum.RESPONDING_APPLY_CANCEL.getStageDesc(),
WorkOrderStatusEnum.RESPONDING_APPLY_MODIFY.getStageDesc(),
WorkOrderStatusEnum.RESPONDING_CANCELED.getStageDesc()
- ), actualFlows, "2"));
+ ), actualFlows, WorkOrderStatusEnum.STAGE_ORDER_RESPONSE.getMaxCode(), currentStageCode));
// 执行中阶段
stages.add(buildStage(WorkOrderStatusEnum.STAGE_IN_EXECUTION.getStageDesc(), Arrays.asList(
WorkOrderStatusEnum.EXECUTING_TO_BE_COMPLETED.getStageDesc(),
WorkOrderStatusEnum.EXECUTING_NEGOTIATE_MODIFY.getStageDesc()
- ), actualFlows, "3"));
+ ), actualFlows, WorkOrderStatusEnum.STAGE_IN_EXECUTION.getMaxCode(), currentStageCode));
// 完成待验阶段
stages.add(buildStage(WorkOrderStatusEnum.STAGE_COMPLETED_PENDING_INSPECTION.getStageDesc(), Arrays.asList(
WorkOrderStatusEnum.COMPLETED_TO_BE_INSPECTED.getStageDesc()
- ), actualFlows, "4"));
+ ), actualFlows, WorkOrderStatusEnum.STAGE_COMPLETED_PENDING_INSPECTION.getMaxCode(), currentStageCode));
// 验收通过阶段
stages.add(buildStage(WorkOrderStatusEnum.STAGE_ACCEPTED.getStageDesc(), Arrays.asList(
WorkOrderStatusEnum.ACCEPTED_TO_BE_SETTLED.getStageDesc()
- ), actualFlows, "5"));
+ ), actualFlows, WorkOrderStatusEnum.STAGE_ACCEPTED.getMaxCode(), currentStageCode));
// 结算完成阶段
stages.add(buildStage(WorkOrderStatusEnum.STAGE_SETTLEMENT_COMPLETED.getStageDesc(), Arrays.asList(
WorkOrderStatusEnum.SETTLEMENT_COMPLETED.getStageDesc()
- ), actualFlows, "6"));
+ ), actualFlows, WorkOrderStatusEnum.STAGE_SETTLEMENT_COMPLETED.getMaxCode(), currentStageCode));
return stages;
}
@@ -120,48 +130,98 @@
* @param statusNames 状态名称列表
* @param actualFlows 实际流程记录
* @param flowStatus 流程状态码
+ * @param currentStageCode 当前阶段代码
* @return 阶段流程数据
*/
- private WorkOrderStageVO buildStage(String stageName, List<String> statusNames, List<GdWorkOrderFlowEntity> actualFlows, String flowStatus) {
+ private WorkOrderStageVO buildStage(String stageName, List<String> statusNames, List<GdWorkOrderFlowEntity> actualFlows, String flowStatus, String currentStageCode) {
List<WorkOrderStatusDetailVO> statuses = new ArrayList<>();
+
+ // 临时列表，用于收集所有状态详情
+ List<WorkOrderStatusDetailVO> tempStatuses = new ArrayList<>();
// 遍历该阶段的所有状态
for (String statusName : statusNames) {
- // 查找是否有对应的实际流程记录
- GdWorkOrderFlowEntity matchingFlow = findMatchingFlow(actualFlows, statusName, flowStatus);
+ log.info("正在处理状态：{}", statusName);
+ // 查找所有对应的实际流程记录
+ List<GdWorkOrderFlowEntity> matchingFlows = findMatchingFlows(actualFlows, statusName, flowStatus);
- if (matchingFlow != null) {
- // 已到达的状态
- statuses.add(new WorkOrderStatusDetailVO(
+ if (!matchingFlows.isEmpty()) {
+ // 对匹配的流程记录按创建时间排序
+ matchingFlows.sort((f1, f2) -> {
+ if (f1.getCreateTime() != null && f2.getCreateTime() != null) {
+ return f1.getCreateTime().compareTo(f2.getCreateTime());
+ } else if (f1.getCreateTime() != null) {
+ return -1;
+ } else {
+ return 1;
+ }
+ });
+
+ // 无论阶段是否在当前阶段之后，只要有匹配的流程记录，就标记为已到达
+ for (GdWorkOrderFlowEntity matchingFlow : matchingFlows) {
+ tempStatuses.add(new WorkOrderStatusDetailVO(
statusName,
- true,
+ true,
matchingFlow.getOperator(),
matchingFlow.getCreateTime()
));
+ }
} else {
// 未到达的状态
- statuses.add(new WorkOrderStatusDetailVO(statusName));
+ // 如果阶段在当前阶段之后，则标记为未到达
+ // 如果阶段在当前阶段之前或等于，则也标记为未到达（因为没有匹配的流程记录）
+ tempStatuses.add(new WorkOrderStatusDetailVO(statusName));
}
}
+
+ // 分离已到达和未到达的状态
+ List<WorkOrderStatusDetailVO> reachedStatuses = new ArrayList<>();
+ List<WorkOrderStatusDetailVO> unreachedStatuses = new ArrayList<>();
+
+ for (WorkOrderStatusDetailVO status : tempStatuses) {
+ if (status.isReached()) {
+ reachedStatuses.add(status);
+ } else {
+ unreachedStatuses.add(status);
+ }
+ }
+
+ // 对已到达的状态按创建时间排序
+ reachedStatuses.sort((s1, s2) -> {
+ if (s1.getCreateTime() != null && s2.getCreateTime() != null) {
+ return s1.getCreateTime().compareTo(s2.getCreateTime());
+ } else if (s1.getCreateTime() != null) {
+ return -1;
+ } else {
+ return 1;
+ }
+ });
+
+ // 合并已到达和未到达的状态（已到达的在前，未到达的在后）
+ statuses.addAll(reachedStatuses);
+ statuses.addAll(unreachedStatuses);
return new WorkOrderStageVO(stageName, statuses);
}
/**
- * 查找匹配的流程记录
+ * 查找所有匹配的流程记录
*
* @param actualFlows 实际流程记录
* @param statusName 状态名称
* @param flowStatus 流程状态码
- * @return 匹配的流程记录，没有则返回null
+ * @return 匹配的流程记录列表，没有则返回空列表
*/
- private GdWorkOrderFlowEntity findMatchingFlow(List<GdWorkOrderFlowEntity> actualFlows, String statusName, String flowStatus) {
- for (GdWorkOrderFlowEntity flow : actualFlows) {
- if (flow.getFlowStatus().equals(flowStatus) && flow.getFlowName().equals(statusName)) {
- return flow;
+ private List<GdWorkOrderFlowEntity> findMatchingFlows(List<GdWorkOrderFlowEntity> actualFlows, String statusName, String flowStatus) {
+ List<GdWorkOrderFlowEntity> matchingFlows = new ArrayList<>();
+ if (actualFlows != null) {
+ for (GdWorkOrderFlowEntity flow : actualFlows) {
+ if (flow.getFlowStatus().equals(flowStatus) && flow.getFlowName().equals(statusName)) {
+ matchingFlows.add(flow);
+ }
}
}
- return null;
+ return matchingFlows;
}
}
--
Gitblit v1.9.3