From 769724ab08ba5695aff1a64ea8f48c9b1a4bd5da Mon Sep 17 00:00:00 2001 From: rain <1679827795@qq.com> Date: Fri, 23 Jan 2026 10:24:30 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderServiceImpl.java | 9 +++++++++ 1 files changed, 9 insertions(+), 0 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 15a88b8..f370e87 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 @@ -171,9 +171,11 @@ 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; @@ -183,18 +185,24 @@ 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; + case 11: // 结算 --> 结算完成 + newStatusEnum = WorkOrderStatusEnum.SETTLEMENT_COMPLETED; break; default: // 无效操作类型 return false; @@ -206,6 +214,7 @@ workOrder.setUpdateUser(AuthUtil.getUserId()); workOrder.setGeom(null); workOrder.setUpdateTime(now); + workOrder.setRejectReason(statusParam.getRejectReason()); boolean updateResult = updateById(workOrder); // 5. 保存流转记录 -- Gitblit v1.9.3