工单状态优化

linwei

2026-01-30 17c0ce8a4db799aabf9ea1e12b284e24188efc3b

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

@@ -1,5 +1,7 @@
package org.sxkj.gd.workorder.service.impl;

import com.alibaba.druid.support.json.JSONUtils;
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;
@@ -56,11 +58,11 @@

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


@@ -112,18 +114,22 @@
               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 "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;
               // 生成快照
               GdWorkOrderEntity orderEntity = baseMapper.getWorkOrderByIdWithoutGeom(entity.getId());
               // 直接生成快照，无需处理geom字段
               entity.setFullSnapshot(JSON.toJSONString(orderEntity));
               break;
            case "25": // 响应中_拒绝修改 → 响应中_申请修改
               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;
            //    break;
         }
         saveResult = updateById(entity);
      } else {
@@ -221,11 +227,20 @@

      // 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. 保存流转记录