From c2f2560287e9d71a472099ef868eaf919dc5ea1a Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Sat, 17 Jan 2026 14:54:10 +0800
Subject: [PATCH] 接单或拒接接单
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdWorkOrderController.java | 49 +++++++++++++++++--------------------------------
1 files changed, 17 insertions(+), 32 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 cebc34b..cdd1285 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,6 +32,8 @@
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.WorkOrderStatusParam;
import org.sxkj.gd.workorder.vo.GdWorkOrderVO;
import org.sxkj.gd.workorder.excel.GdWorkOrderExcel;
import org.sxkj.gd.workorder.wrapper.GdWorkOrderWrapper;
@@ -69,16 +71,7 @@
GdWorkOrderEntity detail = gdWorkOrderService.getOne(Condition.getQueryWrapper(gdWorkOrder));
return R.data(GdWorkOrderWrapper.build().entityVO(detail));
}
- /**
- * 工单任务表 分页
- */
- @GetMapping("/list")
- @ApiOperationSupport(order = 2)
- @ApiOperation(value = "分页", notes = "传入gdWorkOrder")
- public R<IPage<GdWorkOrderVO>> list(@ApiIgnore @RequestParam Map<String, Object> gdWorkOrder, Query query) {
- IPage<GdWorkOrderEntity> pages = gdWorkOrderService.page(Condition.getPage(query), Condition.getQueryWrapper(gdWorkOrder, GdWorkOrderEntity.class));
- return R.data(GdWorkOrderWrapper.build().pageVO(pages));
- }
+
/**
* 工单任务表 自定义分页
@@ -97,29 +90,10 @@
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入gdWorkOrder")
- public R save(@Valid @RequestBody GdWorkOrderEntity gdWorkOrder) {
- return R.status(gdWorkOrderService.save(gdWorkOrder));
+ public R save(@Valid @RequestBody WorkOrderParam workOrderParam) {
+ return R.status(gdWorkOrderService.saveWorkOrder(workOrderParam));
}
-
- /**
- * 工单任务表 修改
- */
- @PostMapping("/update")
- @ApiOperationSupport(order = 5)
- @ApiOperation(value = "修改", notes = "传入gdWorkOrder")
- public R update(@Valid @RequestBody GdWorkOrderEntity gdWorkOrder) {
- return R.status(gdWorkOrderService.updateById(gdWorkOrder));
- }
-
- /**
- * 工单任务表 新增或修改
- */
- @PostMapping("/submit")
- @ApiOperationSupport(order = 6)
- @ApiOperation(value = "新增或修改", notes = "传入gdWorkOrder")
- public R submit(@Valid @RequestBody GdWorkOrderEntity gdWorkOrder) {
- return R.status(gdWorkOrderService.saveOrUpdate(gdWorkOrder));
- }
+ //
/**
* 工单任务表 删除
@@ -131,12 +105,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