From 1510366fa12fafd5197ebcd8d7fbc45d2383218d Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 22 Jan 2026 15:49:27 +0800
Subject: [PATCH] 设备管理优化
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderServiceImpl.java | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 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 2e25613..85bb990 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
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import org.apache.commons.lang3.StringUtils;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.utils.AuthUtil;
@@ -13,8 +14,10 @@
import org.sxkj.common.constant.WordOrderConstant;
import org.sxkj.common.utils.GeomUtils;
import org.sxkj.common.utils.OrderNumUtils;
+import org.sxkj.gd.workorder.entity.GdPatrolTaskEntity;
import org.sxkj.gd.workorder.entity.GdWorkOrderEntity;
import org.sxkj.gd.workorder.entity.GdWorkOrderFlowEntity;
+import org.sxkj.gd.workorder.enums.PatrolTaskStatusEnum;
import org.sxkj.gd.workorder.enums.WorkOrderStatusEnum;
import org.sxkj.gd.workorder.enums.WorkOrderTypeEnum;
import org.sxkj.gd.workorder.excel.GdWorkOrderExcel;
@@ -22,6 +25,7 @@
import org.sxkj.gd.workorder.param.WorkOrderAddParam;
import org.sxkj.gd.workorder.param.WorkOrderPageParam;
import org.sxkj.gd.workorder.param.WorkOrderStatusParam;
+import org.sxkj.gd.workorder.service.IGdPatrolTaskService;
import org.sxkj.gd.workorder.service.IGdWorkOrderFlowService;
import org.sxkj.gd.workorder.service.IGdWorkOrderService;
import org.sxkj.gd.workorder.vo.GdWorkOrderVO;
@@ -41,6 +45,8 @@
@Autowired
private IGdWorkOrderFlowService gdWorkOrderFlowService;
+ @Autowired
+ private IGdPatrolTaskService gdPatrolTaskService;
@Override
public GdWorkOrderEntity getWorkOrderDetail(GdWorkOrderEntity gdWorkOrder) {
@@ -94,7 +100,7 @@
// 更新操作
entity.setUpdateUser(AuthUtil.getUserId());
entity.setUpdateTime(now);
-
+
// 状态转换：拒绝状态修改后自动转换为待处理状态
switch (entity.getWorkOrderStatus()) {
case "11": // 发布中_拒绝接单 → 发布中_接单中
@@ -103,6 +109,7 @@
case "24": // 响应中_拒绝取消 → 响应中_申请取消
entity.setWorkOrderStatus(WorkOrderStatusEnum.RESPONDING_APPLY_CANCEL.getCode());
break;
+ case "20": // 响应中_待拆分 → 响应中_申请修改
case "25": // 响应中_拒绝修改 → 响应中_申请修改
entity.setWorkOrderStatus(WorkOrderStatusEnum.RESPONDING_APPLY_MODIFY.getCode());
break;
@@ -157,16 +164,18 @@
if (currentStatus == null || !currentStatus.isAllowedOperation(operationType)) {
return false;
}
-
+ // 1接单，2拒接接单，3申请取消，4申请修改， 5同意取消 6不同意取消 7.同意修改 8.不同意修改 9.协商修改 10.同意修改
// 3. 确定新状态和流转名称
WorkOrderStatusEnum newStatusEnum;
switch (operationType) {
case 1: // 接单
case 7: // 同意修改
newStatusEnum = WorkOrderStatusEnum.RESPONDING_TO_BE_SPLIT;
+ workOrder.setServiceParty(AuthUtil.getNickName());
break;
case 2: // 拒接接单
newStatusEnum = WorkOrderStatusEnum.PUBLISHING_REJECTING;
+ workOrder.setServiceParty(AuthUtil.getNickName());
break;
case 3: // 申请取消
newStatusEnum = WorkOrderStatusEnum.RESPONDING_APPLY_CANCEL;
@@ -176,12 +185,21 @@
break;
case 5: // 同意取消
newStatusEnum = WorkOrderStatusEnum.RESPONDING_CANCELED;
+ workOrder.setServiceParty(AuthUtil.getNickName());
break;
case 6: // 不同意取消
newStatusEnum = WorkOrderStatusEnum.RESPONDING_REJECT_CANCEL;
break;
case 8: // 不同意修改
newStatusEnum = WorkOrderStatusEnum.RESPONDING_REJECT_MODIFY;
+ workOrder.setServiceParty(AuthUtil.getNickName());
+ break;
+ case 9: // 协商修改 --> 协商修改
+ newStatusEnum = WorkOrderStatusEnum.EXECUTING_NEGOTIATE_MODIFY;
+ workOrder.setServiceParty(AuthUtil.getNickName());
+ break;
+ case 10: // 同意协商修改 --> 待拆分
+ newStatusEnum = WorkOrderStatusEnum.RESPONDING_TO_BE_SPLIT;
break;
default: // 无效操作类型
return false;
@@ -191,7 +209,9 @@
Date now = new Date();
workOrder.setWorkOrderStatus(newStatusEnum.getCode());
workOrder.setUpdateUser(AuthUtil.getUserId());
+ workOrder.setGeom(null);
workOrder.setUpdateTime(now);
+ workOrder.setRejectReason(statusParam.getRejectReason());
boolean updateResult = updateById(workOrder);
// 5. 保存流转记录
@@ -207,6 +227,14 @@
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;
}
--
Gitblit v1.9.3