From af430e03b2f1a1db9369b17a96896dcec9217919 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 26 十一月 2024 08:57:25 +0800
Subject: [PATCH] Merge branch 'master' into dev

---
 inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 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 1dc996a..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;
@@ -44,6 +46,8 @@
 
     private InsProductService insProductService;
     private InsOrderStateService insOrderStateService;
+
+    private InsSampleUserMapper insSampleUserMapper;
 
     @ValueClassify("妫�楠屼换鍔�")
     @ApiOperation(value = "鑾峰彇妫�楠屼换鍔″垪琛�")
@@ -256,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