From 5222547bc18ae20144547e2d60af5a6c26988cc2 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期四, 05 十二月 2024 11:58:46 +0800
Subject: [PATCH] 采样调整

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/SamplingServiceApi.java |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SamplingServiceApi.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SamplingServiceApi.java
index 3731a47..640dbc8 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SamplingServiceApi.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SamplingServiceApi.java
@@ -9,6 +9,8 @@
 import com.ltkj.hosp.service.ITjCustomerService;
 import com.ltkj.hosp.service.ITjOrderService;
 import com.ltkj.hosp.service.ITjSamplingService;
+import com.ltkj.system.mapper.SysConfigMapper;
+import com.ltkj.system.service.ISysConfigService;
 import com.ltkj.web.controller.lis.LisApiMethod;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +29,10 @@
     private ITjCustomerService customerService;
     @Autowired
     private LisApiMethod lisApiMethod;
+    @Autowired
+    private SysConfigMapper sysConfigMapper;
+    @Autowired
+    private ISysConfigService sysConfigService;
 
     /**
      * 纭閲囨牱鎺ュ彛
@@ -38,6 +44,9 @@
     }
 
     public AjaxResult confirm(List<String> ids,String config,String mergeRequest) {
+
+
+        // sfkqdshitulianjie
         if (null == ids || ids.isEmpty()) {
             return AjaxResult.error("璇烽�夋嫨瑕佺‘璁ら」");
         }
@@ -46,9 +55,15 @@
             return AjaxResult.error("璇烽�夋嫨瑕佺‘璁ら」");
         String errorMsg = "";
         for (TjSampling sampling : tjSamplings) {
-            if (sampling.getJyxmdm() == null)
-                errorMsg+=sampling.getProName()+"鍦╨is绯荤粺鏈壘鍒板搴旂紪鐮佹棤娉曞彂鍑虹敵璇�";
+            if (!sysConfigService.selectConfigByKey("sfkqdshitulianjie").toLowerCase().equals("y")) {
+                if (sampling.getJyxmdm() == null)
+                    errorMsg+=sampling.getProName()+"鍦╨is绯荤粺鏈壘鍒板搴旂紪鐮佹棤娉曞彂鍑虹敵璇�";
+            }
             sampling.setIsSignFor("0");
+
+
+
+
 //                LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
 //                wq.eq(TjProject::getProParentId, sampling.getProId());
 //                List<TjProject> projectList = projectService.list(wq);

--
Gitblit v1.8.0