From a86f51ae6319bbc1a6206e5c2e3f8c65eaf17217 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 30 Jul 2026 09:42:06 +0800
Subject: [PATCH] feat(workorder): 更新事件处理功能并扩展数据模型
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdClueEventController.java | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 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..fe689e8 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);
}
/**
@@ -169,7 +183,7 @@
*/
@PostMapping("/handle")
@ApiOperationSupport(order = 8)
- @ApiOperation(value = "处理", notes = "传入事件ID与事件状态")
+ @ApiOperation(value = "退回处理-（弃用）", notes = "传入事件ID与事件状态")
public R handle(@Valid @RequestBody GdClueEventRejectParam rejectParam) {
return R.status(gdClueEventService.handleClueEvent(rejectParam));
}
@@ -234,7 +248,7 @@
*/
@PostMapping("/updateStatus")
@ApiOperationSupport(order = 13)
- @ApiOperation(value = "更新事件状态", notes = "传入事件ID和目标状态，必须符合状态流转矩阵")
+ @ApiOperation(value = "更新事件状态（完成，处置中和已处置状态切换，退回）", notes = "传入事件ID和目标状态，必须符合状态流转矩阵")
public R updateStatus(@Valid @RequestBody GdClueEventStatusUpdateParam updateParam) {
return R.status(gdClueEventService.updateEventStatus(updateParam));
}
--
Gitblit v1.9.3