From 6e2ffa951a5a08366e001a6bdec958eba9abcf99 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 19 Jan 2026 15:15:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdWorkOrderController.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdWorkOrderController.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdWorkOrderController.java
index c54cfc3..cf4ad84 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdWorkOrderController.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdWorkOrderController.java
@@ -32,7 +32,9 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.sxkj.gd.workorder.entity.GdWorkOrderEntity;
-import org.sxkj.gd.workorder.param.WorkOrderParam;
+import org.sxkj.gd.workorder.param.WorkOrderAddParam;
+import org.sxkj.gd.workorder.param.WorkOrderPageParam;
+import org.sxkj.gd.workorder.param.WorkOrderStatusParam;
import org.sxkj.gd.workorder.vo.GdWorkOrderVO;
import org.sxkj.gd.workorder.excel.GdWorkOrderExcel;
import org.sxkj.gd.workorder.wrapper.GdWorkOrderWrapper;
@@ -78,7 +80,7 @@
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入gdWorkOrder")
- public R<IPage<GdWorkOrderVO>> page(GdWorkOrderVO gdWorkOrder, Query query) {
+ public R<IPage<GdWorkOrderVO>> page(WorkOrderPageParam gdWorkOrder, Query query) {
IPage<GdWorkOrderVO> pages = gdWorkOrderService.selectGdWorkOrderPage(Condition.getPage(query), gdWorkOrder);
return R.data(pages);
}
@@ -86,12 +88,13 @@
/**
* 工单任务表 新增
*/
- @PostMapping("/submit")
+ @PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入gdWorkOrder")
- public R save(@Valid @RequestBody WorkOrderParam workOrderParam) {
- return R.status(gdWorkOrderService.saveOrUpdateWorkOrder(workOrderParam));
+ public R save(@Valid @RequestBody WorkOrderAddParam workOrderParam) {
+ return R.status(gdWorkOrderService.saveWorkOrder(workOrderParam));
}
+ //
/**
* 工单任务表 删除
@@ -103,12 +106,23 @@
return R.status(gdWorkOrderService.deleteLogic(Func.toLongList(ids)));
}
+ /**
+ * 处理工单状态变更（接单或拒接接单）
+ */
+ @PostMapping("/handleStatus")
+ @ApiOperationSupport(order = 8)
+ @ApiOperation(value = "处理工单状态", notes = "传入workOrderStatusParam")
+ public R handleStatus(@Valid @RequestBody WorkOrderStatusParam workOrderStatusParam) {
+ return R.status(gdWorkOrderService.handleWorkOrderStatus(workOrderStatusParam));
+ }
+
/**
* 导出数据
*/
@GetMapping("/export-gdWorkOrder")
@ApiOperationSupport(order = 9)
+ @ApiIgnore
@ApiOperation(value = "导出数据", notes = "传入gdWorkOrder")
public void exportGdWorkOrder(@ApiIgnore @RequestParam Map<String, Object> gdWorkOrder, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<GdWorkOrderEntity> queryWrapper = Condition.getQueryWrapper(gdWorkOrder, GdWorkOrderEntity.class);
--
Gitblit v1.9.3