工单流程优化

linwei

2026-01-31 bcc36efe5fd3264625bb884e50c2f353fb052b61

工单流程优化

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/enums/PatrolTaskStatusEnum.java

@@ -13,13 +13,12 @@
 * @date 2026-01-19
 */
@Getter
@AllArgsConstructor
public enum PatrolTaskStatusEnum {

    /**
     * 待签收
     */
    PENDING_SIGNING("0", "待签收","待签收"),
    PENDING_SIGNING("0", "待签收","巡检任务拆分"),

    /**
     * 拒绝签收
@@ -34,7 +33,7 @@
    /**
     * 待审核
     */
    PENDING_AUDIT("3", "待审核","待审核"),
    PENDING_AUDIT("3", "待审核","待签收"),

    /**
     * 审核驳回
@@ -79,6 +78,18 @@
    @JsonValue
    private final String stageDesc;

    PatrolTaskStatusEnum(String stageDesc) {
        this.value = "";
        this.desc = "";
        this.stageDesc = stageDesc;
    }

    PatrolTaskStatusEnum(String value, String desc, String stageDesc) {
        this.value = value;
        this.desc = desc;
        this.stageDesc = stageDesc;
    }

    /**
     * 根据值获取对应的枚举
     *

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java

@@ -67,6 +67,8 @@
import java.io.IOException;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;

/**
 * 巡查任务表 服务实现类
@@ -94,11 +96,13 @@
    private JianXingtuApiService jianXingtuApiService;
    @Autowired
    private IGdManageDeviceService gdManageDeviceService;

    @Override
    public IPage<GdPatrolTaskVO> selectGdPatrolTaskPage(IPage<GdPatrolTaskVO> page, GdPatrolTaskPageParam gdPatrolTask) {
        List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
        gdPatrolTask.setDeptList(deptList);
        return page.setRecords(baseMapper.selectGdPatrolTaskPage(page, gdPatrolTask));
        List<GdPatrolTaskVO> gdPatrolTaskVOS = baseMapper.selectGdPatrolTaskPage(page, gdPatrolTask);
        return page.setRecords(gdPatrolTaskVOS);
    }


@@ -138,7 +142,7 @@
            gdWorkOrderFlowEntity.setCreateUser(AuthUtil.getUserId());
            gdWorkOrderFlowEntity.setWorkOrderId(gdPatrolTaskEntity.getId());
            gdWorkOrderFlowEntity.setFlowName(PatrolTaskStatusEnum.PENDING_SIGNING.getStageDesc());
            gdWorkOrderFlowEntity.setFlowDesc(AuthUtil.getUserName() + " " + DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss") + " 发布任务，等待接单");
            gdWorkOrderFlowEntity.setFlowDesc(PatrolTaskStatusEnum.PENDING_SIGNING.getStageDesc());
            gdWorkOrderFlowEntity.setOperator(AuthUtil.getNickName());
            gdWorkOrderFlowEntity.setType(WorkOrderTypeEnum.PATROL_TASK.getValue());
            gdWorkOrderFlowEntity.setAreaCode(gdPatrolTaskEntity.getAreaCode());
@@ -233,6 +237,21 @@
                // 执行工单状态更新逻辑
                return updateWorkOrderStatusAndFlow(task.getWorkOrderId(),
                    WorkOrderStatusEnum.EXECUTING_TO_BE_COMPLETED);
            }
        }
        if (auditStatus == 3) {
            // 查询同一个工单下的所有子任务
            List<GdPatrolTaskEntity> subTasks = list(Wrappers.<GdPatrolTaskEntity>lambdaQuery()
                .eq(GdPatrolTaskEntity::getWorkOrderId, task.getWorkOrderId()));

            boolean allSubTasksWithdrawn = subTasks.stream()
                .allMatch(item -> item.getTaskStatus().equals(PatrolTaskStatusEnum.WITHDRAWN.getValue()));

            // 示例：如果所有子任务都审核成功，可以更新工单状态为已完成
            if (allSubTasksWithdrawn) {
                // 执行工单状态更新逻辑
                return updateWorkOrderStatusAndFlow(task.getWorkOrderId(),
                    WorkOrderStatusEnum.RESPONDING_CANCELED);
            }
        }
        // 7. 验收拒绝
@@ -446,11 +465,7 @@
        flowEntity.setCreateUser(AuthUtil.getUserId());
        flowEntity.setWorkOrderId(workOrderId);
        flowEntity.setFlowName(newStatus.getStageDesc());

        // 构建流转描述
        String flowDesc = buildFlowDesc(newStatus, rejectReason);
        flowEntity.setFlowDesc(flowDesc);

        flowEntity.setFlowDesc(newStatus.getStageDesc());
        flowEntity.setOperator(AuthUtil.getNickName());
        flowEntity.setType(WorkOrderTypeEnum.PATROL_TASK.getValue());
        flowEntity.setAreaCode(areaCode);
@@ -463,28 +478,7 @@
        return true;
    }

    /**
     * 构建流转描述
     *
     * @param newStatus    新状态
     * @param rejectReason 拒绝原因
     * @return 流转描述
     */
    private String buildFlowDesc(PatrolTaskStatusEnum newStatus, String rejectReason) {
        String baseDesc = String.format("%s %s ",
                AuthUtil.getNickName(),
                DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"));

        // 拒绝类状态需要添加拒绝原因
        if (newStatus == PatrolTaskStatusEnum.REJECTED_SIGNING ||
            newStatus == PatrolTaskStatusEnum.AUDIT_REJECTED ||
            newStatus == PatrolTaskStatusEnum.REJECTED_ACCEPTANCE) {
            return String.format("%s%s：%s", baseDesc, newStatus.getDesc(), rejectReason);
        }

        // 其他状态直接使用枚举描述
        return baseDesc + newStatus.getDesc();
    }

    private String getDeptName(Long deptId) {
        if (deptId == null) {
@@ -606,6 +600,7 @@

    /**
     * 构建巡察任务推送的巡察任务信息
     *
     * @param gdPatrolTaskVO
     * @return
     */

 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, WorkOrderStatusEnum.STAGE_WORK_ORDER_RELEASE.getMaxCode()));
        ), 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, WorkOrderStatusEnum.STAGE_ORDER_RESPONSE.getMaxCode()));
        ), 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, WorkOrderStatusEnum.STAGE_IN_EXECUTION.getMaxCode()));
        ), 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, WorkOrderStatusEnum.STAGE_COMPLETED_PENDING_INSPECTION.getMaxCode()));
        ), actualFlows, WorkOrderStatusEnum.STAGE_COMPLETED_PENDING_INSPECTION.getMaxCode(), currentStageCode));

        // 验收通过阶段
        stages.add(buildStage(WorkOrderStatusEnum.STAGE_ACCEPTED.getStageDesc(), Arrays.asList(
                WorkOrderStatusEnum.ACCEPTED_TO_BE_SETTLED.getStageDesc()
        ), actualFlows, WorkOrderStatusEnum.STAGE_ACCEPTED.getMaxCode()));
        ), actualFlows, WorkOrderStatusEnum.STAGE_ACCEPTED.getMaxCode(), currentStageCode));

        // 结算完成阶段
        stages.add(buildStage(WorkOrderStatusEnum.STAGE_SETTLEMENT_COMPLETED.getStageDesc(), Arrays.asList(
                WorkOrderStatusEnum.SETTLEMENT_COMPLETED.getStageDesc()
        ), actualFlows, WorkOrderStatusEnum.STAGE_SETTLEMENT_COMPLETED.getMaxCode()));
        ), actualFlows, WorkOrderStatusEnum.STAGE_SETTLEMENT_COMPLETED.getMaxCode(), currentStageCode));

        return stages;
    }
