From ec6c3bc0b778178b2518302ffc9099ac8f6cc8a2 Mon Sep 17 00:00:00 2001 From: value <z1292839451@163.com> Date: 星期二, 30 四月 2024 00:54:34 +0800 Subject: [PATCH] 标准库修复 --- inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardMethodListServiceImpl.java | 32 ++++++++++++++++++++++++-------- 1 files changed, 24 insertions(+), 8 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 b891bc4..b4efc3c 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,8 +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; @@ -30,7 +30,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); @@ -77,11 +76,29 @@ public Map<String, List<?>> selectsStandardMethodByFLSSM(String tree) { String[] trees = tree.split(" - "); Map<String, List<?>> map = new HashMap<>(); - if(trees.length < 3) { - map.put("standardMethodList", null); - return map; + String str = ""; + List<StandardMethodList> standardMethodLists = new ArrayList<>(); + 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; } - List<StandardMethodList> standardMethodLists = standardMethodListMapper.selectStandardMethodLists(trees[2]); + map.put("standardMethodList", standardMethodLists); return map; } @@ -113,16 +130,15 @@ } @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