From a5b1bad21ba279ade3954852a5e281e9086042f0 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 26 十一月 2024 15:22:52 +0800
Subject: [PATCH] 前端联调修改2.0

---
 inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java |   42 ++++++++++++++++++++++++++++++------------
 1 files changed, 30 insertions(+), 12 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 88e2c02..82ac210 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
@@ -9,9 +9,11 @@
 import com.yuanchu.mom.dto.InsProductDto;
 import com.yuanchu.mom.dto.InsProductResultDto;
 import com.yuanchu.mom.dto.SubmitPlanDto;
+import com.yuanchu.mom.mapper.InsSampleUserMapper;
 import com.yuanchu.mom.pojo.InsOrderFile;
 import com.yuanchu.mom.pojo.InsOrderState;
 import com.yuanchu.mom.pojo.InsProductResult;
+import com.yuanchu.mom.pojo.InsSampleUser;
 import com.yuanchu.mom.service.*;
 import com.yuanchu.mom.utils.JackSonUtil;
 import com.yuanchu.mom.vo.InsProductResultVo;
@@ -45,6 +47,8 @@
     private InsProductService insProductService;
     private InsOrderStateService insOrderStateService;
 
+    private InsSampleUserMapper insSampleUserMapper;
+
     @ValueClassify("妫�楠屼换鍔�")
     @ApiOperation(value = "鑾峰彇妫�楠屼换鍔″垪琛�")
     @PostMapping("/selectInsOrderPlanList")
@@ -75,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));
     }
@@ -89,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("妫�楠屼换鍔�")
@@ -165,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("妫�楠屼换鍔�")
@@ -229,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));
     }
@@ -254,4 +260,16 @@
         return Result.success(insOrderPlanService.preview(id));
     }
 
+    @ValueAuth
+    @PostMapping("/getCheckUser")
+    @ApiOperation("鑾峰彇褰撳墠妫�楠屼换鍔＄殑鎵�鏈夋楠屽憳淇℃伅")
+    //杩欓噷鐨勪紶鍙傛槸鏍峰搧id,绛夋楠屼换鍔￠偅鍧楀叏鏀逛簡涔嬪悗杩欓噷灏辨病闂
+    public Result<?> getCheckUser(Integer id,String sonLaboratory) {
+        List<InsSampleUser> insSampleUsers = insSampleUserMapper.selectList(Wrappers.<InsSampleUser>lambdaQuery()
+                .eq(InsSampleUser::getState, 0)   //妫�楠屼汉
+                .eq(InsSampleUser::getInsSampleId, id)
+                .eq(InsSampleUser::getSonLaboratory, sonLaboratory));
+        return Result.success(insSampleUsers);
+    }
+
 }

--
Gitblit v1.9.3