From 8a116ffbb7e4e6af1502a841b811b8108cdeb359 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 04 Feb 2026 20:08:40 +0800
Subject: [PATCH] 工单优化
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java | 35 +++++++++++++++++++----------------
1 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java
index bf2dcba..2af4b63 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java
@@ -64,6 +64,7 @@
import java.io.File;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -96,7 +97,10 @@
@Override
public IPage<GdPatrolTaskVO> selectGdPatrolTaskPage(IPage<GdPatrolTaskVO> page, GdPatrolTaskPageParam gdPatrolTask) {
- List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
+ List<Long> deptList = new ArrayList<>();
+ if (!AuthUtil.isAdministrator()) {
+ deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
+ }
gdPatrolTask.setDeptList(deptList);
List<GdPatrolTaskVO> gdPatrolTaskVOS = baseMapper.selectGdPatrolTaskPage(page, gdPatrolTask);
return page.setRecords(gdPatrolTaskVOS);
@@ -476,7 +480,6 @@
}
-
/**
* 根据部门ID获取部门名称
*
@@ -668,20 +671,6 @@
}
if (StringUtil.isNotBlank(gdPatrolTaskVO.getAirportId())) {
param.setAirportId(gdPatrolTaskVO.getAirportId());
- // GdManageDeviceEntity device = null;
- // if (StringUtils.isNumeric(taskEntity.getAirportId())) {
- // device = gdManageDeviceService.getById(Long.valueOf(taskEntity.getDeviceId()));
- // }
- // if (device == null) {
- // device = gdManageDeviceService.lambdaQuery()
- // .eq(GdManageDeviceEntity::getAirportId, taskEntity.getDeviceId())
- // .one();
- // }
- // if (device != null && StringUtil.isNotBlank(device.getAirportId())) {
- // param.setAirportId(device.getAirportId());
- // } else {
- // param.setAirportId(taskEntity.getAirportId());
- // }
}
param.setStatus("待执行");
param.setTaskType("航线飞行");
@@ -692,4 +681,18 @@
public GdPatrolTaskVO getPatrolTaskDetail(GdPatrolTaskEntity gdPatrolTaskEntity) {
return baseMapper.getPatrolTaskDetail(gdPatrolTaskEntity);
}
+
+ @Override
+ public boolean updatePatrolTaskById(GdPatrolTaskEntity auditParam) {
+ GdPatrolTaskEntity patrolTaskEntity = getById(auditParam.getId());
+ // 保存巡查工单流转
+ saveWorkOrderFlow(patrolTaskEntity.getWorkOrderId(), PatrolTaskStatusEnum.PENDING_ACCEPTANCE, null, null);
+ // 保存工单流转
+ GdWorkOrderEntity workOrderEntity = baseMapper.getWorkOrderIdById(auditParam.getId(), WorkOrderStatusEnum.EXECUTING_TO_BE_COMPLETED.getCode());
+ // 工单流转
+ if (workOrderEntity == null) {
+ updateWorkOrderStatusAndFlow(patrolTaskEntity.getWorkOrderId(), WorkOrderStatusEnum.EXECUTING_TO_BE_COMPLETED);
+ }
+ return updateById(auditParam);
+ }
}
--
Gitblit v1.9.3