From 1bc536c54fc1c2f25a4cff4b162cfa6979604fff Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 29 八月 2024 17:31:10 +0800
Subject: [PATCH] 企业微信对接+工时优化+设备查询项目树结构优化

---
 inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java |   45 ++++++++++++++++++++++++++++++++++-----------
 1 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java
index 406831b..9b23ba0 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java
@@ -7,21 +7,22 @@
 import com.yuanchu.mom.dto.InsOrderPlanDTO;
 import com.yuanchu.mom.dto.InsProductDto;
 import com.yuanchu.mom.pojo.InsOrderFile;
+import com.yuanchu.mom.pojo.InsOrderState;
 import com.yuanchu.mom.service.InsOrderFileService;
 import com.yuanchu.mom.service.InsOrderPlanService;
+import com.yuanchu.mom.service.InsOrderStateService;
 import com.yuanchu.mom.service.InsProductService;
 import com.yuanchu.mom.utils.JackSonUtil;
 import com.yuanchu.mom.vo.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -38,6 +39,7 @@
     private InsOrderFileService insOrderFileService;
 
     private InsProductService insProductService;
+    private InsOrderStateService insOrderStateService;
 
     @ValueClassify("妫�楠屼换鍔�")
     @ApiOperation(value = "鑾峰彇妫�楠屼换鍔″垪琛�")
@@ -73,7 +75,7 @@
         return Result.success(insOrderPlanService.doInsOrder(id, laboratory));
     }
 
-    @ApiOperation(value = "鍒囨崲鍏夌氦/鍏夌氦甯﹁褰曟ā鐗堟煡璇㈡楠屽唴瀹�")
+    @ApiOperation(value = "鍒囨崲濂楃/鍏夌氦/鍏夌氦甯﹁褰曟ā鐗堟煡璇㈡楠屽唴瀹�")
     @PostMapping("/getReportModel")
     @ValueAuth
     public Result<?> getReportModel(Integer sampleId) {
@@ -83,15 +85,22 @@
     @ValueAuth
     @PostMapping("/getInsProduct")
     @ApiOperation("鑾峰彇妫�楠岄」鐩拰妯℃澘鍐呭")
-    public Result<?> getInsProduct(Integer id, Integer type, String laboratory) {
-        return Result.success(insOrderPlanService.getInsProduct(id, type, laboratory));
+    public Result<?> getInsProduct(Integer id, Integer type, String laboratory, HttpServletRequest request) {
+        return Result.success(insOrderPlanService.getInsProduct(id, type, laboratory, request));
     }
 
     @ValueClassify("妫�楠屼换鍔�")
     @ApiOperation(value = "浠诲姟浜ゆ帴")
     @PostMapping("/upPlanUser")
-    public Result<?> upPlanUser(Integer userId, Integer orderId) {
-        return Result.success(insOrderPlanService.upPlanUser(userId, orderId));
+    public Result<?> upPlanUser(Integer userId, Integer orderId,String sonLaboratory) {
+        return Result.success(insOrderPlanService.upPlanUser(userId, orderId, sonLaboratory));
+    }
+
+    @ValueAuth
+    @ApiOperation(value = "鍒ゆ柇浜ゆ帴鐨勮瘯楠屽")
+    @PostMapping("/upPlanUser2")
+    public Result<?> upPlanUser2(Integer orderId) {
+        return Result.success(insOrderPlanService.upPlanUser2(orderId));
     }
 
     @ValueClassify("妫�楠屼换鍔�")
@@ -111,9 +120,16 @@
     @ValueClassify("妫�楠屼换鍔�")
     @ApiOperation(value = "妫�楠屼换鍔℃彁浜�")
     @PostMapping("/submitPlan")
-    public Result<?> submitPlan(Integer orderId, String laboratory, Integer verifyUser) {
-        int num = insOrderPlanService.submitPlan(orderId, laboratory, verifyUser);
+    public Result<?> submitPlan(Integer orderId,String laboratory, Integer verifyUser, String entrustCode) {
+        int num = insOrderPlanService.submitPlan(orderId, laboratory, verifyUser, entrustCode);
         return num == 1 ? Result.success() : Result.fail("鎻愪氦澶辫触锛岄儴鍒嗛」鐩繕鏈繘琛屾楠�");
+    }
+
+    @ValueClassify("璁惧")
+    @ApiOperation(value = "鏄惁鍏佽淇敼閲囬泦鍊�")
+    @DeleteMapping("/isItAllowedToModifyTheCollectedValues")
+    public Result<?> isItAllowedToModifyTheCollectedValues() {
+        return Result.success();
     }
 
     @ApiOperation(value = "淇濆瓨妫�楠屽唴瀹�")
@@ -174,4 +190,11 @@
     public Result<?> temCycle(Integer sampleId, String inspectionItem, String inspectionItemSubclass) {
         return Result.success(insOrderPlanService.temCycle(sampleId, inspectionItem, inspectionItemSubclass));
     }
+
+    @ValueClassify("妫�楠屼换鍔�")
+    @ApiOperation(value = "鎻掗槦鎿嶄綔")
+    @PostMapping("/jumpTeam")
+    public Result<?> jumpTeam(@RequestBody List<InsOrderState> insOrderStates) {
+        return Result.success(insOrderStateService.updateBatchById(insOrderStates));
+    }
 }

--
Gitblit v1.9.3