From b8045b11ca8af95cb5aeba464bff589e0b9f53b8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 30 五月 2024 18:08:13 +0800
Subject: [PATCH] 光纤配置三层架构+辅助工时的审核与批准逻辑修改
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardMethodListServiceImpl.java | 37 +++++++++++++++++++++++++------------
1 files changed, 25 insertions(+), 12 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..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,11 +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.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* @author Administrator
@@ -30,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,11 +73,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]);
+ standardMethodLists.addAll(standardMethodListMapper.selectStandardMethodListsByNull(str));
map.put("standardMethodList", standardMethodLists);
return map;
}
@@ -113,16 +127,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));
+ return standardMethodListMapper.selectListEnum();
}
+
}
--
Gitblit v1.9.3