From 042936ba89e122bece0e4ce595c68f859b9e9bed Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期三, 17 四月 2024 17:53:43 +0800
Subject: [PATCH] 工单下发：新增互斥锁、下发记录

---
 ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java |   86 +++++++++++++++++++++++++++++++++++++------
 1 files changed, 74 insertions(+), 12 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 01abe9f..4fcdc76 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
@@ -1,20 +1,22 @@
 package com.ycl.platform.controller;
 
-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.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.platform.service.WorkOrderService;
 import com.ycl.system.Result;
-import com.ycl.platform.domain.form.WorkOrderForm;
-import com.ycl.platform.domain.query.WorkOrderQuery;
+import com.ycl.system.domain.group.Add;
+import com.ycl.system.domain.group.Update;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import jakarta.validation.constraints.NotEmpty;
 import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * 宸ュ崟 鍓嶇鎺у埗鍣�
@@ -43,6 +45,48 @@
         return workOrderService.update(form);
     }
 
+    @PutMapping("/auditing")
+    @ApiOperation(value = "瀹℃牳", notes = "宸ュ崟瀹℃牳")
+    public Result auditing(@RequestBody @Validated(Update.class) WorkOrderAuditingForm form) {
+        return workOrderService.auditing(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")
+    @ApiOperation(value = "杩愮淮缁撴灉", notes = "杩愮淮缁撴灉")
+    public Result ywCondition(@RequestBody @Validated(Update.class) WorkOrderYWResultForm form) {
+        return workOrderService.ywResult(form);
+    }
+
+    @PutMapping("/check-result")
+    @ApiOperation(value = "妫�娴嬬粨鏋�", notes = "妫�娴嬬粨鏋�")
+    public Result ywCondition(@RequestBody @Validated(Update.class) WorkOrderCheckResultForm form) {
+        return workOrderService.checkResult(form);
+    }
+
     @DeleteMapping("/{id}")
     @ApiOperation(value = "ID鍒犻櫎", notes = "ID鍒犻櫎")
     public Result removeById(@PathVariable("id") String id) {
@@ -57,10 +101,28 @@
 
     @PostMapping("/page")
     @ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
-    public Result page(WorkOrderQuery query) {
+    public Result page(@RequestBody WorkOrderQuery query) {
         return workOrderService.page(query);
     }
 
+    @PostMapping("/distribute/page")
+    @ApiOperation(value = "涓嬪彂鍒嗛〉", notes = "涓嬪彂鍒嗛〉")
+    public Result distributePage(@RequestBody DistributeWorkOrderQuery query) {
+        return workOrderService.distributePage(query);
+    }
+
+    @PostMapping("/distribute/fast")
+    @ApiOperation(value = "蹇�熶笅鍙�", notes = "蹇�熶笅鍙�")
+    public Result distributeFast(@RequestBody @Validated DistributeWorkOrderVO data) {
+        return workOrderService.distributeFast(data);
+    }
+
+    @PostMapping("/distribute/ids")
+    @ApiOperation(value = "涓嬪彂閫夋嫨", notes = "涓嬪彂閫夋嫨")
+    public Result selectedIdsDistribute(@RequestBody DistributeWorkOrderQuery query) {
+        return workOrderService.selectedIdsDistribute(query.getIds(), query.getUnitId());
+    }
+
     @GetMapping("/{id}")
     @ApiOperation(value = "璇︽儏", notes = "璇︽儏")
     public Result detail(@PathVariable("id") String id) {

--
Gitblit v1.8.0