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/IGdClueEventService.java |   74 ++++++++++++++++++++++++++++++++++++
 1 files changed, 73 insertions(+), 1 deletions(-)

diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/IGdClueEventService.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/IGdClueEventService.java
index e431ec8..0c9fd57 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/IGdClueEventService.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/IGdClueEventService.java
@@ -20,6 +20,9 @@
 import org.sxkj.gd.workorder.entity.GdClueEventEntity;
 import org.sxkj.gd.workorder.param.GdClueEventDistributeParam;
 import org.sxkj.gd.workorder.param.GdClueEventRejectParam;
+import org.sxkj.gd.workorder.param.GdClueEventStatusUpdateParam;
+import org.sxkj.gd.workorder.vo.GdClueEventCountVO;
+import org.sxkj.gd.workorder.vo.GdClueEventListVO;
 import org.sxkj.gd.workorder.vo.GdClueEventVO;
 import org.sxkj.gd.workorder.excel.GdClueEventExcel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -43,6 +46,53 @@
 	IPage<GdClueEventVO> selectGdClueEventPage(IPage<GdClueEventVO> page, GdClueEventVO gdClueEvent);
 
 	/**
+	 * 列表查询
+	 *
+	 * @param page
+	 * @param queryWrapper
+	 * @return
+	 */
+	IPage<GdClueEventVO> selectGdClueEventList(IPage<GdClueEventVO> page, Wrapper<GdClueEventEntity> queryWrapper);
+
+	/**
+	 * 列表查询（不分页）
+	 *
+	 * @param onlyMine
+	 * @return
+	 */
+	List<GdClueEventListVO> listGdClueEventByDept(Integer onlyMine, String keyword);
+
+	/**
+	 * 列表查询（分页）
+	 *
+	 * @param page 分页对象
+	 * @param onlyMine 是否仅我的数据
+	 * @param keyword 事件编号关键字
+	 * @param eventStatus 事件状态
+	 * @param startTime 开始时间
+	 * @param endTime 结束时间
+	 * @param includeReturned 是否包含已退回数据，1为是，0为否
+	 * @return 分页数据
+	 */
+	IPage<GdClueEventListVO> pageGdClueEventByDept(IPage<GdClueEventListVO> page, Integer onlyMine, String keyword,
+			Integer eventStatus, String startTime, String endTime, Integer includeReturned);
+
+	/**
+	 * 详情查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	GdClueEventVO getGdClueEventDetail(Long id);
+
+	/**
+	 * 数量统计
+	 *
+	 * @return
+	 */
+	GdClueEventCountVO getGdClueEventCount(String keyword);
+
+	/**
 	 * 分发事件
 	 *
 	 * @param distributeParam
@@ -56,7 +106,7 @@
 	 * @param rejectParam
 	 * @return
 	 */
-	boolean rejectClueEvent(GdClueEventRejectParam rejectParam);
+	boolean handleClueEvent(GdClueEventRejectParam rejectParam);
 
 	/**
 	 * 导出数据
@@ -66,4 +116,26 @@
 	 */
 	List<GdClueEventExcel> exportGdClueEvent(Wrapper<GdClueEventEntity> queryWrapper);
 
+	/**
+	 * 对外接口新增或修改事件
+	 * <p>
+	 * 生成事件编号并保存或更新事件信息
+	 * </p>
+	 *
+	 * @param gdClueEvent 事件实体
+	 * @return 是否操作成功
+	 */
+	boolean saveOrUpdateExternal(GdClueEventEntity gdClueEvent);
+
+	/**
+	 * 更新事件状态
+	 * <p>
+	 * 必须符合状态流转矩阵规则，并插入状态流转记录
+	 * </p>
+	 *
+	 * @param updateParam 状态更新参数
+	 * @return 是否操作成功
+	 */
+	boolean updateEventStatus(GdClueEventStatusUpdateParam updateParam);
+
 }

--
Gitblit v1.9.3