From a7a6a0c332f268010b4da0161cdee80acf9bc4ce Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期一, 22 四月 2024 15:59:57 +0800
Subject: [PATCH] 2024-4-22 资源要求-人员明细-bug修改

---
 inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardMethodListServiceImpl.java |   85 +++++++++++++++++++++++++++++++++++++++---
 1 files changed, 79 insertions(+), 6 deletions(-)

diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardMethodListServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardMethodListServiceImpl.java
index 98799f9..85c5b37 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardMethodListServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardMethodListServiceImpl.java
@@ -2,12 +2,17 @@
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.mom.mapper.StandardProductListMapper;
 import com.yuanchu.mom.pojo.StandardMethodList;
+import com.yuanchu.mom.pojo.StandardProductList;
 import com.yuanchu.mom.service.StandardMethodListService;
 import com.yuanchu.mom.mapper.StandardMethodListMapper;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -23,7 +28,10 @@
 
     private StandardMethodListMapper standardMethodListMapper;
 
+    private StandardProductListMapper standardProductListMapper;
+
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public int addStandardMethodList(Integer standardId, String tree) {
         String[] trees = tree.split(" - ");
         Map<String, String> map = standardMethodListMapper.selectStandardMethodById(standardId);
@@ -32,17 +40,42 @@
         list.setName(map.get("name"));
         list.setRemark(map.get("remark"));
         list.setFactory(trees[0]);
-        list.setLaboratory(trees[1]);
-        list.setSample_type(trees[2]);
-        list.setSample(trees[3]);
+        try {
+            list.setLaboratory(trees[1]);
+        }catch (Exception e){}
+        try {
+            list.setSampleType(trees[2]);
+        }catch (Exception e){}
+        try {
+            list.setSample(trees[3]);
+        }catch (Exception e){}
         try {
             list.setModel(trees[4]);
         }catch (Exception e){}
-        return standardMethodListMapper.insert(list);
+        standardMethodListMapper.insert(list);
+        List<StandardProductList> standardProductLists = standardMethodListMapper.selectParameterList(list.getCode());
+        for (StandardProductList standardProductList : standardProductLists) {
+            standardProductList.setStandardMethodListId(list.getId());
+            standardProductList.setFactory(trees[0]);
+            try {
+                standardProductList.setLaboratory(trees[1]);
+            }catch (Exception e){}
+            try {
+                standardProductList.setSampleType(trees[2]);
+            }catch (Exception e){}
+            try {
+                standardProductList.setSample(trees[3]);
+            }catch (Exception e){}
+            try {
+                standardProductList.setModel(trees[4]);
+            }catch (Exception e){}
+            standardProductListMapper.insert(standardProductList);
+        }
+        return 1;
     }
 
     @Override
-    public List<StandardMethodList> selectsStandardMethodByFLSSM(String tree) {
+    public Map<String, List<?>> selectsStandardMethodByFLSSM(String tree) {
         String[] trees = tree.split(" - ");
         List<StandardMethodList> standardMethodLists = null;
         switch (trees.length){
@@ -62,7 +95,47 @@
                 standardMethodLists = standardMethodListMapper.selectStandardMethodLists(trees[0],null,null,null,null);
                 break;
         }
-        return standardMethodLists;
+        Map<String, List<?>> map = new HashMap<>();
+        map.put("standardMethodList", standardMethodLists);
+        return map;
+    }
+
+    @Override
+    public Map<String, List<?>> selectsStandardMethodByFLSSM2(String tree) {
+        String[] trees = tree.split(" - ");
+        List<StandardMethodList> standardMethodLists = null;
+        switch (trees.length){
+            case 5:
+                standardMethodLists = standardMethodListMapper.selectStandardMethodLists2(trees[0],trees[1],trees[2],trees[3],trees[4]);
+                break;
+            case 4:
+                standardMethodLists = standardMethodListMapper.selectStandardMethodLists2(trees[0],trees[1],trees[2],trees[3],null);
+                break;
+            case 3:
+                standardMethodLists = standardMethodListMapper.selectStandardMethodLists2(trees[0],trees[1],trees[2],null,null);
+                break;
+            case 2:
+                standardMethodLists = standardMethodListMapper.selectStandardMethodLists2(trees[0],trees[1],null,null,null);
+                break;
+            case 1:
+                standardMethodLists = standardMethodListMapper.selectStandardMethodLists2(trees[0],null,null,null,null);
+                break;
+        }
+        Map<String, List<?>> map = new HashMap<>();
+        map.put("standardMethodList", standardMethodLists);
+        return map;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int delStandardMethodByFLSSM(Integer id) {
+        standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate().eq(StandardProductList::getStandardMethodListId, id));
+        return standardMethodListMapper.deleteById(id);
+    }
+
+    @Override
+    public List<StandardMethodList> selectStandardMethodEnum() {
+        return standardMethodListMapper.selectList(Wrappers.<StandardMethodList>lambdaQuery().select(StandardMethodList::getId,StandardMethodList::getCode,StandardMethodList::getName));
     }
 }
 

--
Gitblit v1.9.3