From b807d2644011c6b6c14332d0bb120843b2ef6985 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期日, 25 八月 2024 15:17:13 +0800
Subject: [PATCH] 工单优化
---
ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 48 insertions(+), 10 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 cfb6d38..6c0fe66 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
@@ -2,21 +2,23 @@
import com.ycl.platform.domain.form.*;
import com.ycl.platform.domain.query.DistributeWorkOrderQuery;
+import com.ycl.platform.domain.query.WorkOrderQuery;
import com.ycl.platform.domain.vo.DistributeWorkOrderVO;
-import com.ycl.system.domain.group.Update;
-import com.ycl.system.domain.group.Add;
-import org.springframework.validation.annotation.Validated;
-import lombok.RequiredArgsConstructor;
-import java.util.List;
-import org.springframework.validation.annotation.Validated;
-import jakarta.validation.constraints.NotEmpty;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
import com.ycl.platform.service.WorkOrderService;
import com.ycl.system.Result;
-import com.ycl.platform.domain.query.WorkOrderQuery;
+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;
import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
/**
* 宸ュ崟 鍓嶇鎺у埗鍣�
@@ -35,26 +37,48 @@
@PostMapping
@ApiOperation(value = "娣诲姞", notes = "娣诲姞")
+ @PreAuthorize("@ss.hasPermi('work:order:add')")
public Result add(@RequestBody @Validated(Add.class) WorkOrderForm form) {
return workOrderService.add(form);
}
@PutMapping
@ApiOperation(value = "淇敼", notes = "淇敼")
+ @PreAuthorize("@ss.hasPermi('work:order:edit')")
public Result update(@RequestBody @Validated(Update.class) WorkOrderForm form) {
return workOrderService.update(form);
}
@PutMapping("/auditing")
@ApiOperation(value = "瀹℃牳", notes = "宸ュ崟瀹℃牳")
+ @PreAuthorize("@ss.hasPermi('work:order:audit')")
public Result auditing(@RequestBody @Validated(Update.class) WorkOrderAuditingForm form) {
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/{workOrderNo}")
+ @ApiOperation(value = "杩愮淮鎯呭喌", notes = "杩愮淮鎯呭喌")
+ public Result ywCondition(@PathVariable String workOrderNo) {
+ return workOrderService.selectYwConditionByYwId(workOrderNo);
+ }
+
+ @GetMapping("/yw-auditing-list/{workOrderNo}")
+ @ApiOperation(value = "杩愮淮瀹℃牳璁板綍", notes = "杩愮淮瀹℃牳璁板綍")
+ public Result ywAuditingByYwId(@PathVariable String workOrderNo) {
+ return workOrderService.selectYwAuditingListByYwId(workOrderNo);
}
@PutMapping("/yw-result")
@@ -71,42 +95,56 @@
@DeleteMapping("/{id}")
@ApiOperation(value = "ID鍒犻櫎", notes = "ID鍒犻櫎")
+ @PreAuthorize("@ss.hasPermi('work:order:remove')")
public Result removeById(@PathVariable("id") String id) {
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);
}
@PostMapping("/page")
@ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
+ @PreAuthorize("@ss.hasPermi('work:order:page')")
public Result page(@RequestBody WorkOrderQuery query) {
return workOrderService.page(query);
}
@PostMapping("/distribute/page")
@ApiOperation(value = "涓嬪彂鍒嗛〉", notes = "涓嬪彂鍒嗛〉")
+ @PreAuthorize("@ss.hasPermi('work:order:distribute')")
public Result distributePage(@RequestBody DistributeWorkOrderQuery query) {
return workOrderService.distributePage(query);
}
@PostMapping("/distribute/fast")
@ApiOperation(value = "蹇�熶笅鍙�", notes = "蹇�熶笅鍙�")
+ @PreAuthorize("@ss.hasPermi('work:order:distribute')")
public Result distributeFast(@RequestBody @Validated DistributeWorkOrderVO data) {
return workOrderService.distributeFast(data);
}
+ @PostMapping("/distribute/ids")
+ @ApiOperation(value = "涓嬪彂閫夋嫨", notes = "涓嬪彂閫夋嫨")
+ @PreAuthorize("@ss.hasPermi('work:order:distribute')")
+ public Result selectedIdsDistribute(@RequestBody DistributeWorkOrderQuery query) {
+ return workOrderService.selectedIdsDistribute(query);
+ }
+
@GetMapping("/{id}")
@ApiOperation(value = "璇︽儏", notes = "璇︽儏")
+ @PreAuthorize("@ss.hasPermi('work:order:query')")
public Result detail(@PathVariable("id") String id) {
return workOrderService.detail(id);
}
@GetMapping("/list")
@ApiOperation(value = "鍒楄〃", notes = "鍒楄〃")
+ @PreAuthorize("@ss.hasPermi('work:order:list')")
public Result list() {
return workOrderService.all();
}
--
Gitblit v1.8.0