From 825da6ff9fbab76ca933930e35575cc8b0e811bd Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期二, 19 三月 2024 17:11:23 +0800
Subject: [PATCH] 功能大调整

---
 inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java |   50 +++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 39 insertions(+), 11 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..c5df3a3 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
@@ -1,7 +1,9 @@
 package com.yuanchu.mom.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 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.dto.FactoryDto;
@@ -11,9 +13,11 @@
 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.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -39,6 +43,8 @@
 
     private StandardProductListMapper standardProductListMapper;
 
+    private StandardProductListService standardProductListService;
+
     @Override
     public List<FactoryDto> selectStandardTreeList() {
         return standardTreeMapper.selectStandardTreeList();
@@ -47,14 +53,28 @@
     @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) {
+        List<StandardProductList> productList = standardTreeMapper.getStandardProductListBySample(standardTree.getSampleType());
+        List<StandardMethodList> methodList = standardTreeMapper.getStandardMethodListBySample(standardTree.getSampleType());
+        for (StandardMethodList standardMethod : methodList) {
+            standardMethod.setFactory(standardTree.getFactory());
+            standardMethod.setLaboratory(standardTree.getLaboratory());
+            standardMethod.setSampleType(standardTree.getSampleType());
+            standardMethod.setSample(standardTree.getSample());
+            standardMethod.setModel(standardTree.getModel());
+            standardMethodListMapper.insert(standardMethod);
+            for (StandardProductList standardProductList : productList) {
                 standardProductList.setFactory(standardTree.getFactory());
                 standardProductList.setLaboratory(standardTree.getLaboratory());
                 standardProductList.setSampleType(standardTree.getSampleType());
                 standardProductList.setSample(standardTree.getSample());
                 standardProductList.setModel(standardTree.getModel());
+                standardProductList.setStandardMethodListId(standardMethod.getId());
+                standardProductList.setState(1);
+                standardProductList.setId(null);
+                standardProductList.setCreateUser(null);
+                standardProductList.setCreateTime(null);
+                standardProductList.setUpdateUser(null);
+                standardProductList.setUpdateTime(null);
                 standardProductListMapper.insert(standardProductList);
             }
         }
@@ -83,11 +103,15 @@
                 break;
         }
         Map<String, List<?>> listMap = standardMethodListService.selectsStandardMethodByFLSSM(tree);
-        if(listMap.get("standardMethodList").size() != 0){
+        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"));
+                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,16 +126,20 @@
             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;

--
Gitblit v1.9.3