From 7d5f9679128b3084c502b2bf6b076453a439cefc Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期二, 25 三月 2025 10:07:01 +0800 Subject: [PATCH] 检验任务时间筛选 --- inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardMethodListServiceImpl.java | 24 ++++++++++++++---------- 1 files changed, 14 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..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 @@ -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,17 +127,19 @@ } @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