From 9f19d3a24f8474bf6f9eb9401888c44b34b381e6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 21 十一月 2024 14:29:50 +0800
Subject: [PATCH] 第一次改动(检验任务与样品关联,附件与样品关联,报告与样品关联)
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java | 349 +++++++++++++++++++++++++++++++---------------------------
1 files changed, 186 insertions(+), 163 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 0aca9ac..a57cadf 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,23 +1,29 @@
package com.yuanchu.mom.service.impl;
+import com.alibaba.excel.annotation.ExcelProperty;
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.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;
import com.yuanchu.mom.service.StandardProductListService2;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.*;
@@ -57,20 +63,30 @@
@Override
public List<StandardProductList> selectStandardProductList(InsSample insSample) {
String[] models = insSample.getModel().split("-(?=[^-]*$)");//鎷嗗垎鏈�鍚庝竴涓��-銆�
- String[] factorys = insSample.getFactory().split(" - ");
- //List<StandardProductList> list = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery().eq(StandardProductList::getStandardMethodListId, insSample.getStandardMethodListId()).eq(StandardProductList::getState, 1).eq(StandardProductList::getModel, models[0]).eq(StandardProductList::getSampleType, factorys[2]));
- 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(" - ");
- list = standardProductListMapper.selectDetail2(insSample.getStandardMethodListId(), 1, split[0] + " - " + split[1] + " - " + split[2] + " - " + split[3]);
- /* 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(ids, 1, tree);
+ if (list.size() == 0) {
+ String tree1 = split[0] + " - " + split[1] + " - " + split[2] + " - null - " + split[3];
+ 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(a -> {
try {
@@ -87,9 +103,16 @@
} 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]) && getIsIf(split[1], models[1].split(";")[0]);
} else {
- isIf = getIsIf(sections.get(i), models[1]);
+ if (ObjectUtils.isNotEmpty(models[1].split(";")[0])){
+ isIf = getIsIf(sections.get(i), models[1].split(";")[0]);
+ if (!isIf) {
+ isIf = getIsIf(sections.get(i), models1[1]);
+ }
+ }else {
+ isIf = getIsIf(sections.get(i), models1[1]);
+ }
}
if (isIf) {
a.setSection(sections.get(i));
@@ -107,15 +130,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().equals(subOrder[i])) {
+ subIndex1 = i;
+ }
+ if (o2.getInspectionItemSubclass().equals(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();
+ }else {
+ model2=model;
}
if (str.contains("鈮�") || str.contains(">=")) {
String param = str.replace("鈮�", "").replace(">=", "");
@@ -131,122 +203,24 @@
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;
}
@Override
+ @Transactional(rollbackFor = Exception.class)
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));
- list.addAll(standardTreeMapper.selectStandardProductListByTree2("\"" + trees[2] + "\",\"" + trees[3] + "\"", standardTree.getSample(), standardTree.getModel(), str));
- }
- } 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));
- }
- for (StandardProductList productList : list) {
- productList.setId(IdWorker.getId());
- }
- 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 (Objects.equals(sp.getInspectionItem(), pl.getInspectionItem())
- && 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());
- 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());
- }
- 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());
- }
- if (sp.getTemplateId() != null && !sp.getTemplateId().equals("")) {
- pl.setTemplateId(sp.getTemplateId());
- }
- if(sp.getTree() != null && !sp.getTree().equals("")){
- pl.setTree(sp.getTree());
- }
- break;
- }
- }
- }
- if (page == 1) {
- Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
- CompletableFuture.supplyAsync(() -> {
- if(trees.length == 5){
- standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate().eq(StandardProductList::getStandardMethodListId, id).eq(StandardProductList::getTree, tree));
- }else{
- 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;*/
String[] trees = tree.split(" - ");
+ try {
+ String tree1 = trees[2];
+ } catch (Exception e) {
+ throw new ErrorException("鎿嶄綔澶揩,绯荤粺浼犲弬閿欒!!!!");
+ }
List<StandardProductList> list = new ArrayList<>();
if (trees.length == 3) {
List<StandardTree> treeList = new ArrayList<>();
@@ -275,20 +249,11 @@
}
for (StandardTree standardTree2 : treeList) {
String tree2 = trees[0] + " - " + trees[1] + " - " + trees[2] + " - " + standardTree2.getSample() + " - " + standardTree2.getModel();
- /*if(standardTree2.getSample()!=null){
- tree2 += trees[0] + " - " + trees[1] + " - " + trees[2] + " - " + standardTree2.getSample();
- }
- if(standardTree2.getModel()!=null){
- if(standardTree2.getSample()!=null){
- tree2 += standardTree2.getModel();
- }else{
- tree2 += trees[0] + " - " + trees[1] + " - " + trees[2] + " - " + null + " - " + standardTree2.getModel();
- }
- }*/
- list.addAll(standardTreeMapper.selectStandardProductListByTree("\"" + trees[2] + "\"", standardTree2.getSample(), standardTree2.getModel(), tree2));
- list.addAll(standardTreeMapper.selectStandardProductListByTree2("\"" + trees[2] + "\",\"" + standardTree2.getSample() + "\"", standardTree2.getSample(), standardTree2.getModel(), tree2));
+ 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();
@@ -300,12 +265,13 @@
}
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].equals("null") ? null : trees[3], trees[4], tree));
- list.addAll(standardTreeMapper.selectStandardProductListByTree2("\"" + trees[2] + "\",\"" + trees[3] + "\"", trees[3].equals("null") ? null : trees[3], trees[4], tree));
+ }
+ 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]));
}
for (StandardProductList productList : list) {
productList.setId(IdWorker.getId());
@@ -317,7 +283,7 @@
&& 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
+ && 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("")) {
@@ -353,13 +319,48 @@
}
if (page == 1) {
Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
- CompletableFuture.supplyAsync(() -> {
- if (trees.length == 5) {
- standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate().eq(StandardProductList::getStandardMethodListId, id).eq(StandardProductList::getTree, tree));
- } else {
- standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate().eq(StandardProductList::getStandardMethodListId, id).like(StandardProductList::getTree, tree));
+// CompletableFuture.supplyAsync(() -> {
+ System.out.println("寮�濮嬪紑濮嬪紑濮嬪紑濮�!!!!!!!!!!");
+ if (trees.length == 5) {
+ standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate()
+ .eq(StandardProductList::getStandardMethodListId, id)
+ .eq(StandardProductList::getTree, tree));
+ } else {
+ standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate()
+ .eq(StandardProductList::getStandardMethodListId, id)
+ .like(StandardProductList::getTree, tree));
+ }
+
+ boolean success = false;
+ int retryCount = 0;
+ while (!success && retryCount < 100) {
+ try {
+ standardProductListService2.saveOrUpdateBatch(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()));
+ success = true;
+ } catch (Exception e) {
+ retryCount++;
+ System.out.println("閲嶅" + retryCount + "娆�");
+ // 澶勭悊閲嶅 ID 鐨勮褰曪紝閲嶆柊鐢熸垚 ID 骞剁户缁皾璇曟彃鍏�
+ for (StandardProductList productList : list) {
+ productList.setId(IdWorker.getId());
+ }
}
- standardProductListService2.saveBatch(list.stream().map(a -> {
+ }
+ if (!success) {
+ throw new RuntimeException("鎻掑叆澶辫触");
+ } else {
+ System.out.println("缁撴潫缁撴潫缁撴潫缁撴潫@@@@@@@@@@@@");
+ }
+
+ /* standardProductListService2.saveBatch(list.stream().map(a -> {
a.setFactory(trees[0]);
a.setLaboratory(trees[1]);
a.setSampleType(trees[2]);
@@ -367,23 +368,33 @@
a.setUpdateUser(userId);
a.setStandardMethodListId(id);
return a;
- }).collect(Collectors.toList()));
- return null;
- }).thenAccept(res -> {
- }).exceptionally(e -> {
- e.printStackTrace();
- return null;
- });
+ }).collect(Collectors.toList()));*/
+// return null;
+// }).thenAccept(res -> {
+// }).exceptionally(e -> {
+// e.printStackTrace();
+// return null;
+// });
}
Map<String, Object> map = new HashMap<>();
Collections.sort(list, (o1, o2) -> {
String field1 = o1.getManHourGroup();
String field2 = o2.getManHourGroup();
- int num1 = extractNumber(field1);
- int num2 = extractNumber(field2);
+ boolean isEmpty1 = field1 == null || field1.isEmpty();
+ boolean isEmpty2 = field2 == null || field2.isEmpty();
- return Integer.compare(num1, num2);
+ 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));
@@ -396,7 +407,10 @@
private int extractNumber(String s) {
// 浠庡瓧绗︿覆涓彁鍙栨暟瀛楃殑閫昏緫锛岃繖閲屽亣璁惧瓧娈电殑鏍煎紡鏄� "text<number>"
- String number = s.replaceAll("\\D", "");
+ String number = s;
+ if (!s.matches("\\d+")) {
+ number = s.replaceAll("\\D", "");
+ }
return Integer.parseInt(number);
}
@@ -409,18 +423,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