From cdb2e3a30d1b3b246bb62310926a3e2d2c70ac2c Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 20 Jan 2026 21:42:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdClueEventController.java | 82 +++++++++++++++++++++++-----------------
1 files changed, 47 insertions(+), 35 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 8c60fd6..cdc07d6 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.conditions.query.QueryWrapper;
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.GdClueEventVO;
import org.sxkj.gd.workorder.excel.GdClueEventExcel;
import org.sxkj.gd.workorder.wrapper.GdClueEventWrapper;
@@ -76,8 +77,10 @@
@ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入gdClueEvent")
public R<IPage<GdClueEventVO>> list(@ApiIgnore @RequestParam Map<String, Object> gdClueEvent, Query query) {
- IPage<GdClueEventEntity> pages = gdClueEventService.page(Condition.getPage(query), Condition.getQueryWrapper(gdClueEvent, GdClueEventEntity.class));
- return R.data(GdClueEventWrapper.build().pageVO(pages));
+ QueryWrapper<GdClueEventEntity> queryWrapper = Condition.getQueryWrapper(gdClueEvent, GdClueEventEntity.class);
+ queryWrapper.lambda().eq(GdClueEventEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+ IPage<GdClueEventVO> pages = gdClueEventService.selectGdClueEventList(Condition.getPage(query), queryWrapper);
+ return R.data(pages);
}
/**
@@ -90,26 +93,26 @@
IPage<GdClueEventVO> pages = gdClueEventService.selectGdClueEventPage(Condition.getPage(query), gdClueEvent);
return R.data(pages);
}
-
- /**
- * 事件表（线索事件） 新增
- */
- @PostMapping("/save")
- @ApiOperationSupport(order = 4)
- @ApiOperation(value = "新增", notes = "传入gdClueEvent")
- public R save(@Valid @RequestBody GdClueEventEntity gdClueEvent) {
- return R.status(gdClueEventService.save(gdClueEvent));
- }
-
- /**
- * 事件表（线索事件） 修改
- */
- @PostMapping("/update")
- @ApiOperationSupport(order = 5)
- @ApiOperation(value = "修改", notes = "传入gdClueEvent")
- public R update(@Valid @RequestBody GdClueEventEntity gdClueEvent) {
- return R.status(gdClueEventService.updateById(gdClueEvent));
- }
+//
+// /**
+// * 事件表（线索事件） 新增
+// */
+// @PostMapping("/save")
+// @ApiOperationSupport(order = 4)
+// @ApiOperation(value = "新增", notes = "传入gdClueEvent")
+// public R save(@Valid @RequestBody GdClueEventEntity gdClueEvent) {
+// return R.status(gdClueEventService.save(gdClueEvent));
+// }
+//
+// /**
+// * 事件表（线索事件） 修改
+// */
+// @PostMapping("/update")
+// @ApiOperationSupport(order = 5)
+// @ApiOperation(value = "修改", notes = "传入gdClueEvent")
+// public R update(@Valid @RequestBody GdClueEventEntity gdClueEvent) {
+// return R.status(gdClueEventService.updateById(gdClueEvent));
+// }
/**
* 事件表（线索事件） 新增或修改
@@ -131,21 +134,30 @@
return R.status(gdClueEventService.deleteLogic(Func.toLongList(ids)));
}
-
/**
- * 导出数据
+ * 事件驳回
*/
- @GetMapping("/export-gdClueEvent")
- @ApiOperationSupport(order = 9)
- @ApiOperation(value = "导出数据", notes = "传入gdClueEvent")
- public void exportGdClueEvent(@ApiIgnore @RequestParam Map<String, Object> gdClueEvent, BladeUser bladeUser, HttpServletResponse response) {
- QueryWrapper<GdClueEventEntity> queryWrapper = Condition.getQueryWrapper(gdClueEvent, GdClueEventEntity.class);
- //if (!AuthUtil.isAdministrator()) {
- // queryWrapper.lambda().eq(GdClueEvent::getTenantId, bladeUser.getTenantId());
- //}
- queryWrapper.lambda().eq(GdClueEventEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
- List<GdClueEventExcel> list = gdClueEventService.exportGdClueEvent(queryWrapper);
- ExcelUtil.export(response, "事件表（线索事件）数据" + DateUtil.time(), "事件表（线索事件）数据表", list, GdClueEventExcel.class);
+ @PostMapping("/reject")
+ @ApiOperationSupport(order = 8)
+ @ApiOperation(value = "驳回", notes = "传入事件ID")
+ public R reject(@Valid @RequestBody GdClueEventRejectParam rejectParam) {
+ return R.status(gdClueEventService.rejectClueEvent(rejectParam));
}
+// /**
+// * 导出数据
+// */
+// @GetMapping("/export-gdClueEvent")
+// @ApiOperationSupport(order = 9)
+// @ApiOperation(value = "导出数据", notes = "传入gdClueEvent")
+// public void exportGdClueEvent(@ApiIgnore @RequestParam Map<String, Object> gdClueEvent, BladeUser bladeUser, HttpServletResponse response) {
+// QueryWrapper<GdClueEventEntity> queryWrapper = Condition.getQueryWrapper(gdClueEvent, GdClueEventEntity.class);
+// //if (!AuthUtil.isAdministrator()) {
+// // queryWrapper.lambda().eq(GdClueEvent::getTenantId, bladeUser.getTenantId());
+// //}
+// queryWrapper.lambda().eq(GdClueEventEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+// List<GdClueEventExcel> list = gdClueEventService.exportGdClueEvent(queryWrapper);
+// ExcelUtil.export(response, "事件表（线索事件）数据" + DateUtil.time(), "事件表（线索事件）数据表", list, GdClueEventExcel.class);
+// }
+
}
--
Gitblit v1.9.3