From d22bbb827940050d4df2bf3fb16dae79eba91d4e Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 12 十一月 2024 18:45:15 +0800
Subject: [PATCH] 批量审核bug，离线时间点回显
---
ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java | 46 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 37 insertions(+), 9 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 4b71e63..3b1c71d 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
@@ -82,19 +82,21 @@
@PutMapping("/yw-condition")
@ApiOperation(value = "杩愮淮鎯呭喌", notes = "杩愮淮鎯呭喌")
- public Result ywCondition(@RequestBody @Validated(Update.class) WorkOrderYWConditionForm form) {
+ public Result ywCondition(@RequestBody @Validated WorkOrderYWConditionForm form) {
return workOrderService.ywCondition(form);
}
+ //鐜板湪娌＄敤
@PutMapping("/yw-result")
@ApiOperation(value = "杩愮淮缁撴灉", notes = "杩愮淮缁撴灉")
- public Result ywCondition(@RequestBody @Validated(Update.class) WorkOrderYWResultForm form) {
+ public Result ywResult(@RequestBody @Validated WorkOrderYWResultForm form) {
return workOrderService.ywResult(form);
}
+ //鐜板湪娌＄敤
@PutMapping("/check-result")
@ApiOperation(value = "妫�娴嬬粨鏋�", notes = "妫�娴嬬粨鏋�")
- public Result ywCondition(@RequestBody @Validated(Update.class) WorkOrderCheckResultForm form) {
+ public Result ywCheckResult(@RequestBody @Validated WorkOrderCheckResultForm form) {
return workOrderService.checkResult(form);
}
@@ -105,12 +107,12 @@
return workOrderService.removeById(id);
}
- @DeleteMapping("/batch")
- @ApiOperation(value = "鎵归噺鍒犻櫎", notes = "鎵归噺鍒犻櫎")
- @PreAuthorize("@ss.hasPermi('work:order:remove')")
- public Result remove(@RequestBody @NotEmpty(message = "璇烽�夋嫨鏁版嵁") List<String> ids) {
- return workOrderService.remove(ids);
- }
+// @DeleteMapping("/batch")
+// @ApiOperation(value = "鎵归噺鍒犻櫎", notes = "鎵归噺鍒犻櫎")
+// @PreAuthorize("@ss.hasPermi('work:order:remove')")
+// public Result remove(@RequestBody @NotEmpty(message = "璇烽�夋嫨鏁版嵁") List<String> ids) {
+// return workOrderService.remove(ids);
+// }
@PostMapping("/page")
@ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
@@ -156,6 +158,13 @@
return workOrderService.detail(id);
}
+ @GetMapping("/check")
+ @ApiOperation(value = "鍥剧墖妫�娴�", notes = "鍥剧墖妫�娴�")
+ @PreAuthorize("@ss.hasPermi('work:order:check')")
+ public Result check(String workOrderNo,String serialNumber) {
+ return workOrderService.checkImage(workOrderNo,serialNumber);
+ }
+
@GetMapping("/list")
@ApiOperation(value = "鍒楄〃", notes = "鍒楄〃")
@PreAuthorize("@ss.hasPermi('work:order:list')")
@@ -163,6 +172,12 @@
return workOrderService.all();
}
+ @GetMapping("/errorType/list")
+ @ApiOperation(value = "鏁呴殰鍒楄〃", notes = "鏁呴殰鍒楄〃")
+ @PreAuthorize("@ss.hasPermi('work:order:list')")
+ public Result errorList() {
+ return workOrderService.errorAll();
+ }
@GetMapping("/detail/info/{workOrderNo}")
@ApiOperation(value = "璇︽儏", notes = "璇︽儏")
@PreAuthorize("@ss.hasPermi('work:order:detail')")
@@ -219,4 +234,17 @@
public Result batchDeleteWorkOrderWhite(@RequestBody List<String> ids) {
return workOrderService.batchDeleteWorkOrderWhite(ids);
}
+
+ /**
+ * 鎵归噺鍒犻櫎宸ュ崟
+ *
+ * @return {@link Result }
+ * @author
+ */
+ @DeleteMapping("/batchDelete")
+ @PreAuthorize("@ss.hasPermi('work:order:delete')")
+ @ApiOperation(value = "鎵归噺鍒犻櫎宸ュ崟", notes = "鎵归噺鍒犻櫎宸ュ崟")
+ public Result batchDeleteWorkOrder(@RequestBody List<String> workOrderNos) {
+ return workOrderService.batchDeleteWorkOrder(workOrderNos);
+ }
}
--
Gitblit v1.8.0