From 1f15333b0a97a327865f7aab8f1e3f9ba8fc16f8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 18 十月 2024 12:45:59 +0800
Subject: [PATCH] 电路站点报告调试+总报告ing

---
 inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java |   63 ++++++++++++++++++++++++-------
 1 files changed, 49 insertions(+), 14 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 724cb63..0036898 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
@@ -8,12 +8,11 @@
 import com.yuanchu.mom.dto.InsOrderPlanDTO;
 import com.yuanchu.mom.dto.InsProductDto;
 import com.yuanchu.mom.dto.InsProductResultDto;
+import com.yuanchu.mom.dto.SubmitPlanDto;
 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.pojo.InsProductResult;
+import com.yuanchu.mom.service.*;
 import com.yuanchu.mom.utils.JackSonUtil;
 import com.yuanchu.mom.vo.InsProductResultVo;
 import com.yuanchu.mom.vo.Result;
@@ -39,6 +38,7 @@
 public class InsOrderPlanController {
 
     private InsOrderPlanService insOrderPlanService;
+    private InsOrderUserService insOrderUserService;
 
     private InsOrderFileService insOrderFileService;
 
@@ -117,8 +117,8 @@
     @ValueClassify("妫�楠屼换鍔�")
     @ApiOperation(value = "妫�楠屼换鍔℃彁浜�")
     @PostMapping("/submitPlan")
-    public Result<?> submitPlan(Integer orderId,String laboratory, Integer verifyUser, String entrustCode) {
-        int num = insOrderPlanService.submitPlan(orderId, laboratory, verifyUser, entrustCode);
+    public Result<?> submitPlan(@RequestBody SubmitPlanDto submitPlanDto) {
+        int num = insOrderPlanService.submitPlan(submitPlanDto);
         return num == 1 ? Result.success() : Result.fail("鎻愪氦澶辫触锛岄儴鍒嗛」鐩繕鏈繘琛屾楠�");
     }
 
@@ -136,6 +136,20 @@
         Map<String, Object> param2 = JSON.parseObject(param, Map.class);
         insOrderPlanService.saveInsContext(param2,num);
         return Result.success();
+    }
+
+    @ApiOperation(value = "鐢佃矾璇曢獙鐨勪繚瀛樻楠屽唴瀹�")
+    @PostMapping("/saveInsContext2")
+    @ValueAuth
+    public Result<?> saveInsContext2(@RequestBody InsProductResultDto insProductResultDtos) {
+        return Result.success(insOrderPlanService.saveInsContext2(insProductResultDtos));
+    }
+
+    @ApiOperation(value = "娓╂箍搴﹁瘯楠�+鍔熺巼璇曢獙鐨勪繚瀛樻楠屽唴瀹�")
+    @PostMapping("/saveInsContext3")
+    @ValueAuth
+    public Result<?> saveInsContext3(@RequestBody InsProductResult insProductResult) {
+        return Result.success(insOrderPlanService.saveInsContext3(insProductResult));
     }
 
     @ValueAuth
@@ -188,13 +202,6 @@
         return Result.success(insOrderStateService.jumpTeam(insOrderState));
     }
 
-    @ApiOperation(value = "鐢佃矾璇曢獙鐨勪繚瀛樻楠屽唴瀹�")
-    @PostMapping("/saveInsContext2")
-    @ValueAuth
-    public Result<?> saveInsContext2(@RequestBody InsProductResultDto insProductResultDtos) {
-        return Result.success(insOrderPlanService.saveInsContext2(insProductResultDtos));
-    }
-
     @ApiOperation(value = "鐢佃矾璇曢獙鐨勫垹闄ら娈�")
     @PostMapping("/deleteInsContext")
     @ValueAuth
@@ -212,11 +219,39 @@
         return Result.success(insOrderStateService.updateById(orderState));
     }
 
-    @ValueClassify("妫�楠屼换鍔�")
+    @ValueAuth
+    @PostMapping("/getInsOrderUserList")
+    @ApiOperation("鏌ョ湅妫�楠屽巻鍙插垪琛�")
+    public Result<?> getInsOrderUserList(Integer insOrderStateId) {
+        return Result.success(insOrderPlanService.getInsOrderUserList(insOrderStateId));
+    }
+
+    @ValueAuth
     @PostMapping("/getInsProduct2")
     @ApiOperation("鏌ョ湅妫�楠屽巻鍙�")
     public Result<?> getInsProduct2(Integer id, Integer type, String laboratory, HttpServletRequest request,Integer num) {
         return Result.success(insOrderPlanService.getInsProduct2(id, type, laboratory, request,num));
     }
 
+    @ValueClassify("妫�楠屼换鍔�")
+    @ApiOperation(value = "鎵爜鎶ユ(鍏ュ簱)")
+    @PostMapping("/scanInsOrderState")
+    public Result scanInsOrderState(String sonLaboratory,String sampleCode,String trees) {
+        return Result.success(insOrderPlanService.scanInsOrderState(sonLaboratory,sampleCode,trees));
+    }
+
+    @ValueClassify("妫�楠屼换鍔�")
+    @ApiOperation(value = "鎵爜鍑哄簱")
+    @PostMapping("/outInsOrderState")
+    public Result outInsOrderState(String sonLaboratory,String sampleCode) {
+        return Result.success(insOrderPlanService.outInsOrderState(sonLaboratory,sampleCode));
+    }
+
+    @ValueAuth
+    @PostMapping("/preview")
+    @ApiOperation("棰勮鏂囦欢")
+    public Result<?> preview(Integer id)throws Exception {
+        return Result.success(insOrderPlanService.preview(id));
+    }
+
 }

--
Gitblit v1.9.3