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/GdWorkOrderServiceImpl.java | 26 ++++++++++----------------
1 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderServiceImpl.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderServiceImpl.java
index 082299c..b26169b 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderServiceImpl.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderServiceImpl.java
@@ -1,6 +1,5 @@
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;
@@ -35,7 +34,6 @@
import java.util.Date;
import java.util.List;
-import java.util.Objects;
/**
* 工单任务表 服务实现类
@@ -114,10 +112,6 @@
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;
@@ -126,10 +120,6 @@
// 直接生成快照，无需处理geom字段
entity.setFullSnapshot(JSON.toJSONString(orderEntity));
break;
- // case "25": // 响应中_拒绝修改 → 响应中_申请修改
- // entity.setWorkOrderStatus(WorkOrderStatusEnum.RESPONDING_APPLY_MODIFY.getCode());
- // newStatusEnum = WorkOrderStatusEnum.RESPONDING_APPLY_MODIFY;
- // break;
}
saveResult = updateById(entity);
} else {
@@ -149,9 +139,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);
@@ -249,19 +241,21 @@
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()
+ return gdPatrolTaskService.update(Wrappers.<GdPatrolTaskEntity>lambdaUpdate()
.set(GdPatrolTaskEntity::getTaskStatus, PatrolTaskStatusEnum.PENDING_SIGNING.getValue())
.eq(GdPatrolTaskEntity::getWorkOrderId, workOrder.getId())
- .eq(GdPatrolTaskEntity::getTaskStatus, PatrolTaskStatusEnum.PENDING_ACCEPTANCE.getValue())
+ .eq(GdPatrolTaskEntity::getTaskStatus, PatrolTaskStatusEnum.AUDIT_PASSED.getValue())
);
}
--
Gitblit v1.9.3