From c23f42d3d9cb49fbf67cf58a9ada9729d7924403 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 19 Jan 2026 18:33:14 +0800
Subject: [PATCH] 工单新增

---
 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdWorkOrderController.java |   13 +++++++------
 1 files changed, 7 insertions(+), 6 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 cdd1285..88a50ea 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,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.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;
@@ -68,7 +69,7 @@
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入gdWorkOrder")
 	public R<GdWorkOrderVO> detail(GdWorkOrderEntity gdWorkOrder) {
-		GdWorkOrderEntity detail = gdWorkOrderService.getOne(Condition.getQueryWrapper(gdWorkOrder));
+		GdWorkOrderEntity detail = gdWorkOrderService.getWorkOrderDetail(gdWorkOrder);
 		return R.data(GdWorkOrderWrapper.build().entityVO(detail));
 	}
 
@@ -79,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);
 	}
@@ -90,8 +91,8 @@
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入gdWorkOrder")
-	public R save(@Valid @RequestBody WorkOrderParam workOrderParam) {
-		return R.status(gdWorkOrderService.saveWorkOrder(workOrderParam));
+	public R save(@Valid @RequestBody WorkOrderAddParam workOrderParam) {
+		return R.status(gdWorkOrderService.saveOrUpdateWorkOrder(workOrderParam));
 	}
 	//
 
@@ -110,7 +111,7 @@
 	 */
 	@PostMapping("/handleStatus")
 	@ApiOperationSupport(order = 8)
-	@ApiOperation(value = "处理工单状态", notes = "传入workOrderStatusParam")
+	@ApiOperation(value = "处理工单状态变更(接单或拒接接单)", notes = "传入workOrderStatusParam")
 	public R handleStatus(@Valid @RequestBody WorkOrderStatusParam workOrderStatusParam) {
 		return R.status(gdWorkOrderService.handleWorkOrderStatus(workOrderStatusParam));
 	}

--
Gitblit v1.9.3