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/controller/GdClueEventController.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdClueEventController.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdClueEventController.java
index fe689e8..37d2082 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdClueEventController.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdClueEventController.java
@@ -93,13 +93,15 @@
@RequestParam(value = "startTime", required = false) String startTime,
@ApiParam(value = "结束时间（创建时间）")
@RequestParam(value = "endTime", required = false) String endTime,
+ @ApiParam(value = "是否包含已退回数据，1为是，0为否")
+ @RequestParam(value = "includeReturned", required = false, defaultValue = "0") Integer includeReturned,
@ApiParam(value = "分页参数") Query query) {
// 1. 构建分页对象
IPage<GdClueEventListVO> pages = Condition.getPage(query);
// 2. 查询分页数据
IPage<GdClueEventListVO> result = gdClueEventService.pageGdClueEventByDept(
- pages, onlyMine, keyword, eventStatus, startTime, endTime);
+ pages, onlyMine, keyword, eventStatus, startTime, endTime, includeReturned);
// 3. 返回分页结果
return R.data(result);
@@ -244,10 +246,20 @@
}
/**
+ * 查询状态时间线
+ */
+ @GetMapping("/statusTimeline")
+ @ApiOperationSupport(order = 13)
+ @ApiOperation(value = "查询状态时间线", notes = "传入事件ID，返回所有状态（包含已到达和未到达），并标识每个状态是否已到达")
+ public R<List<GdClueEventStatusFlowVO>> getStatusTimeline(@ApiParam(value = "事件ID", required = true) @RequestParam Long eventId) {
+ return R.data(gdClueEventStatusFlowService.getStatusTimeline(eventId));
+ }
+
+ /**
* 更新事件状态
*/
@PostMapping("/updateStatus")
- @ApiOperationSupport(order = 13)
+ @ApiOperationSupport(order = 14)
@ApiOperation(value = "更新事件状态（完成，处置中和已处置状态切换，退回）", notes = "传入事件ID和目标状态，必须符合状态流转矩阵")
public R updateStatus(@Valid @RequestBody GdClueEventStatusUpdateParam updateParam) {
return R.status(gdClueEventService.updateEventStatus(updateParam));
--
Gitblit v1.9.3