From edd98c54519f1f36fb561bdc1cb7aa33c6d68530 Mon Sep 17 00:00:00 2001
From: 朱佳吉 <1527963051@qq.com>
Date: 星期二, 07 五月 2024 17:35:17 +0800
Subject: [PATCH] 通过pid获取检验单当前试验室所有项目是否有检验结果后进行判断检验单是否更改成"已检"状态
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardMethodListServiceImpl.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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..1e4de45 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,7 +9,6 @@
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;
@@ -31,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);
@@ -83,18 +81,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));
+
+ map.put("standardMethodList", standardMethodLists);
return map;
}
@@ -125,15 +130,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