From ebeb43ea497fafc448c827d1de6796bcaa4e0b52 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 23 Jun 2026 13:59:46 +0800
Subject: [PATCH] add : 吉安支持查询待验收的接口
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdWorkOrderController.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 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..eb6a785 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;
@@ -63,13 +64,14 @@
/**
* 工单任务表 详情
+ * todo 星图 调了个你们的工单详情的接口, 主要就是落geojson 方便画航线, 后面如果有接口改动麻烦通知一下
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入gdWorkOrder")
public R<GdWorkOrderVO> detail(GdWorkOrderEntity gdWorkOrder) {
- GdWorkOrderEntity detail = gdWorkOrderService.getOne(Condition.getQueryWrapper(gdWorkOrder));
- return R.data(GdWorkOrderWrapper.build().entityVO(detail));
+ GdWorkOrderVO detail = gdWorkOrderService.getWorkOrderDetail(gdWorkOrder);
+ return R.data(detail);
}
@@ -79,7 +81,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 +92,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 +112,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