From cd24a045bd9ee29505ddc9760d25f5d4037f4f0c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 05 九月 2024 21:55:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java | 39 ++++++++++++++++++---------------------
1 files changed, 18 insertions(+), 21 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 93cb878..39216f0 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
@@ -8,6 +8,7 @@
import com.ycl.system.Result;
import com.ycl.system.domain.group.Add;
import com.ycl.system.domain.group.Update;
+import com.ycl.utils.PageUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import jakarta.validation.constraints.NotEmpty;
@@ -34,6 +35,13 @@
private final WorkOrderService workOrderService;
+ @GetMapping("/process/{workOrderNo}")
+ @ApiOperation(value = "杩囩▼鍥�", notes = "杩囩▼鍥�")
+ @PreAuthorize("@ss.hasPermi('work:order:process')")
+ public Result processImg(@PathVariable("workOrderNo") String workOrderNo) {
+ return workOrderService.processImg(workOrderNo);
+ }
+
@PostMapping
@ApiOperation(value = "娣诲姞", notes = "娣诲姞")
@PreAuthorize("@ss.hasPermi('work:order:add')")
@@ -55,28 +63,17 @@
return workOrderService.auditing(form);
}
+ @PutMapping("/batchAuditing")
+ @ApiOperation(value = "瀹℃牳", notes = "宸ュ崟鎵归噺瀹℃牳")
+ @PreAuthorize("@ss.hasPermi('work:order:audit')")
+ public Result batchAuditing(@RequestBody @Validated(Update.class) WorkOrderBatchAuditingForm form) {
+ return workOrderService.batchAuditing(form);
+ }
+
@PutMapping("/yw-condition")
@ApiOperation(value = "杩愮淮鎯呭喌", notes = "杩愮淮鎯呭喌")
public Result ywCondition(@RequestBody @Validated(Update.class) WorkOrderYWConditionForm form) {
return workOrderService.ywCondition(form);
- }
-
- @GetMapping("/yw-condition/{id}")
- @ApiOperation(value = "杩愮淮鎯呭喌", notes = "杩愮淮鎯呭喌")
- public Result ywCondition(@PathVariable @Validated(Update.class) String id) {
- return workOrderService.selectYwConditionByYwId(id);
- }
-
- @GetMapping("/yw-condition-list/{id}")
- @ApiOperation(value = "杩愮淮鎯呭喌璁板綍", notes = "杩愮淮鎯呭喌璁板綍")
- public Result ywConditionList(@PathVariable @Validated(Update.class) String id) {
- return workOrderService.selectYwConditionListByYwId(id);
- }
-
- @GetMapping("/yw-auditing-list/{id}")
- @ApiOperation(value = "杩愮淮瀹℃牳璁板綍", notes = "杩愮淮瀹℃牳璁板綍")
- public Result ywAuditingByYwId(@PathVariable @Validated(Update.class) String id) {
- return workOrderService.selectYwAuditingListByYwId(id);
}
@PutMapping("/yw-result")
@@ -114,7 +111,7 @@
@PostMapping("/distribute/page")
@ApiOperation(value = "涓嬪彂鍒嗛〉", notes = "涓嬪彂鍒嗛〉")
- @PreAuthorize("@ss.hasPermi('work:order:distribute')")
+ @PreAuthorize("@ss.hasPermi('work:order:distribute:page')")
public Result distributePage(@RequestBody DistributeWorkOrderQuery query) {
return workOrderService.distributePage(query);
}
@@ -127,7 +124,7 @@
}
@PostMapping("/distribute/ids")
- @ApiOperation(value = "涓嬪彂閫夋嫨", notes = "涓嬪彂閫夋嫨")
+ @ApiOperation(value = "涓嬪彂閫夋嫨鐨勫伐鍗�", notes = "涓嬪彂閫夋嫨閫夋嫨鐨勫伐鍗�")
@PreAuthorize("@ss.hasPermi('work:order:distribute')")
public Result selectedIdsDistribute(@RequestBody DistributeWorkOrderQuery query) {
return workOrderService.selectedIdsDistribute(query);
@@ -135,7 +132,7 @@
@GetMapping("/{id}")
@ApiOperation(value = "璇︽儏", notes = "璇︽儏")
- @PreAuthorize("@ss.hasPermi('work:order:query')")
+ @PreAuthorize("@ss.hasPermi('work:order:detail')")
public Result detail(@PathVariable("id") String id) {
return workOrderService.detail(id);
}
--
Gitblit v1.8.0