From 3015dec07ec03ee07e48915eae059b9f8c1b8433 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 06 五月 2024 21:26:17 +0800
Subject: [PATCH] 标准库修复完成
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java | 52 +++++++++++++++++++++-------------------------------
1 files changed, 21 insertions(+), 31 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java
index 12c55aa..5496da7 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java
@@ -17,7 +17,6 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
-import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors;
/**
@@ -83,27 +82,32 @@
@Override
public List<StandardProductList> selectStandardProductListByMethodId(Integer id, String tree) {
String[] trees = tree.split(" - ");
- StringBuffer str = new StringBuffer();
List<StandardProductList> list = new ArrayList<>();
if (trees.length == 3) {
- str.append("\"").append(trees[2]).append("\"");
+ List<StandardTree> treeList = standardTreeMapper.selectList(Wrappers.<StandardTree>lambdaQuery().eq(StandardTree::getLaboratory, trees[1]).eq(StandardTree::getSampleType, trees[2]));
+ for (StandardTree standardTree : treeList) {
+ String str = tree+" - "+standardTree.getSample()+" - "+standardTree.getModel();
+ list.addAll(standardTreeMapper.selectStandardProductListByTree("\"" + trees[2] + "\"", standardTree.getSample(), standardTree.getModel(), str));
+ }
+ } else if (trees.length == 4){
+ List<StandardTree> treeList = standardTreeMapper.selectList(Wrappers.<StandardTree>lambdaQuery().eq(StandardTree::getLaboratory, trees[1]).eq(StandardTree::getSampleType, trees[2]).eq(StandardTree::getSample, trees[3]));
+ for (StandardTree standardTree : treeList) {
+ String str = tree+" - "+standardTree.getModel();
+ list.addAll(standardTreeMapper.selectStandardProductListByTree("\"" + trees[2] + "\"", standardTree.getSample(), standardTree.getModel(), str));
+ list.addAll(standardTreeMapper.selectStandardProductListByTree2("\"" + trees[2] + "\",\"" + trees[3] + "\"", standardTree.getSample(), standardTree.getModel(), str));
+ }
} else {
- str.append("\"").append(trees[2]).append("\",\"").append(trees[3]).append("\"");
- list.addAll(standardTreeMapper.selectStandardProductListByTree("\"" + trees[2] + "\""));
+ list.addAll(standardTreeMapper.selectStandardProductListByTree("\"" + trees[2] + "\"", trees[3], trees[4], tree));
+ list.addAll(standardTreeMapper.selectStandardProductListByTree2("\"" + trees[2] + "\",\"" + trees[3] + "\"", trees[3], trees[4], tree));
}
- list.addAll(standardTreeMapper.selectStandardProductListByTree(str + ""));
- List<StandardProductList> standardProductLists = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery().eq(StandardProductList::getStandardMethodListId, id).eq(StandardProductList::getTree, tree));
+ List<StandardProductList> standardProductLists = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery().eq(StandardProductList::getStandardMethodListId, id).like(StandardProductList::getTree, tree));
for (StandardProductList sp : standardProductLists) {
for (StandardProductList pl : list) {
if (Objects.equals(sp.getInspectionItem(), pl.getInspectionItem())
- && Objects.equals(sp.getInspectionItemSubclass(), pl.getInspectionItemSubclass())) {
+ && Objects.equals(sp.getInspectionItemSubclass(), pl.getInspectionItemSubclass())
+ && Objects.equals(sp.getModel(), pl.getModel())) {
pl.setId(sp.getId());
pl.setState(sp.getState());
- pl.setFactory(sp.getFactory());
- pl.setLaboratory(sp.getLaboratory());
- pl.setSampleType(sp.getSampleType());
- pl.setSample(sp.getSample());
- pl.setModel(sp.getModel());
pl.setMethodS(sp.getMethodS());
if(sp.getAsk()!=null&&!sp.getAsk().equals("")){
pl.setAsk(sp.getAsk());
@@ -125,37 +129,23 @@
}
}
Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
- CompletableFuture.supplyAsync(() -> {
- standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate().eq(StandardProductList::getStandardMethodListId, id).eq(StandardProductList::getTree, tree));
+// CompletableFuture.supplyAsync(() -> {
+ standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate().eq(StandardProductList::getStandardMethodListId, id).like(StandardProductList::getTree, tree));
saveBatch(list.stream().map(a->{
a.setFactory(trees[0]);
a.setLaboratory(trees[1]);
a.setSampleType(trees[2]);
- try {
- a.setSample(trees[3]);
- }catch (Exception e){}
- try {
- a.setModel(trees[4]);
- }catch (Exception e){}
- a.setTree(tree);
a.setCreateUser(userId);
a.setUpdateUser(userId);
a.setStandardMethodListId(id);
return a;
}).collect(Collectors.toList()));
- return null;
+ /*return null;
}).thenAccept(res -> {
}).exceptionally(e -> {
e.printStackTrace();
return null;
- });
- switch (trees.length){
- case 3:
- standardTreeMapper.selectList(Wrappers.<StandardTree>lambdaQuery().eq(StandardTree::getFactory, trees[0]).eq(StandardTree::getLaboratory, trees[1]).eq(StandardTree::getSampleType, trees[2]));
- break;
- case 4:
- break;
- }
+ });*/
return list;
}
}
--
Gitblit v1.9.3