From 182b0785c628e6b1134d51985a692d0df7a8fb85 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 16 七月 2024 21:17:22 +0800
Subject: [PATCH] 区间改为&
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java | 135 +++++++++++++++++++++++++++++++++------------
1 files changed, 99 insertions(+), 36 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 4663183..451eaeb 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
@@ -1,13 +1,16 @@
package com.yuanchu.mom.service.impl;
+import cn.hutool.core.lang.Console;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.common.GetLook;
+import com.yuanchu.mom.dto.ProductDto;
import com.yuanchu.mom.mapper.StandardProductListMapper;
import com.yuanchu.mom.mapper.StandardTreeMapper;
import com.yuanchu.mom.pojo.InsSample;
@@ -56,16 +59,18 @@
@Override
public List<StandardProductList> selectStandardProductList(InsSample insSample) {
String[] models = insSample.getModel().split("-(?=[^-]*$)");//鎷嗗垎鏈�鍚庝竴涓��-銆�
- List<StandardProductList> list = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery().eq(StandardProductList::getStandardMethodListId, insSample.getStandardMethodListId()).eq(StandardProductList::getState, 1).eq(StandardProductList::getModel, models[0]));
+ List<StandardProductList> list = standardProductListMapper.selectDetail(insSample.getStandardMethodListId(), 1, models[0]);
if (list.size() == 0) {
- if(Objects.equals(insSample.getFactory(), "") || insSample.getFactory() == null){
+ if (Objects.equals(insSample.getFactory(), "") || insSample.getFactory() == null) {
return null;
}
String[] split = insSample.getFactory().split(" - ");
- list = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery()
- .eq(StandardProductList::getStandardMethodListId, insSample.getStandardMethodListId())
- .eq(StandardProductList::getState, 1)
- .like(StandardProductList::getTree, split[0] + " - " + split[1] + " - " + split[2] + " - " + split[3]));
+ String tree = split[0] + " - " + split[1] + " - " + split[2] + " - " + split[3] + " - null";
+ list = standardProductListMapper.selectDetail2(insSample.getStandardMethodListId(), 1, tree);
+ if (list.size()==0){
+ String tree1 = split[0] + " - " + split[1] + " - " + split[2] + " - null - " + split[3] ;
+ list = standardProductListMapper.selectDetail2(insSample.getStandardMethodListId(), 1, tree1);
+ }
}
list = list.stream().filter(a -> {
try {
@@ -77,9 +82,9 @@
List<String> prices = JSON.parseArray(a.getPrice(), String.class);
boolean isIf;
for (int i = 0; i < sections.size(); i++) {
- if(Objects.equals(a.getBsm(), "1")){
+ if (Objects.equals(a.getBsm(), "1")) {
return true;
- }else{
+ } else {
if (sections.get(i).contains("&")) {
String[] split = sections.get(i).split("&");
isIf = getIsIf(split[0], models[1]) && getIsIf(split[1], models[1]);
@@ -106,7 +111,7 @@
return list;
}
- private boolean getIsIf(String str, String model){
+ private boolean getIsIf(String str, String model) {
Matcher matcher = Pattern.compile("\\d+(\\.\\d+)?").matcher(model);
String model2 = "";
while (matcher.find()) {
@@ -118,10 +123,10 @@
} else if (str.contains("鈮�") || str.contains("<=")) {
String param = str.replace("鈮�", "").replace("<=", "");
return new BigDecimal(model2).compareTo(new BigDecimal(param)) < 1;
- } else if (str.contains(">")||str.contains("锛�")) {
+ } else if (str.contains(">") || str.contains("锛�")) {
String param = str.replace(">", "").replace("锛�", "");
return new BigDecimal(model2).compareTo(new BigDecimal(param)) > 0;
- } else if (str.contains("<")||str.contains("锛�")) {
+ } else if (str.contains("<") || str.contains("锛�")) {
String param = str.replace("<", "").replace("锛�", "");
return new BigDecimal(model2).compareTo(new BigDecimal(param)) < 0;
} else if (str.contains("=")) {
@@ -136,17 +141,34 @@
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);
+ List<StandardTree> treeList = new ArrayList<>();
+ StandardTree standardTree = new StandardTree();
+ standardTree.setFactory(trees[0]);
+ standardTree.setLaboratory(trees[1]);
+ standardTree.setSampleType(trees[2]);
+ List<ProductDto> pList = standardTreeMapper.selectPList(trees[2]);
+ if (pList.size() == 0 || pList.get(0) == null) {
+ List<StandardTree> treeList1 = standardTreeMapper.selectList(Wrappers.<StandardTree>lambdaQuery().eq(StandardTree::getLaboratory, trees[1]).eq(StandardTree::getSampleType, trees[2]));
+ if (treeList1.size() == 0) {
+ treeList.add(standardTree);
+ } else {
+ treeList.addAll(treeList1);
+ }
+ } else {
+ for (ProductDto p : pList) {
+ standardTree.setSample(p.getName());
+ List<StandardTree> treeList1 = standardTreeMapper.selectList(Wrappers.<StandardTree>lambdaQuery().eq(StandardTree::getLaboratory, trees[1]).eq(StandardTree::getSampleType, trees[2]).eq(StandardTree::getSample, p.getName()));
+ if (treeList1.size() == 0) {
+ treeList.add(JSON.parseObject(JSON.toJSONString(standardTree), StandardTree.class));
+ } else {
+ treeList.addAll(treeList1);
+ }
+ }
}
- for (StandardTree standardTree : treeList) {
- String str = tree + " - " + standardTree.getSample() + " - " + standardTree.getModel();
- list.addAll(standardTreeMapper.selectStandardProductListByTree3("\"" + trees[2] + "\"", standardTree.getSample(), standardTree.getModel(), str));
+ for (StandardTree standardTree2 : treeList) {
+ String tree2 = trees[0] + " - " + trees[1] + " - " + trees[2] + " - " + standardTree2.getSample() + " - " + standardTree2.getModel();
+ list.addAll(standardTreeMapper.selectStandardProductListByTree("\"" + trees[2] + "\"", standardTree2.getSample(), standardTree2.getModel(), tree2, trees[1]));
+ list.addAll(standardTreeMapper.selectStandardProductListByTree2("\"" + trees[2] + "\",\"" + standardTree2.getSample() + "\"", standardTree2.getSample(), standardTree2.getModel(), tree2, trees[1]));
}
} 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]));
@@ -155,17 +177,17 @@
standardTree.setFactory(trees[0]);
standardTree.setLaboratory(trees[1]);
standardTree.setSampleType(trees[2]);
- standardTree.setSample(trees[2]);
+ standardTree.setSample(trees[3]);
treeList.add(standardTree);
}
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));
+ list.addAll(standardTreeMapper.selectStandardProductListByTree("\"" + trees[2] + "\"", standardTree.getSample(), standardTree.getModel(), str, trees[1]));
+ list.addAll(standardTreeMapper.selectStandardProductListByTree2("\"" + trees[2] + "\",\"" + trees[3] + "\"", standardTree.getSample(), standardTree.getModel(), str, trees[1]));
}
} else {
- 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("\"" + trees[2] + "\"", trees[3].equals("null") ? null : trees[3], trees[4], tree, trees[1]));
+ list.addAll(standardTreeMapper.selectStandardProductListByTree2("\"" + trees[2] + "\",\"" + trees[3] + "\"", trees[3].equals("null") ? null : trees[3], trees[4], tree, trees[1]));
}
for (StandardProductList productList : list) {
productList.setId(IdWorker.getId());
@@ -174,8 +196,10 @@
for (StandardProductList sp : standardProductLists) {
for (StandardProductList pl : list) {
if (Objects.equals(sp.getInspectionItem(), pl.getInspectionItem())
- && Objects.equals((sp.getInspectionItemSubclass() == null)? "" : sp.getInspectionItemSubclass(), pl.getInspectionItemSubclass() == null ? "" : pl.getInspectionItemSubclass())
+ && Objects.equals((sp.getInspectionItemSubclass() == null) ? "" : sp.getInspectionItemSubclass(), pl.getInspectionItemSubclass() == null ? "" : pl.getInspectionItemSubclass())
+// && Objects.equals(sp.getSample(), pl.getSample())
&& Objects.equals(sp.getModel(), pl.getModel())
+ && sp.getTree().indexOf(pl.getSample() == null ? "null" : pl.getSample()) > -1
&& Objects.equals(sp.getStructureItemParameterId(), pl.getStructureItemParameterId())) {
pl.setId(sp.getId());
if (sp.getState() != null && !sp.getState().equals("")) {
@@ -202,7 +226,7 @@
if (sp.getTemplateId() != null && !sp.getTemplateId().equals("")) {
pl.setTemplateId(sp.getTemplateId());
}
- if(sp.getTree() != null && !sp.getTree().equals("")){
+ if (sp.getTree() != null && !sp.getTree().equals("")) {
pl.setTree(sp.getTree());
}
break;
@@ -212,9 +236,10 @@
if (page == 1) {
Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
CompletableFuture.supplyAsync(() -> {
- if(trees.length == 5){
+ System.out.println("寮�濮嬪紑濮嬪紑濮嬪紑濮�!!!!!!!!!!");
+ if (trees.length == 5) {
standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate().eq(StandardProductList::getStandardMethodListId, id).eq(StandardProductList::getTree, tree));
- }else{
+ } else {
standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate().eq(StandardProductList::getStandardMethodListId, id).like(StandardProductList::getTree, tree));
}
standardProductListService2.saveBatch(list.stream().map(a -> {
@@ -226,6 +251,7 @@
a.setStandardMethodListId(id);
return a;
}).collect(Collectors.toList()));
+ System.out.println("缁撴潫缁撴潫缁撴潫缁撴潫@@@@@@@@@@@@");
return null;
}).thenAccept(res -> {
}).exceptionally(e -> {
@@ -234,6 +260,25 @@
});
}
Map<String, Object> map = new HashMap<>();
+ Collections.sort(list, (o1, o2) -> {
+ String field1 = o1.getManHourGroup();
+ String field2 = o2.getManHourGroup();
+
+ boolean isEmpty1 = field1 == null || field1.isEmpty();
+ boolean isEmpty2 = field2 == null || field2.isEmpty();
+
+ if (isEmpty1 && isEmpty2) {
+ return 0;
+ } else if (isEmpty1) {
+ return 1;
+ } else if (isEmpty2) {
+ return -1;
+ } else {
+ int num1 = extractNumber(field1);
+ int num2 = extractNumber(field2);
+ return Integer.compare(num1, num2);
+ }
+ });
try {
map.put("productList", list.subList((page - 1) * 50, page * 50));
} catch (IndexOutOfBoundsException e) {
@@ -241,6 +286,15 @@
}
map.put("total", list.size());
return map;
+ }
+
+ private int extractNumber(String s) {
+ // 浠庡瓧绗︿覆涓彁鍙栨暟瀛楃殑閫昏緫锛岃繖閲屽亣璁惧瓧娈电殑鏍煎紡鏄� "text<number>"
+ String number = s;
+ if (!s.matches("\\d+")) {
+ number = s.replaceAll("\\D", "");
+ }
+ return Integer.parseInt(number);
}
@Override
@@ -252,18 +306,27 @@
}
@Override
- public Map<String, List<?>> selectStandardProductEnumByMethodId(Integer id, String tree) {
+ public Map<String, List<?>> selectStandardProductEnumByMethodId(Integer id, String tree, String item) {
HashMap<String, List<?>> map = new HashMap<>();
map.put("item", standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery()
.eq(StandardProductList::getStandardMethodListId, id)
.like(StandardProductList::getTree, tree)
.select(StandardProductList::getInspectionItem)
.groupBy(StandardProductList::getInspectionItem)));
- map.put("items", standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery()
- .eq(StandardProductList::getStandardMethodListId, id)
- .like(StandardProductList::getTree, tree)
- .select(StandardProductList::getInspectionItemSubclass)
- .groupBy(StandardProductList::getInspectionItemSubclass)));
+ if (ObjectUtils.isNotEmpty(item)) {
+ map.put("items", standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery()
+ .eq(StandardProductList::getStandardMethodListId, id)
+ .eq(StandardProductList::getInspectionItem, item)
+ .like(StandardProductList::getTree, tree)
+ .select(StandardProductList::getInspectionItemSubclass)
+ .groupBy(StandardProductList::getInspectionItemSubclass)));
+ } else {
+ map.put("items", standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery()
+ .eq(StandardProductList::getStandardMethodListId, id)
+ .like(StandardProductList::getTree, tree)
+ .select(StandardProductList::getInspectionItemSubclass)
+ .groupBy(StandardProductList::getInspectionItemSubclass)));
+ }
return map;
}
}
--
Gitblit v1.9.3