From ce7184b9b054e4cd98af2d747545d04ae85c2728 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 29 四月 2024 01:45:52 +0800
Subject: [PATCH] 修改产品绑定和标准库关系

---
 inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java |   55 ++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java
index fe4ec92..e00359d 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java
@@ -2,22 +2,24 @@
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.mom.common.GetLook;
 import com.yuanchu.mom.dto.FactoryDto;
+import com.yuanchu.mom.dto.SampleTypeDto;
 import com.yuanchu.mom.mapper.StandardMethodListMapper;
 import com.yuanchu.mom.mapper.StandardProductListMapper;
-import com.yuanchu.mom.pojo.StandardMethodList;
+import com.yuanchu.mom.mapper.StandardTreeMapper;
 import com.yuanchu.mom.pojo.StandardProductList;
 import com.yuanchu.mom.pojo.StandardTree;
 import com.yuanchu.mom.service.StandardMethodListService;
+import com.yuanchu.mom.service.StandardProductListService;
 import com.yuanchu.mom.service.StandardTreeService;
-import com.yuanchu.mom.mapper.StandardTreeMapper;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -39,6 +41,10 @@
 
     private StandardProductListMapper standardProductListMapper;
 
+    private StandardProductListService standardProductListService;
+
+    private GetLook getLook;
+
     @Override
     public List<FactoryDto> selectStandardTreeList() {
         return standardTreeMapper.selectStandardTreeList();
@@ -47,17 +53,6 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int addStandardTree(StandardTree standardTree) {
-        if(standardTree.getSample()!=null){
-            List<StandardProductList> list = standardTreeMapper.getStandardProductListBySample(standardTree.getSampleType());
-            for (StandardProductList standardProductList : list) {
-                standardProductList.setFactory(standardTree.getFactory());
-                standardProductList.setLaboratory(standardTree.getLaboratory());
-                standardProductList.setSampleType(standardTree.getSampleType());
-                standardProductList.setSample(standardTree.getSample());
-                standardProductList.setModel(standardTree.getModel());
-                standardProductListMapper.insert(standardProductList);
-            }
-        }
         return standardTreeMapper.insert(standardTree);
     }
 
@@ -82,12 +77,16 @@
                 standardTreeMapper.delete(Wrappers.<StandardTree>lambdaUpdate().eq(StandardTree::getFactory, trees[0]));
                 break;
         }
-        Map<String, List<?>> listMap = standardMethodListService.selectsStandardMethodByFLSSM(tree);
-        if(listMap.get("standardMethodList").size() != 0){
+        Map<String, List<?>> listMap = standardMethodListService.selectsStandardMethodByFLSSM2(tree);
+        if (listMap.get("standardMethodList").size() != 0) {
+            for (Object o : listMap.get("standardMethodList")) {
+                JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(o));
+                List<StandardProductList> list = standardProductListService.selectStandardProductListByMethodId((Integer) jsonObject.get("id"), tree);
+                if (list.size() != 0) {
+                    standardProductListMapper.deleteBatchIds(list);
+                }
+            }
             standardMethodListMapper.deleteBatchIds(listMap.get("standardMethodList"));
-        }
-        if(listMap.get("standardProductList").size() != 0){
-            standardProductListMapper.deleteBatchIds(listMap.get("standardProductList"));
         }
         return 1;
     }
@@ -102,20 +101,30 @@
             standardProductList.setFactory(trees[0]);
             try {
                 standardProductList.setLaboratory(trees[1]);
-            }catch (Exception e){}
+            } catch (Exception e) {
+            }
             try {
                 standardProductList.setSampleType(trees[2]);
-            }catch (Exception e){}
+            } catch (Exception e) {
+            }
             try {
                 standardProductList.setSample(trees[3]);
-            }catch (Exception e){}
+            } catch (Exception e) {
+            }
             try {
                 standardProductList.setModel(trees[4]);
-            }catch (Exception e){}
+            } catch (Exception e) {
+            }
             standardProductListMapper.insert(standardProductList);
         }
         return 1;
     }
+
+    @Override
+    public List<SampleTypeDto> getStandardTree2() {
+        return standardTreeMapper.getStandardTree2();
+    }
+
 }
 
 

--
Gitblit v1.9.3