From 616c44e8a49b607c6c9e7f80160766fa17ad935b Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 06 Feb 2026 20:42:21 +0800
Subject: [PATCH] 保存工单报错修改
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderServiceImpl.java | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 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 b26169b..204aeed 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
@@ -32,6 +32,7 @@
import org.sxkj.gd.workorder.vo.GdWorkOrderVO;
import org.sxkj.system.cache.SysCache;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -57,7 +58,10 @@
@Override
public IPage<GdWorkOrderVO> selectGdWorkOrderPage(IPage<GdWorkOrderVO> page, WorkOrderPageParam gdWorkOrder) {
if (gdWorkOrder.getIsQueryAll()) {
- List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
+ List<Long> deptList = new ArrayList<>();
+ if (!AuthUtil.isAdministrator()) {
+ deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
+ }
gdWorkOrder.setDeptList(deptList);
}
return page.setRecords(baseMapper.selectGdWorkOrderPage(page, gdWorkOrder));
@@ -143,7 +147,8 @@
flowEntity.setOperator(AuthUtil.getNickName());
flowEntity.setType(WorkOrderTypeEnum.WORK_ORDER_TASK.getValue());
flowEntity.setFlowStatus(newStatusEnum.getMaxCode());
- flowEntity.setWorkStatus(newStatusEnum.getCode());
+ // 将String类型的状态码转换为Integer类型
+ flowEntity.setWorkStatus(Integer.valueOf(newStatusEnum.getCode()));
flowEntity.setAreaCode(entity.getAreaCode());
flowEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
return gdWorkOrderFlowService.save(flowEntity);
@@ -235,7 +240,17 @@
}
boolean updateResult = updateById(workOrder);
- // 5. 保存流转记录
+ // 5. 把待验收的都改为待签收状态
+ if (operationType == 10) {
+ return gdPatrolTaskService.update(Wrappers.<GdPatrolTaskEntity>lambdaUpdate()
+ .set(GdPatrolTaskEntity::getTaskStatus, PatrolTaskStatusEnum.PENDING_SIGNING.getValue())
+ .eq(GdPatrolTaskEntity::getWorkOrderId, workOrder.getId())
+ .in(GdPatrolTaskEntity::getTaskStatus,
+ PatrolTaskStatusEnum.AUDIT_PASSED.getValue(),
+ PatrolTaskStatusEnum.PENDING_ACCEPTANCE.getValue())
+ );
+ }
+ // 6. 保存流转记录
if (updateResult) {
GdWorkOrderFlowEntity flowEntity = new GdWorkOrderFlowEntity();
flowEntity.setCreateUser(AuthUtil.getUserId());
@@ -245,18 +260,11 @@
flowEntity.setOperator(AuthUtil.getNickName());
flowEntity.setType(WorkOrderTypeEnum.WORK_ORDER_TASK.getValue());
flowEntity.setFlowStatus(newStatusEnum.getMaxCode());
- flowEntity.setWorkStatus(newStatusEnum.getCode());
+ // 将String类型的状态码转换为Integer类型
+ flowEntity.setWorkStatus(Integer.valueOf(newStatusEnum.getCode()));
flowEntity.setAreaCode(workOrder.getAreaCode());
flowEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
return gdWorkOrderFlowService.save(flowEntity);
- }
- // 6. 把待验收的都改为待签收状态
- if (operationType == 10) {
- return gdPatrolTaskService.update(Wrappers.<GdPatrolTaskEntity>lambdaUpdate()
- .set(GdPatrolTaskEntity::getTaskStatus, PatrolTaskStatusEnum.PENDING_SIGNING.getValue())
- .eq(GdPatrolTaskEntity::getWorkOrderId, workOrder.getId())
- .eq(GdPatrolTaskEntity::getTaskStatus, PatrolTaskStatusEnum.AUDIT_PASSED.getValue())
- );
}
return false;
--
Gitblit v1.9.3