refactor(workorder): 重构工单状态聚合逻辑-只处理撤回任务状态

linwei

3 days ago 92dc5972adbd94d47c0e6501ce4a7b51af09e3c3

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

@@ -1,8 +1,10 @@
package org.sxkj.gd.workorder.service.impl;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.utils.AuthUtil;
@@ -10,10 +12,10 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.sxkj.common.constant.CommonConstant;
import org.sxkj.common.constant.WordOrderConstant;
import org.sxkj.common.utils.GeomUtils;
import org.sxkj.common.utils.OrderNumUtils;
import org.sxkj.gd.utils.GdGeoAddressUtil;
import org.sxkj.gd.workorder.entity.GdPatrolTaskEntity;
import org.sxkj.gd.workorder.entity.GdWorkOrderEntity;
import org.sxkj.gd.workorder.entity.GdWorkOrderFlowEntity;
@@ -31,9 +33,9 @@
import org.sxkj.gd.workorder.vo.GdWorkOrderVO;
import org.sxkj.system.cache.SysCache;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;

/**
 * 工单任务表 服务实现类
@@ -41,6 +43,7 @@
 * @author lw
 * @since 2026-01-14
 */
@Slf4j
@Service
public class GdWorkOrderServiceImpl extends BaseServiceImpl<GdWorkOrderMapper, GdWorkOrderEntity> implements IGdWorkOrderService {

@@ -50,17 +53,20 @@
   private IGdPatrolTaskService gdPatrolTaskService;

