From 56540ae16621a5756fd66e414ec74ea09eba1531 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 30 Jan 2026 10:47:44 +0800
Subject: [PATCH] 工单状态优化
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderServiceImpl.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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 3015ca2..30606f2 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
@@ -29,6 +29,7 @@
import org.sxkj.gd.workorder.service.IGdWorkOrderFlowService;
import org.sxkj.gd.workorder.service.IGdWorkOrderService;
import org.sxkj.gd.workorder.vo.GdWorkOrderVO;
+import org.sxkj.system.cache.SysCache;
import java.util.Date;
import java.util.List;
@@ -55,7 +56,11 @@
@Override
public IPage<GdWorkOrderVO> selectGdWorkOrderPage(IPage<GdWorkOrderVO> page, WorkOrderPageParam gdWorkOrder) {
- return page.setRecords(baseMapper.selectGdWorkOrderPage(page, gdWorkOrder));
+ if(gdWorkOrder.getIsQueryAll()){
+ List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
+ gdWorkOrder.setDeptList(deptList);
+ }
+ return page.setRecords(baseMapper.selectGdWorkOrderPage(page, gdWorkOrder));
}
@@ -194,10 +199,10 @@
workOrder.setServiceParty(AuthUtil.getNickName());
break;
case 6: // 不同意取消
- newStatusEnum = WorkOrderStatusEnum.RESPONDING_REJECT_CANCEL;
+ newStatusEnum = WorkOrderStatusEnum.RESPONDING_TO_BE_SPLIT;
break;
case 8: // 不同意修改
- newStatusEnum = WorkOrderStatusEnum.RESPONDING_REJECT_MODIFY;
+ newStatusEnum = WorkOrderStatusEnum.RESPONDING_TO_BE_SPLIT;
workOrder.setServiceParty(AuthUtil.getNickName());
break;
case 9: // 协商修改 --> 协商修改
--
Gitblit v1.9.3