From e0acd710ff58336581bbfd037b1fee93f0dddc6d Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 27 Jan 2026 11:43:13 +0800
Subject: [PATCH] 查询优化
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 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 b55d756..4992c6b 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
@@ -52,6 +52,7 @@
import org.sxkj.gd.common.GdMultipartFileUtil;
import org.sxkj.resource.entity.Attach;
import org.sxkj.resource.feign.IAttachClient;
+import org.sxkj.system.cache.SysCache;
import org.sxkj.system.entity.Dept;
import org.sxkj.system.entity.User;
import org.sxkj.system.feign.ISysClient;
@@ -85,8 +86,8 @@
@Autowired
private IGdTaskResultService gdTaskResultService;
@Override
- public IPage<GdPatrolTaskVO> selectGdPatrolTaskPage(IPage<GdPatrolTaskVO> page, GdPatrolTaskPageParam gdPatrolTask, List<Long> deptIdList) {
- return page.setRecords(baseMapper.selectGdPatrolTaskPage(page, gdPatrolTask, deptIdList));
+ public IPage<GdPatrolTaskVO> selectGdPatrolTaskPage(IPage<GdPatrolTaskVO> page, GdPatrolTaskPageParam gdPatrolTask) {
+ return page.setRecords(baseMapper.selectGdPatrolTaskPage(page, gdPatrolTask, SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()))));
}
@@ -125,7 +126,7 @@
GdWorkOrderFlowEntity gdWorkOrderFlowEntity = new GdWorkOrderFlowEntity();
gdWorkOrderFlowEntity.setCreateUser(AuthUtil.getUserId());
gdWorkOrderFlowEntity.setWorkOrderId(gdPatrolTaskEntity.getId());
- gdWorkOrderFlowEntity.setFlowName("任务发布");
+ gdWorkOrderFlowEntity.setFlowName(PatrolTaskStatusEnum.PENDING_SIGNING.getStageDesc());
gdWorkOrderFlowEntity.setFlowDesc(AuthUtil.getUserName() + " " + DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss") + " 发布任务，等待接单");
gdWorkOrderFlowEntity.setOperator(AuthUtil.getUserName());
gdWorkOrderFlowEntity.setType(WorkOrderTypeEnum.PATROL_TASK.getValue());
@@ -236,7 +237,9 @@
boolean allSubTasksAudited = checkAllSubTasksStatus(subTasks, PatrolTaskStatusEnum.ACCEPTANCE_PASSED);
// 这里可以根据allSubTasksAudited的结果执行后续逻辑，比如更新工单状态等
if (allSubTasksAudited) {
- // 执行工单状态更新逻辑
+ // 1.验收通过,生成报告
+ exportPatrolReport(task.getWorkOrderId());
+ // 2.执行工单状态更新逻辑
return updateWorkOrderStatusAndFlow(task.getWorkOrderId(),
WorkOrderStatusEnum.ACCEPTED_TO_BE_SETTLED);
}
@@ -416,7 +419,7 @@
GdWorkOrderFlowEntity flowEntity = new GdWorkOrderFlowEntity();
flowEntity.setCreateUser(AuthUtil.getUserId());
flowEntity.setWorkOrderId(workOrderId);
- flowEntity.setFlowName(newStatus.getDesc());
+ flowEntity.setFlowName(newStatus.getStageDesc());
// 构建流转描述
String flowDesc = buildFlowDesc(newStatus, rejectReason);
@@ -517,6 +520,7 @@
attach.setAttachSize(reportFile.length());
attach.setExtension(FileUtil.getFileExtension(reportFile.getName()));
attach.setResultType(resultType);
+ attach.setPatrolTaskId(String.valueOf(taskEntity != null ? taskEntity.getId() : null));
Long createUser = taskEntity != null ? taskEntity.getCreateUser() : null;
Long updateUser = taskEntity != null ? taskEntity.getUpdateUser() : null;
Long createDept = taskEntity != null ? taskEntity.getCreateDept() : null;
--
Gitblit v1.9.3