From e28a746eb7cbb23a3d7bbb78dba0ae3023e8215d Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 29 Jul 2026 18:07:17 +0800
Subject: [PATCH] feat(workorder): 添加线索事件分页列表功能并优化状态流转
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdClueEventController.java | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 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 96a2085..278f63b 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
@@ -78,17 +78,31 @@
}
/**
- * 事件表(线索事件) 列表
+ * 事件表(线索事件) 列表(分页)
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
- @ApiOperation(value = "列表", notes = "固定过滤本部门,onlyMine=1时仅我的数据")
- public R<List<GdClueEventListVO>> list(@ApiParam(value = "是否仅我的数据,1为是,0为否")
+ @ApiOperation(value = "列表(分页)", notes = "固定过滤本部门,onlyMine=1时仅我的数据")
+ public R<IPage<GdClueEventListVO>> list(@ApiParam(value = "是否仅我的数据,1为是,0为否")
@RequestParam(value = "onlyMine", required = false, defaultValue = "0") Integer onlyMine,
@ApiParam(value = "事件编号关键字")
- @RequestParam(value = "keyword", required = false) String keyword) {
- List<GdClueEventListVO> list = gdClueEventService.listGdClueEventByDept(onlyMine, keyword);
- return R.data(list);
+ @RequestParam(value = "keyword", required = false) String keyword,
+ @ApiParam(value = "事件状态:0待确认、1处置中、2已退回、3已处置、4已完成")
+ @RequestParam(value = "eventStatus", required = false) Integer eventStatus,
+ @ApiParam(value = "开始时间(创建时间)")
+ @RequestParam(value = "startTime", required = false) String startTime,
+ @ApiParam(value = "结束时间(创建时间)")
+ @RequestParam(value = "endTime", required = false) String endTime,
+ @ApiParam(value = "分页参数") Query query) {
+ // 1. 构建分页对象
+ IPage<GdClueEventListVO> pages = Condition.getPage(query);
+
+ // 2. 查询分页数据
+ IPage<GdClueEventListVO> result = gdClueEventService.pageGdClueEventByDept(
+ pages, onlyMine, keyword, eventStatus, startTime, endTime);
+
+ // 3. 返回分页结果
+ return R.data(result);
}
/**
--
Gitblit v1.9.3