From 36b1e0df911a72aa483944685ada722192ff04c8 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期日, 05 五月 2024 19:18:37 +0800
Subject: [PATCH] 标准库增加区间设置功能
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 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 0a6d4e0..12c55aa 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
@@ -8,11 +8,13 @@
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 java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.CompletableFuture;
@@ -46,7 +48,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(), "")) {
@@ -82,16 +84,19 @@
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("\"");
} else {
str.append("\"").append(trees[2]).append("\",\"").append(trees[3]).append("\"");
+ list.addAll(standardTreeMapper.selectStandardProductListByTree("\"" + trees[2] + "\""));
}
- List<StandardProductList> list = standardTreeMapper.selectStandardProductListByTree(str + "");
+ list.addAll(standardTreeMapper.selectStandardProductListByTree(str + ""));
List<StandardProductList> standardProductLists = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery().eq(StandardProductList::getStandardMethodListId, id).eq(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())) {
pl.setId(sp.getId());
pl.setState(sp.getState());
pl.setFactory(sp.getFactory());
@@ -105,6 +110,15 @@
}
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;
}
@@ -135,7 +149,13 @@
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