From c83101eb62f5d4906b9c01ceea6b21a37f9e84d8 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 18 十一月 2025 09:24:53 +0800
Subject: [PATCH] bug修复
---
ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java | 60 +++++++++++++++++++-----------------------------------------
1 files changed, 19 insertions(+), 41 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java b/ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java
index 3b1c71d..664a73b 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java
@@ -4,10 +4,7 @@
import com.ycl.platform.domain.entity.WorkOrderAuditingRecord;
import com.ycl.platform.domain.entity.WorkOrderWhite;
import com.ycl.platform.domain.form.*;
-import com.ycl.platform.domain.query.DistributeWorkOrderQuery;
-import com.ycl.platform.domain.query.WorkOrderExportQuery;
-import com.ycl.platform.domain.query.WorkOrderQuery;
-import com.ycl.platform.domain.query.WorkOrderWhiteQuery;
+import com.ycl.platform.domain.query.*;
import com.ycl.platform.domain.vo.DistributeWorkOrderVO;
import com.ycl.platform.domain.vo.WorkOrderVO;
import com.ycl.platform.domain.vo.WorkOrderYwConditionRecordVO;
@@ -28,6 +25,7 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import java.io.IOException;
import java.util.List;
/**
@@ -44,6 +42,12 @@
public class WorkOrderController extends BaseController {
private final WorkOrderService workOrderService;
+
+ @DeleteMapping("/delByIds")
+ public Result delByIds(@RequestBody List<String> ids){
+
+ return workOrderService.batchDeleteWorkOrder(ids);
+ }
@GetMapping("/process/{workOrderNo}")
@ApiOperation(value = "杩囩▼鍥�", notes = "杩囩▼鍥�")
@@ -86,6 +90,14 @@
return workOrderService.ywCondition(form);
}
+ @PutMapping("/yw-condition-list")
+ @ApiOperation(value = "杩愮淮鎯呭喌", notes = "杩愮淮鎯呭喌")
+ public Result ywConditionList(@RequestBody @Validated WorkOrderYWConditionsForm form) {
+ System.out.println(form);
+// return workOrderService.ywCondition(form);
+ return workOrderService.ywConditionList(form);
+ }
+
//鐜板湪娌＄敤
@PutMapping("/yw-result")
@ApiOperation(value = "杩愮淮缁撴灉", notes = "杩愮淮缁撴灉")
@@ -103,6 +115,7 @@
@DeleteMapping("/{id}")
@ApiOperation(value = "ID鍒犻櫎", notes = "ID鍒犻櫎")
@PreAuthorize("@ss.hasPermi('work:order:remove')")
+ @Log(title = "鍒犻櫎宸ュ崟", businessType = BusinessType.DELETE)
public Result removeById(@PathVariable("id") String id) {
return workOrderService.removeById(id);
}
@@ -198,43 +211,6 @@
List<WorkOrderAuditingRecord> data = workOrderService.selectYwAuditingListByYwId(workOrderNo);
return Result.ok().data(data);
}
-
- /**
- * 宸ュ崟鐧藉悕鍗曞垪琛�
- */
- @PostMapping("/white/page")
- @ApiOperation(value = "宸ュ崟鐧藉悕鍗曞垪琛�", notes = "宸ュ崟鐧藉悕鍗曞垪琛�")
- public Result whitePage(@RequestBody WorkOrderWhiteQuery workOrderWhiteQuery)
- {
- return workOrderService.selectWorkOrderWhiteList(workOrderWhiteQuery);
- }
-
- /**
- * 娣诲姞宸ュ崟鐧藉悕鍗�
- *
- * @param workOrderWhite 鐧借壊宸ュ崟
- * @return {@link Result }
- * @author
- */
- @PostMapping("/white/add")
- @ApiOperation(value = "鏂板宸ュ崟鐧藉悕鍗�", notes = "鏂板宸ュ崟鐧藉悕鍗�")
- public Result addWorkOrderWhite(@RequestBody WorkOrderWhite workOrderWhite) {
- return workOrderService.addWorkOrderWhite(workOrderWhite);
- }
-
- /**
- * 鎵归噺鍒犻櫎宸ュ崟鐧藉悕鍗�
- *
- * @param ids ids
- * @return {@link Result }
- * @author
- */
- @DeleteMapping("/white/batchDelete")
- @ApiOperation(value = "鎵归噺鍒犻櫎宸ュ崟鐧藉悕鍗�", notes = "鎵归噺鍒犻櫎宸ュ崟鐧藉悕鍗�")
- public Result batchDeleteWorkOrderWhite(@RequestBody List<String> ids) {
- return workOrderService.batchDeleteWorkOrderWhite(ids);
- }
-
/**
* 鎵归噺鍒犻櫎宸ュ崟
*
@@ -244,7 +220,9 @@
@DeleteMapping("/batchDelete")
@PreAuthorize("@ss.hasPermi('work:order:delete')")
@ApiOperation(value = "鎵归噺鍒犻櫎宸ュ崟", notes = "鎵归噺鍒犻櫎宸ュ崟")
+ @Log(title = "鎵归噺鍒犻櫎宸ュ崟", businessType = BusinessType.DELETE)
public Result batchDeleteWorkOrder(@RequestBody List<String> workOrderNos) {
return workOrderService.batchDeleteWorkOrder(workOrderNos);
}
+
}
--
Gitblit v1.8.0