From e700e89f85e58747b57fc0d7e1fd30f3483aacca Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 14 九月 2024 16:05:57 +0800
Subject: [PATCH] 检验任务历史记录

---
 inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java |   60 ++++++++++++++++++++++++++++++------------------------------
 1 files changed, 30 insertions(+), 30 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 163e9c3..9b551c6 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
@@ -10,10 +10,7 @@
 import com.yuanchu.mom.dto.InsProductResultDto;
 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.service.*;
 import com.yuanchu.mom.utils.JackSonUtil;
 import com.yuanchu.mom.vo.InsProductResultVo;
 import com.yuanchu.mom.vo.Result;
@@ -24,6 +21,7 @@
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -38,6 +36,7 @@
 public class InsOrderPlanController {
 
     private InsOrderPlanService insOrderPlanService;
+    private InsOrderUserService insOrderUserService;
 
     private InsOrderFileService insOrderFileService;
 
@@ -78,13 +77,6 @@
         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("鑾峰彇妫�楠岄」鐩拰妯℃澘鍐呭")
@@ -109,7 +101,7 @@
     @ValueClassify("妫�楠屼换鍔�")
     @ApiOperation(value = "澶嶆牳妫�楠屼换鍔�")
     @PostMapping("/verifyPlan")
-    public Result<?> verifyPlan(Integer orderId, String laboratory, Integer type, String tell) {
+    public Result<?> verifyPlan(Integer orderId, String laboratory, Integer type, String tell) throws IOException {
         return Result.success(insOrderPlanService.verifyPlan(orderId, laboratory, type, tell));
     }
 
@@ -123,8 +115,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(Integer orderId,String laboratory, Integer verifyUser, String entrustCode, String note,String term) {
+        int num = insOrderPlanService.submitPlan(orderId, laboratory, verifyUser, entrustCode,note,term);
         return num == 1 ? Result.success() : Result.fail("鎻愪氦澶辫触锛岄儴鍒嗛」鐩繕鏈繘琛屾楠�");
     }
 
@@ -138,9 +130,9 @@
     @ApiOperation(value = "淇濆瓨妫�楠屽唴瀹�")
     @PostMapping("/saveInsContext")
     @ValueAuth
-    public Result<?> saveInsContext(String param) {
+    public Result<?> saveInsContext(String param,Integer num) {
         Map<String, Object> param2 = JSON.parseObject(param, Map.class);
-        insOrderPlanService.saveInsContext(param2);
+        insOrderPlanService.saveInsContext(param2,num);
         return Result.success();
     }
 
@@ -187,13 +179,6 @@
         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));
-    }
-
     @ValueClassify("妫�楠屼换鍔�")
     @ApiOperation(value = "鎻掗槦鎿嶄綔")
     @PostMapping("/jumpTeam")
@@ -215,13 +200,6 @@
         return Result.success(insOrderPlanService.deleteInsContext(insProductResultVo));
     }
 
-    @ApiOperation(value = "鐢佃矾璇曢獙鐨勫垹闄や簰璋�")
-    @PostMapping("/deleteInsContext2")
-    @ValueAuth
-    public Result<?> deleteInsContext2(String frequency,Integer productId,String often) {
-        return Result.success(insOrderPlanService.deleteInsContext2(frequency,productId,often));
-    }
-
     @ApiOperation(value = "鐢佃矾璇曢獙鐐瑰嚮妫�楠岄�夋嫨鐗堟湰")
     @PostMapping("/chooseVersion")
     @ValueAuth
@@ -231,4 +209,26 @@
         orderState.setVersion(version);
         return Result.success(insOrderStateService.updateById(orderState));
     }
+
+    @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) {
+        return Result.success(insOrderPlanService.scanInsOrderState(sonLaboratory,sampleCode));
+    }
+
 }

--
Gitblit v1.9.3