From 8e89de5320fbfebc14851fc4fd7ea9231ba28896 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期六, 18 五月 2024 08:09:03 +0800
Subject: [PATCH] 标准库修复
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java | 81 +++++++++++++++++++++++++++-------------
1 files changed, 55 insertions(+), 26 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 270825e..a3fef54 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
@@ -16,9 +16,7 @@
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors;
@@ -42,6 +40,9 @@
@Override
public int upStandardProductList(StandardProductList list) {
+ /*if(list.getId()==null || list.getId().equals("")){
+
+ }*/
return standardProductListMapper.updateById(list);
}
@@ -103,17 +104,32 @@
}
@Override
- public List<StandardProductList> selectStandardProductListByMethodId(Integer id, String tree) {
+ public Map<String, Object> selectStandardProductListByMethodId(Integer id, String tree, Integer page) {
String[] trees = tree.split(" - ");
List<StandardProductList> list = new ArrayList<>();
if (trees.length == 3) {
List<StandardTree> treeList = standardTreeMapper.selectList(Wrappers.<StandardTree>lambdaQuery().eq(StandardTree::getLaboratory, trees[1]).eq(StandardTree::getSampleType, trees[2]));
+ if(treeList.size()==0){
+ StandardTree standardTree = new StandardTree();
+ standardTree.setFactory(trees[0]);
+ standardTree.setLaboratory(trees[1]);
+ standardTree.setSampleType(trees[2]);
+ treeList.add(standardTree);
+ }
for (StandardTree standardTree : treeList) {
String str = tree+" - "+standardTree.getSample()+" - "+standardTree.getModel();
list.addAll(standardTreeMapper.selectStandardProductListByTree3("\"" + 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]));
+ if(treeList.size()==0){
+ StandardTree standardTree = new StandardTree();
+ standardTree.setFactory(trees[0]);
+ standardTree.setLaboratory(trees[1]);
+ standardTree.setSampleType(trees[2]);
+ standardTree.setSample(trees[2]);
+ treeList.add(standardTree);
+ }
for (StandardTree standardTree : treeList) {
String str = tree+" - "+standardTree.getModel();
list.addAll(standardTreeMapper.selectStandardProductListByTree("\"" + trees[2] + "\"", standardTree.getSample(), standardTree.getModel(), str));
@@ -127,10 +143,14 @@
for (StandardProductList sp : standardProductLists) {
for (StandardProductList pl : list) {
if (Objects.equals(sp.getInspectionItem(), pl.getInspectionItem())
- && Objects.equals(sp.getInspectionItemSubclass(), pl.getInspectionItemSubclass())
- && Objects.equals(sp.getModel(), pl.getModel())) {
+ && Objects.equals(sp.getInspectionItemSubclass()==null?"":sp.getInspectionItemSubclass(), pl.getInspectionItemSubclass()==null?"":pl.getInspectionItemSubclass())
+ && Objects.equals(sp.getModel(), pl.getModel()) && Objects.equals(sp.getStructureItemParameterId(), pl.getStructureItemParameterId())) {
pl.setId(sp.getId());
- pl.setState(sp.getState());
+ if(sp.getState()!=null&&!sp.getState().equals("")){
+ pl.setState(sp.getState());
+ }else{
+ pl.setState(id==0?1:0);
+ }
pl.setMethodS(sp.getMethodS());
if(sp.getAsk()!=null&&!sp.getAsk().equals("")){
pl.setAsk(sp.getAsk());
@@ -154,25 +174,34 @@
}
}
}
- Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
- CompletableFuture.supplyAsync(() -> {
- standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate().eq(StandardProductList::getStandardMethodListId, id).like(StandardProductList::getTree, tree));
- standardProductListService2.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;
+ if(page == 1){
+ Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
+ CompletableFuture.supplyAsync(() -> {
+ standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate().eq(StandardProductList::getStandardMethodListId, id).like(StandardProductList::getTree, tree));
+ standardProductListService2.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;
+ });
+ }
+ Map<String, Object> map = new HashMap<>();
+ try {
+ map.put("productList", list.subList((page - 1)*50, page * 50));
+ }catch (IndexOutOfBoundsException e){
+ map.put("productList", list.subList((page - 1)*50, list.size()));
+ }
+ map.put("total", list.size());
+ return map;
}
}
--
Gitblit v1.9.3