From 4bc7776bc6c063a9bfb9806e4bf6db5bf22985b1 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 09 十二月 2024 16:10:01 +0800
Subject: [PATCH] 电路试验的互调报告解析

---
 inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java |   34 ++++++++++++++++++----------------
 1 files changed, 18 insertions(+), 16 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 ed69b35..6713044 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
@@ -79,13 +79,14 @@
     @ValueClassify("妫�楠屼换鍔�")
     @ApiOperation(value = "鎵ц妫�楠屾搷浣�")
     @PostMapping("/doInsOrder")
-    public Result<?> doInsOrder(Integer id, String laboratory) {
-        return Result.success(insOrderPlanService.doInsOrder(id, laboratory));
+    public Result<?> doInsOrder(Integer sampleId, String laboratory) {
+        return Result.success(insOrderPlanService.doInsOrder(sampleId, laboratory));
     }
 
     @ValueAuth
     @PostMapping("/getInsProduct")
     @ApiOperation("鑾峰彇妫�楠岄」鐩拰妯℃澘鍐呭")
+    //杩欓噷鐨刬d灏辨槸鏍峰搧id
     public Result<?> getInsProduct(Integer id, Integer type, String laboratory, HttpServletRequest request) {
         return Result.success(insOrderPlanService.getInsProduct(id, type, laboratory, request));
     }
@@ -93,29 +94,29 @@
     @ValueClassify("妫�楠屼换鍔�")
     @ApiOperation(value = "浠诲姟浜ゆ帴")
     @PostMapping("/upPlanUser")
-    public Result<?> upPlanUser(Integer userId, Integer orderId, String sonLaboratory) {
-        return Result.success(insOrderPlanService.upPlanUser(userId, orderId, sonLaboratory));
+    public Result<?> upPlanUser(Integer userId, Integer sampleId, String sonLaboratory) {
+        return Result.success(insOrderPlanService.upPlanUser(userId, sampleId, sonLaboratory));
     }
 
     @ValueAuth
     @ApiOperation(value = "鍒ゆ柇浜ゆ帴鐨勮瘯楠屽")
     @PostMapping("/upPlanUser2")
-    public Result<?> upPlanUser2(Integer orderId) {
-        return Result.success(insOrderPlanService.upPlanUser2(orderId));
+    public Result<?> upPlanUser2(Integer sampleId) {
+        return Result.success(insOrderPlanService.upPlanUser2(sampleId));
     }
 
     @ValueClassify("妫�楠屼换鍔�")
     @ApiOperation(value = "澶嶆牳妫�楠屼换鍔�")
     @PostMapping("/verifyPlan")
-    public Result<?> verifyPlan(Integer orderId, String laboratory, Integer type, String tell) throws IOException {
-        return Result.success(insOrderPlanService.verifyPlan(orderId, laboratory, type, tell));
+    public Result<?> verifyPlan(Integer sampleId, String laboratory, Integer type, String tell) throws IOException {
+        return Result.success(insOrderPlanService.verifyPlan(sampleId, laboratory, type, tell));
     }
 
     @ValueAuth
     @ApiOperation(value = "鏍￠獙妫�楠屼换鍔℃彁浜�")
     @PostMapping("/checkSubmitPlan")
-    public Result<?> checkSubmitPlan(Integer orderId, String laboratory) {
-        return Result.success(insOrderPlanService.checkSubmitPlan(orderId, laboratory));
+    public Result<?> checkSubmitPlan(Integer sampleId, String laboratory) {
+        return Result.success(insOrderPlanService.checkSubmitPlan(sampleId, laboratory));
     }
 
     @ValueClassify("妫�楠屼换鍔�")
@@ -169,8 +170,8 @@
     @ValueClassify("妫�楠屼换鍔�")
     @ApiOperation(value = "涓婁紶闄勪欢")
     @PostMapping("/uploadFile")
-    public Result<?> uploadFile(Integer orderId, MultipartFile file, String sonLaboratory) {
-        return Result.success(insOrderPlanService.uploadFile(orderId, file, sonLaboratory));
+    public Result<?> uploadFile(Integer orderId, MultipartFile file, String sonLaboratory,Integer sampleId) {
+        return Result.success(insOrderPlanService.uploadFile(orderId, file, sonLaboratory,sampleId));
     }
 
     @ValueClassify("妫�楠屼换鍔�")
@@ -233,6 +234,7 @@
     @ValueAuth
     @PostMapping("/getInsProduct2")
     @ApiOperation("鏌ョ湅妫�楠屽巻鍙�")
+    //杩欓噷鐨刬d鏄牱鍝乮d
     public Result<?> getInsProduct2(Integer id, Integer type, String laboratory, HttpServletRequest request, Integer num) {
         return Result.success(insOrderPlanService.getInsProduct2(id, type, laboratory, request, num));
     }
@@ -240,15 +242,15 @@
     @ValueClassify("妫�楠屼换鍔�")
     @ApiOperation(value = "鎵爜鎶ユ(鍏ュ簱)")
     @PostMapping("/scanInsOrderState")
-    public Result scanInsOrderState(String sonLaboratory, String sampleCode, String trees) {
-        return Result.success(insOrderPlanService.scanInsOrderState(sonLaboratory, sampleCode, trees));
+    public Result scanInsOrderState(String sonLaboratory, String sampleCode, String trees,String entrustCode) {
+        return Result.success(insOrderPlanService.scanInsOrderState(sonLaboratory, sampleCode, trees,entrustCode));
     }
 
     @ValueClassify("妫�楠屼换鍔�")
     @ApiOperation(value = "鎵爜鍑哄簱")
     @PostMapping("/outInsOrderState")
-    public Result outInsOrderState(String sonLaboratory, String sampleCode) {
-        return Result.success(insOrderPlanService.outInsOrderState(sonLaboratory, sampleCode));
+    public Result outInsOrderState(String sonLaboratory, String sampleCode,String entrustCode) {
+        return Result.success(insOrderPlanService.outInsOrderState(sonLaboratory, sampleCode,entrustCode));
     }
 
     @ValueAuth

--
Gitblit v1.9.3