From 929c6698f4d7598997fc233e09c39c3bdce9fcf8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 14 八月 2025 10:23:15 +0800
Subject: [PATCH] 判断合格绝对值的问题
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java | 89 +++++++++++++++++++++++++++++++++++---------
1 files changed, 71 insertions(+), 18 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 c581420..8b37802 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
@@ -12,9 +12,11 @@
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.dto.ProductDto;
import com.yuanchu.mom.exception.ErrorException;
+import com.yuanchu.mom.mapper.StandardMethodListMapper;
import com.yuanchu.mom.mapper.StandardProductListMapper;
import com.yuanchu.mom.mapper.StandardTreeMapper;
import com.yuanchu.mom.pojo.InsSample;
+import com.yuanchu.mom.pojo.StandardMethodList;
import com.yuanchu.mom.pojo.StandardProductList;
import com.yuanchu.mom.pojo.StandardTree;
import com.yuanchu.mom.service.StandardProductListService;
@@ -61,27 +63,29 @@
@Override
public List<StandardProductList> selectStandardProductList(InsSample insSample) {
String[] models = insSample.getModel().split("-(?=[^-]*$)");//鎷嗗垎鏈�鍚庝竴涓��-銆�
- List<StandardProductList> list = standardProductListMapper.selectDetail(insSample.getStandardMethodListId(), 1, models[0]);
+ String[] models1 = insSample.getModel().split(";(?=[^;]*$)");//鎷嗗垎鏈�鍚庝竴涓��-銆�
+ List<Integer> ids = Arrays.stream(insSample.getStandardMethodListId().split(","))
+ .map(String::trim).map(Integer::parseInt).collect(Collectors.toList());
+ List<StandardProductList> list = standardProductListMapper.selectDetail(ids, 1, models[0]);
if (list.size() == 0) {
if (Objects.equals(insSample.getFactory(), "") || insSample.getFactory() == null) {
return null;
}
String[] split = insSample.getFactory().split(" - ");
String tree = split[0] + " - " + split[1] + " - " + split[2] + " - " + split[3] + " - null";
- list = standardProductListMapper.selectDetail2(insSample.getStandardMethodListId(), 1, tree);
+ list = standardProductListMapper.selectDetail2(ids, 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 = standardProductListMapper.selectDetail2(ids, 1, tree1);
}
}
String[] split1 = insSample.getFactory().split(" - ");
//鍒ゆ柇闀垮害
if (split1.length > 4) {
if (ObjectUtils.isNotEmpty(split1[3])) {
- list = list.stream().filter(list1 -> Objects.nonNull(list1.getSample())&&Objects.equals(list1.getSample(),split1[3])).collect(Collectors.toList());
- }else if (split1[3].equals("")) {
- list = list.stream().filter(list1 -> Objects.nonNull(list1.getSampleType())&&Objects.equals(list1.getSampleType(),split1[2])).collect(Collectors.toList());
-
+ list = list.stream().filter(list1 -> Objects.nonNull(list1.getSample()) && Objects.equals(list1.getSample(), split1[3])).collect(Collectors.toList());
+ } else if (split1[3].equals("")) {
+ list = list.stream().filter(list1 -> Objects.nonNull(list1.getSampleType()) && Objects.equals(list1.getSampleType(), split1[2])).collect(Collectors.toList());
}
}
list = list.stream().filter(a -> {
@@ -99,9 +103,9 @@
} else {
if (sections.get(i).contains("&")) {
String[] split = sections.get(i).split("&");
- isIf = getIsIf(split[0], models[1]) && getIsIf(split[1], models[1]);
+ isIf = getIsIf(split[0], models1[1]);
} else {
- isIf = getIsIf(sections.get(i), models[1]);
+ isIf = getIsIf(sections.get(i), models1[1]);
}
if (isIf) {
a.setSection(sections.get(i));
@@ -119,16 +123,64 @@
return false;
}
return true;
+ }).map(standardProductList -> {
+ String code = baseMapper.selectStandardMethodById(standardProductList.getStandardMethodListId());
+ standardProductList.setMethodS(code);
+ return standardProductList;
}).collect(Collectors.toList());
+ //鎸夌収鐢佃矾璇曢獙--杈愬皠璇曢獙--娓╂箍搴﹁瘯楠�--鐜璇曢獙杩涜鎺掑簭
+ // 瀹氫箟鑷畾涔夋帓搴忓櫒
+ Comparator<StandardProductList> testTypeComparator = (o1, o2) -> {
+ String[] order = {"鐢佃矾璇曢獙", "杈愬皠璇曢獙", "娓╂箍搴﹁瘯楠�", "鐜璇曢獙", "鍔熺巼璇曢獙"};
+ int index1 = -1;
+ int index2 = -1;
+ // 鎵惧嚭涓や釜瀵硅薄 鍦ㄨ嚜瀹氫箟椤哄簭鏁扮粍涓殑浣嶇疆
+ for (int i = 0; i < order.length; i++) {
+ if (o1.getInspectionItem().equals(order[i])) {
+ index1 = i;
+ }
+ if (o2.getInspectionItem().equals(order[i])) {
+ index2 = i;
+ }
+ if (index1 != -1 && index2 != -1) {
+ break; // 涓や釜浣嶇疆閮芥壘鍒颁簡锛屽彲浠ラ��鍑哄惊鐜�
+ }
+ }
+ // 姣旇緝浣嶇疆
+ int compareResult = Integer.compare(index1, index2);
+ // 濡傛灉鏄幆澧冭瘯楠岋紝涓斾袱涓璞″湪涓绘楠岄」鐩笂鎺掑簭鐩稿悓锛屽垯鐢ㄦ绾ф楠岄」鐩帓搴�
+ if (compareResult == 0 && order[index1].equals("鐜璇曢獙")) {
+ String[] subOrder = {"鍐叉按璇曢獙", "鎸姩璇曢獙"};
+ int subIndex1 = -1;
+ int subIndex2 = -1;
+ for (int i = 0; i < subOrder.length; i++) {
+ if (o1.getInspectionItemSubclass().contains(subOrder[i])) {
+ subIndex1 = i;
+ }
+ if (o2.getInspectionItemSubclass().contains(subOrder[i])) {
+ subIndex2 = i;
+ }
+ if (subIndex1 != -1 && subIndex2 != -1) {
+ break; // 涓や釜娆＄骇浣嶇疆閮芥壘鍒颁簡锛屽彲浠ラ��鍑哄惊鐜�
+ }
+ }
+ compareResult = Integer.compare(subIndex1, subIndex2);
+ }
+ // 姣旇緝浣嶇疆
+ return compareResult;
+ };
+ // 瀵瑰垪琛ㄨ繘琛屾帓搴�
+ Collections.sort(list, testTypeComparator);
return list;
}
private boolean getIsIf(String str, String model) {
Matcher matcher = Pattern.compile("\\d+(\\.\\d+)?").matcher(model);
String model2 = "";
- while (matcher.find()) {
+ if (matcher.find()) {
model2 += matcher.group();
- break;
+ } else {
+ model2 = model;
}
if (str.contains("鈮�") || str.contains(">=")) {
String param = str.replace("鈮�", "").replace(">=", "");
@@ -144,7 +196,11 @@
return new BigDecimal(model2).compareTo(new BigDecimal(param)) < 0;
} else if (str.contains("=")) {
String param = str.replace("=", "");
- return new BigDecimal(model2).compareTo(new BigDecimal(param)) == 0;
+ if (matcher.find()) {
+ return new BigDecimal(model2).compareTo(new BigDecimal(param)) == 0;
+ } else {
+ return model2.equals(param);
+ }
}
return false;
}
@@ -189,8 +245,7 @@
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) {
+ } 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();
@@ -205,8 +260,7 @@
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 {
+ } else {
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]));
}
@@ -272,7 +326,7 @@
int retryCount = 0;
while (!success && retryCount < 100) {
try {
- standardProductListService2.saveBatch(list.stream().map(a -> {
+ standardProductListService2.saveOrUpdateBatch(list.stream().map(a -> {
a.setFactory(trees[0]);
a.setLaboratory(trees[1]);
a.setSampleType(trees[2]);
@@ -281,7 +335,6 @@
a.setStandardMethodListId(id);
return a;
}).collect(Collectors.toList()));
- ;
success = true;
} catch (Exception e) {
retryCount++;
--
Gitblit v1.9.3