From ba0d35c0b005d7687ff1abc4dd30eb15de46dcd0 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 28 五月 2024 14:06:44 +0800
Subject: [PATCH] 光纤配置

---
 inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardMethodListServiceImpl.java |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 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 69f8145..83a74fd 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
@@ -9,12 +9,8 @@
 import com.yuanchu.mom.service.StandardMethodListService;
 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;
+import java.util.*;
 
 /**
 * @author Administrator
@@ -31,7 +27,6 @@
     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);
@@ -83,18 +78,25 @@
         switch (trees.length){
             case 5:
                 str += "\"" + trees[2] + "\",\"" + trees[3] + "\",\"" + trees[4] + "\"";
+                standardMethodLists.addAll(standardMethodListMapper.selectStandardMethodLists(str));
+                standardMethodLists.addAll(standardMethodListMapper.selectStandardMethodLists("\"" + trees[2] + "\",\"" + trees[3] + "\""));
+                standardMethodLists.addAll(standardMethodListMapper.selectStandardMethodLists("\"" + trees[2] + "\""));
                 break;
             case 4:
                 str += "\"" + trees[2] + "\",\"" + trees[3] + "\"";
+                standardMethodLists.addAll(standardMethodListMapper.selectStandardMethodLists(str));
+                standardMethodLists.addAll(standardMethodListMapper.selectStandardMethodLists("\"" + trees[2] + "\""));
                 break;
             case 3:
                 str += "\"" + trees[2] + "\"";
+                standardMethodLists.addAll(standardMethodListMapper.selectStandardMethodLists3(str));
                 break;
             default:
                 map.put("standardMethodList", null);
                 return map;
         }
-        map.put("standardMethodList", standardMethodListMapper.selectStandardMethodLists(str));
+        standardMethodLists.addAll(standardMethodListMapper.selectStandardMethodListsByNull(str));
+        map.put("standardMethodList", standardMethodLists);
         return map;
     }
 
@@ -125,15 +127,13 @@
     }
 
     @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));
+        return standardMethodListMapper.selectListEnum();
     }
 
 }

--
Gitblit v1.9.3