From 3ff3de60e9274da9601fba4d2165fe46be4d7f07 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 22 Jun 2026 16:31:37 +0800
Subject: [PATCH] add : 吉安支持查询待验收的接口
---
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 4675cbc..4f4c6be 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
@@ -32,6 +32,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.sxkj.gd.workorder.entity.GdClueEventEntity;
import org.sxkj.gd.workorder.param.GdClueEventRejectParam;
+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;
@@ -76,16 +77,29 @@
@ApiOperationSupport(order = 2)
@ApiOperation(value = "列表", notes = "固定过滤本部门,onlyMine=1时仅我的数据")
public R<List<GdClueEventListVO>> list(@ApiParam(value = "是否仅我的数据,1为是,0为否")
- @RequestParam(value = "onlyMine", required = false, defaultValue = "0") Integer onlyMine) {
- List<GdClueEventListVO> list = gdClueEventService.listGdClueEventByDept(onlyMine);
+ @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);
+ }
+
+ /**
+ * 事件表(线索事件) 数量统计
+ */
+ @GetMapping("/count")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "数量统计", notes = "返回全部工单与我的工单数量")
+ public R<GdClueEventCountVO> count(@ApiParam(value = "事件编号关键字")
+ @RequestParam(value = "keyword", required = false) String keyword) {
+ return R.data(gdClueEventService.getGdClueEventCount(keyword));
}
/**
* 事件表(线索事件) 自定义分页
*/
@GetMapping("/page")
- @ApiOperationSupport(order = 3)
+ @ApiOperationSupport(order = 4)
@ApiOperation(value = "分页", notes = "传入gdClueEvent")
public R<IPage<GdClueEventVO>> page(GdClueEventVO gdClueEvent, Query query) {
IPage<GdClueEventVO> pages = gdClueEventService.selectGdClueEventPage(Condition.getPage(query), gdClueEvent);
@@ -133,13 +147,13 @@
}
/**
- * 事件驳回
+ * 事件处理
*/
- @PostMapping("/reject")
+ @PostMapping("/handle")
@ApiOperationSupport(order = 8)
- @ApiOperation(value = "驳回", notes = "传入事件ID")
- public R reject(@Valid @RequestBody GdClueEventRejectParam rejectParam) {
- return R.status(gdClueEventService.rejectClueEvent(rejectParam));
+ @ApiOperation(value = "处理", notes = "传入事件ID与事件状态")
+ public R handle(@Valid @RequestBody GdClueEventRejectParam rejectParam) {
+ return R.status(gdClueEventService.handleClueEvent(rejectParam));
}
// /**
--
Gitblit v1.9.3