From 30f2183965e8a78550f4e3da4f929fbfec1e7669 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期四, 25 七月 2024 18:11:21 +0800
Subject: [PATCH] 数采bug调整

---
 inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java |   57 +++++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 47 insertions(+), 10 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 e37e995..f6f0ab1 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
@@ -5,20 +5,20 @@
 import com.yuanchu.mom.annotation.ValueAuth;
 import com.yuanchu.mom.annotation.ValueClassify;
 import com.yuanchu.mom.dto.InsOrderPlanDTO;
+import com.yuanchu.mom.dto.InsProductDto;
 import com.yuanchu.mom.pojo.InsOrderFile;
 import com.yuanchu.mom.service.InsOrderFileService;
 import com.yuanchu.mom.service.InsOrderPlanService;
+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.Map;
 
@@ -34,6 +34,8 @@
     private InsOrderPlanService insOrderPlanService;
 
     private InsOrderFileService insOrderFileService;
+
+    private InsProductService insProductService;
 
     @ValueClassify("妫�楠屼换鍔�")
     @ApiOperation(value = "鑾峰彇妫�楠屼换鍔″垪琛�")
@@ -69,18 +71,32 @@
         return Result.success(insOrderPlanService.doInsOrder(id, laboratory));
     }
 
+    @ApiOperation(value = "鍒囨崲鍏夌氦/鍏夌氦甯﹁褰曟ā鐗堟煡璇㈡楠屽唴瀹�")
+    @PostMapping("/getReportModel")
+    @ValueAuth
+    public Result<?> getReportModel(Integer sampleId) {
+        return Result.success(insOrderPlanService.getReportModel(sampleId));
+    }
+
     @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("妫�楠屼换鍔�")
@@ -100,9 +116,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, String sampleCode) {
+        int num = insOrderPlanService.submitPlan(orderId, laboratory, verifyUser, entrustCode, sampleCode);
         return num == 1 ? Result.success() : Result.fail("鎻愪氦澶辫触锛岄儴鍒嗛」鐩繕鏈繘琛屾楠�");
+    }
+
+    @ValueClassify("璁惧")
+    @ApiOperation(value = "鏄惁鍏佽淇敼閲囬泦鍊�")
+    @DeleteMapping("/isItAllowedToModifyTheCollectedValues")
+    public Result<?> isItAllowedToModifyTheCollectedValues() {
+        return Result.success();
     }
 
     @ApiOperation(value = "淇濆瓨妫�楠屽唴瀹�")
@@ -149,4 +172,18 @@
         map.put("fileUrl", insOrderFile.getFileUrl());
         return Result.success(map);
     }
+
+    @ApiOperation(value = "濉啓娓╁害涓庢箍搴�")
+    @PostMapping("/write")
+    @ValueAuth
+    public Result<?> write(@RequestBody InsProductDto insProductDto) {
+        return Result.success(insProductService.write(insProductDto));
+    }
+
+    @ValueAuth
+    @ApiOperation(value = "娓╁害寰幆鏌ョ湅鍒楄〃鏁版嵁(鍖呮嫭閫氳繃鏍峰搧id,寰幆娆℃暟,娓╁害,寰幆娆℃暟杩涜绛涢��)")
+    @PostMapping("/temCycle")
+    public Result<?> temCycle(Integer sampleId, String inspectionItem, String inspectionItemSubclass) {
+        return Result.success(insOrderPlanService.temCycle(sampleId, inspectionItem, inspectionItemSubclass));
+    }
 }

--
Gitblit v1.9.3