From e0f9c904ba3f97af53f83e3a91ebf13f437b419d Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Sat, 31 Jan 2026 11:01:56 +0800
Subject: [PATCH] 优化流程
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderFlowServiceImpl.java | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 113 insertions(+), 0 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 01d917b..f7caeb7 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
@@ -18,14 +18,19 @@
import org.sxkj.gd.workorder.entity.GdWorkOrderFlowEntity;
import org.sxkj.gd.workorder.vo.GdWorkOrderFlowVO;
+import org.sxkj.gd.workorder.vo.WorkOrderStageVO;
+import org.sxkj.gd.workorder.vo.WorkOrderStatusDetailVO;
import org.sxkj.gd.workorder.excel.GdWorkOrderFlowExcel;
import org.sxkj.gd.workorder.mapper.GdWorkOrderFlowMapper;
import org.sxkj.gd.workorder.service.IGdWorkOrderFlowService;
+import org.sxkj.gd.workorder.enums.WorkOrderStatusEnum;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
import java.util.List;
+import java.util.ArrayList;
+import java.util.Arrays;
/**
* 流程记录表 服务实现类
@@ -51,4 +56,112 @@
return gdWorkOrderFlowList;
}
+ @Override
+ public List<WorkOrderStageVO> getHierarchicalFlow(Wrapper<GdWorkOrderFlowEntity> queryWrapper) {
+ // 1. 从数据库获取实际流程记录
+ List<GdWorkOrderFlowEntity> actualFlows = list(queryWrapper);
+
+ // 2. 构建分层结构
+ return buildHierarchicalFlow(actualFlows);
+ }
+
+ /**
+ * 构建分层结构的流程数据
+ *
+ * @param actualFlows 实际流程记录
+ * @return 分层结构的流程数据
+ */
+ private List<WorkOrderStageVO> buildHierarchicalFlow(List<GdWorkOrderFlowEntity> actualFlows) {
+ List<WorkOrderStageVO> stages = new ArrayList<>();
+
+ // 3. 遍历所有工单阶段
+ // 工单发布阶段
+ stages.add(buildStage(WorkOrderStatusEnum.STAGE_WORK_ORDER_RELEASE.getStageDesc(), Arrays.asList(
+ WorkOrderStatusEnum.PUBLISHING_ACCEPTING.getStageDesc(),
+ WorkOrderStatusEnum.PUBLISHING_REJECTING.getStageDesc()
+ ), actualFlows, "1"));
+
+ // 接单响应阶段
+ stages.add(buildStage(WorkOrderStatusEnum.STAGE_ORDER_RESPONSE.getStageDesc(), Arrays.asList(
+ WorkOrderStatusEnum.RESPONDING_TO_BE_SPLIT.getStageDesc(),
+ WorkOrderStatusEnum.RESPONDING_APPLY_CANCEL.getStageDesc(),
+ WorkOrderStatusEnum.RESPONDING_APPLY_MODIFY.getStageDesc(),
+ WorkOrderStatusEnum.RESPONDING_CANCELED.getStageDesc()
+ ), actualFlows, "2"));
+
+ // 执行中阶段
+ stages.add(buildStage(WorkOrderStatusEnum.STAGE_IN_EXECUTION.getStageDesc(), Arrays.asList(
+ WorkOrderStatusEnum.EXECUTING_TO_BE_COMPLETED.getStageDesc(),
+ WorkOrderStatusEnum.EXECUTING_NEGOTIATE_MODIFY.getStageDesc()
+ ), actualFlows, "3"));
+
+ // 完成待验阶段
+ stages.add(buildStage(WorkOrderStatusEnum.STAGE_COMPLETED_PENDING_INSPECTION.getStageDesc(), Arrays.asList(
+ WorkOrderStatusEnum.COMPLETED_TO_BE_INSPECTED.getStageDesc()
+ ), actualFlows, "4"));
+
+ // 验收通过阶段
+ stages.add(buildStage(WorkOrderStatusEnum.STAGE_ACCEPTED.getStageDesc(), Arrays.asList(
+ WorkOrderStatusEnum.ACCEPTED_TO_BE_SETTLED.getStageDesc()
+ ), actualFlows, "5"));
+
+ // 结算完成阶段
+ stages.add(buildStage(WorkOrderStatusEnum.STAGE_SETTLEMENT_COMPLETED.getStageDesc(), Arrays.asList(
+ WorkOrderStatusEnum.SETTLEMENT_COMPLETED.getStageDesc()
+ ), actualFlows, "6"));
+
+ return stages;
+ }
+
+ /**
+ * 构建单个阶段的流程数据
+ *
+ * @param stageName 阶段名称
+ * @param statusNames 状态名称列表
+ * @param actualFlows 实际流程记录
+ * @param flowStatus 流程状态码
+ * @return 阶段流程数据
+ */
+ private WorkOrderStageVO buildStage(String stageName, List<String> statusNames, List<GdWorkOrderFlowEntity> actualFlows, String flowStatus) {
+ List<WorkOrderStatusDetailVO> statuses = new ArrayList<>();
+
+ // 遍历该阶段的所有状态
+ for (String statusName : statusNames) {
+ // 查找是否有对应的实际流程记录
+ GdWorkOrderFlowEntity matchingFlow = findMatchingFlow(actualFlows, statusName, flowStatus);
+
+ if (matchingFlow != null) {
+ // 已到达的状态
+ statuses.add(new WorkOrderStatusDetailVO(
+ statusName,
+ true,
+ matchingFlow.getOperator(),
+ matchingFlow.getCreateTime()
+ ));
+ } else {
+ // 未到达的状态
+ statuses.add(new WorkOrderStatusDetailVO(statusName));
+ }
+ }
+
+ return new WorkOrderStageVO(stageName, statuses);
+ }
+
+ /**
+ * 查找匹配的流程记录
+ *
+ * @param actualFlows 实际流程记录
+ * @param statusName 状态名称
+ * @param flowStatus 流程状态码
+ * @return 匹配的流程记录，没有则返回null
+ */
+ 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;
+ }
+ }
+ return null;
+ }
+
}
--
Gitblit v1.9.3