@@ -120,48 +130,111 @@
     * @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<>();

        // 检查该阶段是否在当前阶段之后
        // 注意：即使流程回退，之前到达过的阶段仍然需要显示其记录
        // 而是让所有阶段都能显示其已到达的状态，只对未到达的状态进行处理
        // 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<>();

        // 遍历该阶段的所有状态
        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,
                        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) {
    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)) {
                return flow;
                    matchingFlows.add(flow);
            }
        }
        return null;
        }
        return matchingFlows;
    }

}

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderServiceImpl.java

@@ -235,7 +235,17 @@
        }
        boolean updateResult = updateById(workOrder);

        // 5. 保存流转记录
        // 5. 把待验收的都改为待签收状态
        if (operationType == 10) {
            return gdPatrolTaskService.update(Wrappers.<GdPatrolTaskEntity>lambdaUpdate()
                .set(GdPatrolTaskEntity::getTaskStatus, PatrolTaskStatusEnum.PENDING_SIGNING.getValue())
                .eq(GdPatrolTaskEntity::getWorkOrderId, workOrder.getId())
                .in(GdPatrolTaskEntity::getTaskStatus,
                    PatrolTaskStatusEnum.AUDIT_PASSED.getValue(),
                    PatrolTaskStatusEnum.PENDING_ACCEPTANCE.getValue())
            );
        }
        // 6. 保存流转记录
        if (updateResult) {
            GdWorkOrderFlowEntity flowEntity = new GdWorkOrderFlowEntity();
            flowEntity.setCreateUser(AuthUtil.getUserId());
@@ -249,14 +259,6 @@
            flowEntity.setAreaCode(workOrder.getAreaCode());
            flowEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
            return gdWorkOrderFlowService.save(flowEntity);
        }
        // 6. 把待验收的都改为待签收状态
        if (operationType == 10) {
            return gdPatrolTaskService.update(Wrappers.<GdPatrolTaskEntity>lambdaUpdate()
                .set(GdPatrolTaskEntity::getTaskStatus, PatrolTaskStatusEnum.PENDING_SIGNING.getValue())
                .eq(GdPatrolTaskEntity::getWorkOrderId, workOrder.getId())
                .eq(GdPatrolTaskEntity::getTaskStatus, PatrolTaskStatusEnum.AUDIT_PASSED.getValue())
            );
        }

        return false;

 drone-service/drone-gd/src/main/java/org/sxkj/gd/xingtu/JianXingtuApiService.java

@@ -1,6 +1,7 @@
package org.sxkj.gd.xingtu;

import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.StringUtil;
@@ -23,6 +24,7 @@
 * @Date 2026/1/26 15:22
 * @Version 1.0
 */
@Slf4j
@Service
public class JianXingtuApiService {

@@ -123,9 +125,10 @@
        }
        HttpHeaders headers = new HttpHeaders();
        headers.set("authorization", token);

        log.info("请求外部接口: {} {}", url, body);
        HttpEntity<Object> entity = new HttpEntity<>(body, headers);
        ResponseEntity<R> response = restTemplate.exchange(url, HttpMethod.POST, entity, R.class);
        log.info("响应外部接口: {}", response);
        if (response.getStatusCode().is2xxSuccessful()) {
            R responseBody = response.getBody();
            if (responseBody != null) {