From ad54d502450e219c38f7d9b878ae07f759ab2a23 Mon Sep 17 00:00:00 2001
From: 朱佳吉 <1527963051@qq.com>
Date: 星期二, 07 五月 2024 17:58:54 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-after
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java | 75 ++++++++++++++++++++++++++-----------
1 files changed, 53 insertions(+), 22 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 6aeb5bb..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
@@ -3,19 +3,20 @@
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.mapper.StandardProductListMapper;
import com.yuanchu.mom.mapper.StandardTreeMapper;
import com.yuanchu.mom.pojo.InsSample;
import com.yuanchu.mom.pojo.StandardProductList;
+import com.yuanchu.mom.pojo.StandardTree;
import com.yuanchu.mom.service.StandardProductListService;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
-import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors;
/**
@@ -32,7 +33,7 @@
private StandardTreeMapper standardTreeMapper;
- private StandardProductListService standardProductListService;
+ private GetLook getLook;
@Override
public int upStandardProductList(StandardProductList list) {
@@ -46,7 +47,7 @@
@Override
public List<StandardProductList> selectStandardProductList(InsSample insSample) {
- List<StandardProductList> list = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery().eq(StandardProductList::getStandardMethodListId, insSample.getStandardMethodListId()).eq(StandardProductList::getState, 1));
+ List<StandardProductList> list = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery().eq(StandardProductList::getStandardMethodListId, insSample.getStandardMethodListId()).eq(StandardProductList::getState, 1).eq(StandardProductList::getModel, insSample.getModel()));
list = list.stream().filter(a -> {
try {
if (a.getSection() != null && !Objects.equals(a.getSection(), "")) {
@@ -79,42 +80,72 @@
}
@Override
- @Transactional(rollbackFor = Exception.class)
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] + "\"", trees[3], trees[4], tree));
+ list.addAll(standardTreeMapper.selectStandardProductListByTree2("\"" + trees[2] + "\",\"" + trees[3] + "\"", trees[3], trees[4], tree));
}
- List<StandardProductList> list = 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 (sp.getInspectionItem().equals(pl.getInspectionItem()) && sp.getInspectionItemSubclass().equals(pl.getInspectionItemSubclass())) {
+ if (Objects.equals(sp.getInspectionItem(), pl.getInspectionItem())
+ && 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());
+ }
+ if(sp.getTell()!=null&&!sp.getTell().equals("")){
+ pl.setTell(sp.getTell());
+ }
+ if(sp.getPrice()!=null&&!sp.getPrice().equals("")){
+ pl.setPrice(sp.getPrice());
+ }
+ if(sp.getManHour()!=null&&!sp.getManHour().equals("")){
+ pl.setManHour(sp.getManHour());
+ }
+ if(sp.getSection()!=null&&!sp.getSection().equals("")){
+ pl.setSection(sp.getSection());
+ }
break;
}
}
}
- CompletableFuture.supplyAsync(() -> {
- standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate().eq(StandardProductList::getStandardMethodListId, id).eq(StandardProductList::getTree, tree));
- standardProductListService.saveBatch(list);
- return null;
+ Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
+// 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]);
+ a.setCreateUser(userId);
+ a.setUpdateUser(userId);
+ a.setStandardMethodListId(id);
+ return a;
+ }).collect(Collectors.toList()));
+ /*return null;
}).thenAccept(res -> {
}).exceptionally(e -> {
e.printStackTrace();
return null;
- });
- ;
+ });*/
return list;
}
}
--
Gitblit v1.9.3