From 08ddfad4530a014094c06fe68b8c2d9a0753403a Mon Sep 17 00:00:00 2001 From: linwei <872216696@qq.com> Date: Wed, 05 Aug 2026 14:09:29 +0800 Subject: [PATCH] fix(gd): 修复线索事件查询中的SQL语法错误 --- drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/IGdTaskResultService.java | 32 +++++++++++++++++++++++++------- 1 files changed, 25 insertions(+), 7 deletions(-) diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/IGdTaskResultService.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/IGdTaskResultService.java index fcebc3f..bd3e9c2 100644 --- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/IGdTaskResultService.java +++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/IGdTaskResultService.java @@ -17,11 +17,12 @@ package org.sxkj.gd.workorder.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import org.sxkj.gd.workorder.entity.GdTaskResultEntity; -import org.sxkj.gd.workorder.vo.GdTaskResultVO; -import org.sxkj.gd.workorder.excel.GdTaskResultExcel; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; +import org.sxkj.gd.workorder.dto.GdTaskResultDTO; +import org.sxkj.gd.workorder.entity.GdTaskResultEntity; +import org.sxkj.gd.workorder.excel.GdTaskResultExcel; +import org.sxkj.gd.workorder.vo.GdTaskResultVO; import javax.servlet.http.HttpServletResponse; import java.util.List; @@ -42,7 +43,14 @@ */ IPage<GdTaskResultVO> selectGdTaskResultPage(IPage<GdTaskResultVO> page, GdTaskResultVO gdTaskResult); - List<GdTaskResultVO> listByPatrolTaskId(Long patrolTaskId); + /** + * 根据巡查任务ID查询成果列表 + * + * @param patrolTaskId 巡查任务ID + * @param attachmentTypes 附件类型列表（可选，为null或空时查询全部） + * @return 成果列表 + */ + List<GdTaskResultVO> listByPatrolTaskId(Long patrolTaskId, List<Integer> attachmentTypes); /** @@ -54,11 +62,12 @@ List<GdTaskResultExcel> exportGdTaskResult(Wrapper<GdTaskResultEntity> queryWrapper); /** + * 批量保存成果数据 * - * @param gdTaskResultEntities - * @return + * @param gdTaskResults 成果DTO列表 + * @return 保存成功后的成果ID列表 */ - boolean saveBatchTaskResult(List<GdTaskResultEntity> gdTaskResultEntities); + boolean saveBatchTaskResult(List<GdTaskResultDTO> gdTaskResults); /** * 根据ID更新成果信息（更新所有字段） @@ -75,4 +84,13 @@ * @param response HTTP响应 */ void downloadResultFiles(String ids, HttpServletResponse response); + + /** + * 批量保存成果数据（包含ID） + * + * @param gdTaskResults 成果DTO列表 + * @return 保存成功后的成果ID列表 + * @return + */ + List<Long> batchSaveWithIds(List<GdTaskResultDTO> gdTaskResults); } -- Gitblit v1.9.3