From 476740c4330135b38be6a32f54dbe1bbcd32476a Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 13 一月 2025 13:20:56 +0800
Subject: [PATCH] Merge branch 'master' into cnas
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardMethodListServiceImpl.java | 45 ++++++++++++++++++++++++---------------------
1 files changed, 24 insertions(+), 21 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 85c5b37..82d1f22 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
@@ -2,19 +2,15 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.mom.mapper.StandardMethodListMapper;
import com.yuanchu.mom.mapper.StandardProductListMapper;
import com.yuanchu.mom.pojo.StandardMethodList;
import com.yuanchu.mom.pojo.StandardProductList;
import com.yuanchu.mom.service.StandardMethodListService;
-import com.yuanchu.mom.mapper.StandardMethodListMapper;
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);
@@ -77,25 +72,30 @@
@Override
public Map<String, List<?>> selectsStandardMethodByFLSSM(String tree) {
String[] trees = tree.split(" - ");
- List<StandardMethodList> standardMethodLists = null;
+ Map<String, List<?>> map = new HashMap<>();
+ String str = "";
+ List<StandardMethodList> standardMethodLists = new ArrayList<>();
switch (trees.length){
case 5:
- standardMethodLists = standardMethodListMapper.selectStandardMethodLists(trees[0],trees[1],trees[2],trees[3],trees[4]);
+ 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:
- standardMethodLists = standardMethodListMapper.selectStandardMethodLists(trees[0],trees[1],trees[2],trees[3],null);
+ str += "\"" + trees[2] + "\",\"" + trees[3] + "\"";
+ standardMethodLists.addAll(standardMethodListMapper.selectStandardMethodLists(str));
+ standardMethodLists.addAll(standardMethodListMapper.selectStandardMethodLists("\"" + trees[2] + "\""));
break;
case 3:
- standardMethodLists = standardMethodListMapper.selectStandardMethodLists(trees[0],trees[1],trees[2],null,null);
+ str += "\"" + trees[2] + "\"";
+ standardMethodLists.addAll(standardMethodListMapper.selectStandardMethodLists3(str));
break;
- case 2:
- standardMethodLists = standardMethodListMapper.selectStandardMethodLists(trees[0],trees[1],null,null,null);
- break;
- case 1:
- standardMethodLists = standardMethodListMapper.selectStandardMethodLists(trees[0],null,null,null,null);
- break;
+ default:
+ map.put("standardMethodList", null);
+ return map;
}
- Map<String, List<?>> map = new HashMap<>();
+ standardMethodLists.addAll(standardMethodListMapper.selectStandardMethodListsByNull(str));
map.put("standardMethodList", standardMethodLists);
return map;
}
@@ -127,15 +127,18 @@
}
@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();
+ }
+
+ @Override
+ public Integer getStandardMethodId(String code) {
+ return baseMapper.getStandardMethodId(code);
}
}
--
Gitblit v1.9.3