From 8ce50189f0b00d62390d67fd27f859ca7831616b Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 23 五月 2024 17:32:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java |   56 +++++++++++++++++++++++++++++---------------------------
 1 files changed, 29 insertions(+), 27 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..1fe8cf3 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
@@ -5,19 +5,19 @@
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 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 +39,8 @@
 
     private StandardProductListMapper standardProductListMapper;
 
+    private StandardProductListService standardProductListService;
+
     @Override
     public List<FactoryDto> selectStandardTreeList() {
         return standardTreeMapper.selectStandardTreeList();
@@ -47,17 +49,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);
     }
 
@@ -69,7 +60,7 @@
             case 5:
                 standardTreeMapper.delete(Wrappers.<StandardTree>lambdaUpdate().eq(StandardTree::getFactory, trees[0]).eq(StandardTree::getLaboratory, trees[1]).eq(StandardTree::getSampleType, trees[2]).eq(StandardTree::getSample, trees[3]).eq(StandardTree::getModel, trees[4]));
                 break;
-            case 4:
+            /*case 4:
                 standardTreeMapper.delete(Wrappers.<StandardTree>lambdaUpdate().eq(StandardTree::getFactory, trees[0]).eq(StandardTree::getLaboratory, trees[1]).eq(StandardTree::getSampleType, trees[2]).eq(StandardTree::getSample, trees[3]));
                 break;
             case 3:
@@ -80,14 +71,7 @@
                 break;
             case 1:
                 standardTreeMapper.delete(Wrappers.<StandardTree>lambdaUpdate().eq(StandardTree::getFactory, trees[0]));
-                break;
-        }
-        Map<String, List<?>> listMap = standardMethodListService.selectsStandardMethodByFLSSM(tree);
-        if(listMap.get("standardMethodList").size() != 0){
-            standardMethodListMapper.deleteBatchIds(listMap.get("standardMethodList"));
-        }
-        if(listMap.get("standardProductList").size() != 0){
-            standardProductListMapper.deleteBatchIds(listMap.get("standardProductList"));
+                break;*/
         }
         return 1;
     }
@@ -102,20 +86,38 @@
             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();
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int upStandardProducts(Map<String, Object> product) {
+        List<Integer> ids = JSON.parseArray(JSON.toJSONString(product.get("ids")));
+        StandardProductList productList = JSON.parseObject(JSON.toJSONString(product.get("standardProductList")), StandardProductList.class);
+        standardProductListMapper.update(productList, Wrappers.<StandardProductList>lambdaUpdate().in(StandardProductList::getId, ids));
+        return 1;
+    }
 }
 
 

--
Gitblit v1.9.3