   @Override
   public GdWorkOrderEntity getWorkOrderDetail(GdWorkOrderEntity gdWorkOrder) {
   public GdWorkOrderVO getWorkOrderDetail(GdWorkOrderEntity gdWorkOrder) {
      return baseMapper.getWorkOrderDetail(gdWorkOrder);
   }

   @Override
   public IPage<GdWorkOrderVO> selectGdWorkOrderPage(IPage<GdWorkOrderVO> page, WorkOrderPageParam gdWorkOrder) {
      if(gdWorkOrder.getIsQueryAll()){
         List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
      if (gdWorkOrder.getIsQueryAll()) {
         List<Long> deptList = new ArrayList<>();
         if (!(AuthUtil.isAdministrator() || AuthUtil.isAdmin())) {
            deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
         }
         gdWorkOrder.setDeptList(deptList);
      }
       return page.setRecords(baseMapper.selectGdWorkOrderPage(page, gdWorkOrder));
      return page.setRecords(baseMapper.selectGdWorkOrderPage(page, gdWorkOrder));
   }


@@ -73,12 +79,6 @@
      return gdWorkOrderList;
   }

   /**
    * 保存工单任务表
    *
    * @param workOrderParam
    * @return
    */
   @Override
   @Transactional(rollbackFor = Exception.class)
   public boolean saveOrUpdateWorkOrder(WorkOrderAddParam workOrderParam) {
@@ -92,6 +92,13 @@
      }
      entity.setGeom(validatedGeom);

      // 从几何数据中提取中心点坐标，用于获取行政区划编码
      double[] centerCoords = GeomUtils.extractCenterPoint(validatedGeom);
      if (centerCoords == null || centerCoords.length < 2) {
         return false;
      }
      String countyCode = GdGeoAddressUtil.getTownCode(centerCoords[0], centerCoords[1]);
      entity.setAreaCode(countyCode);
      // 生成工单编号
      if (StringUtils.isBlank(entity.getWorkOrderCode())) {
         String timestamp = OrderNumUtils.initOrderNum(WordOrderConstant.ORDER_REDIS_KEY);
@@ -112,17 +119,13 @@
               entity.setWorkOrderStatus(WorkOrderStatusEnum.PUBLISHING_ACCEPTING.getCode());
               newStatusEnum = WorkOrderStatusEnum.PUBLISHING_ACCEPTING;
               break;
            case "24": // 响应中_拒绝取消 → 响应中_申请取消
               entity.setWorkOrderStatus(WorkOrderStatusEnum.RESPONDING_APPLY_CANCEL.getCode());
               newStatusEnum = WorkOrderStatusEnum.RESPONDING_APPLY_CANCEL;
               break;
            case "20": // 响应中_待拆分 → 响应中_申请修改
               entity.setWorkOrderStatus(WorkOrderStatusEnum.RESPONDING_APPLY_MODIFY.getCode());
               newStatusEnum = WorkOrderStatusEnum.RESPONDING_APPLY_MODIFY;
               break;
            case "25": // 响应中_拒绝修改 → 响应中_申请修改
               entity.setWorkOrderStatus(WorkOrderStatusEnum.RESPONDING_APPLY_MODIFY.getCode());
               newStatusEnum = WorkOrderStatusEnum.RESPONDING_APPLY_MODIFY;
               // 生成快照
               GdWorkOrderEntity orderEntity = baseMapper.getWorkOrderByIdWithoutGeom(entity.getId());
               // 直接生成快照，无需处理geom字段
               entity.setFullSnapshot(JSON.toJSONString(orderEntity));
               break;
         }
         saveResult = updateById(entity);
@@ -143,9 +146,11 @@
         flowEntity.setCreateUser(AuthUtil.getUserId());
         flowEntity.setWorkOrderId(entity.getId());
         flowEntity.setFlowName(newStatusEnum.getStageDesc());
         flowEntity.setFlowDesc(String.format("%s %s", AuthUtil.getUserName(), org.springblade.core.tool.utils.DateUtil.format(now, "yyyy-MM-dd HH:mm:ss")));
         flowEntity.setOperator(AuthUtil.getUserName());
         flowEntity.setFlowDesc(newStatusEnum.getDesc());
         flowEntity.setOperator(AuthUtil.getNickName());
         flowEntity.setType(WorkOrderTypeEnum.WORK_ORDER_TASK.getValue());
         flowEntity.setFlowStatus(newStatusEnum.getMaxCode());
         flowEntity.setWorkStatus(newStatusEnum.getCode());
         flowEntity.setAreaCode(entity.getAreaCode());
         flowEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
         return gdWorkOrderFlowService.save(flowEntity);
@@ -199,10 +204,10 @@
            workOrder.setServiceParty(AuthUtil.getNickName());
            break;
         case 6: // 不同意取消
            newStatusEnum = WorkOrderStatusEnum.RESPONDING_REJECT_CANCEL;
            newStatusEnum = WorkOrderStatusEnum.RESPONDING_TO_BE_SPLIT;
            break;
         case 8: // 不同意修改
            newStatusEnum = WorkOrderStatusEnum.RESPONDING_REJECT_MODIFY;
            newStatusEnum = WorkOrderStatusEnum.RESPONDING_TO_BE_SPLIT;
            workOrder.setServiceParty(AuthUtil.getNickName());
            break;
         case 9: // 协商修改 --> 协商修改
@@ -221,33 +226,46 @@

      // 4. 更新工单状态
      Date now = new Date();
      workOrder.setWorkOrderStatus(newStatusEnum.getCode());
      workOrder.setUpdateUser(AuthUtil.getUserId());
      workOrder.setUpdateTime(now);
      workOrder.setGeom(null);
      workOrder.setRejectReason(statusParam.getRejectReason());
      if (operationType == 8) {
         // 不同意修改，需要把快照回滚
         GdWorkOrderEntity snapshotEntity = (GdWorkOrderEntity) JSON.parseObject(workOrder.getFullSnapshot(), GdWorkOrderEntity.class);
         snapshotEntity.setId(workOrder.getId()); // 保持原ID
         snapshotEntity.setUpdateUser(AuthUtil.getUserId());
         snapshotEntity.setUpdateTime(now);
         workOrder = snapshotEntity;
      } else {
         workOrder.setWorkOrderStatus(newStatusEnum.getCode());
         workOrder.setUpdateUser(AuthUtil.getUserId());
         workOrder.setUpdateTime(now);
         workOrder.setGeom(null);
         workOrder.setRejectReason(statusParam.getRejectReason());
      }
      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());
         flowEntity.setWorkOrderId(workOrder.getId());
         flowEntity.setFlowName(newStatusEnum.getStageDesc());
         flowEntity.setFlowDesc(String.format("%s %s", AuthUtil.getUserName(), org.springblade.core.tool.utils.DateUtil.format(now, CommonConstant.YYYY_MM_DD_HH_MM_SS)));
         flowEntity.setOperator(AuthUtil.getUserName());
         flowEntity.setFlowDesc(newStatusEnum.getDesc());
         flowEntity.setOperator(AuthUtil.getNickName());
         flowEntity.setType(WorkOrderTypeEnum.WORK_ORDER_TASK.getValue());
         flowEntity.setFlowStatus(newStatusEnum.getMaxCode());
         flowEntity.setWorkStatus(newStatusEnum.getCode());
         flowEntity.setAreaCode(workOrder.getAreaCode());
         flowEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
         return gdWorkOrderFlowService.save(flowEntity);
      }
      // 6. 把待验收的都改为待签收状态
      if (operationType == 10) {
         boolean update = gdPatrolTaskService.update(Wrappers.<GdPatrolTaskEntity>lambdaUpdate()
            .set(GdPatrolTaskEntity::getTaskStatus, PatrolTaskStatusEnum.PENDING_SIGNING.getValue())
            .eq(GdPatrolTaskEntity::getWorkOrderId, workOrder.getId())
            .eq(GdPatrolTaskEntity::getTaskStatus, PatrolTaskStatusEnum.PENDING_ACCEPTANCE.getValue())
         );
      }

      return false;