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 | 4 ++++ 1 files changed, 4 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 253c812..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 @@ -201,6 +201,9 @@ case 10: // 同意协商修改 --> 待拆分 newStatusEnum = WorkOrderStatusEnum.RESPONDING_TO_BE_SPLIT; break; + case 11: // 结算 --> 结算完成 + newStatusEnum = WorkOrderStatusEnum.SETTLEMENT_COMPLETED; + break; default: // 无效操作类型 return false; } @@ -211,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