From 461fb02ec8264079f73fd2b6f937ad4f40754cb9 Mon Sep 17 00:00:00 2001 From: value <z1292839451@163.com> Date: 星期三, 19 六月 2024 23:39:51 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java | 67 +++++++++++++++++++++------------ 1 files changed, 43 insertions(+), 24 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 f368487..82e42cd 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 @@ -21,6 +21,8 @@ import java.math.BigDecimal; import java.util.*; import java.util.concurrent.CompletableFuture; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import java.util.stream.Collectors; /** @@ -54,8 +56,12 @@ @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])); + 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])); if (list.size() == 0) { + 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()) @@ -72,19 +78,23 @@ List<String> prices = JSON.parseArray(a.getPrice(), String.class); boolean isIf; for (int i = 0; i < sections.size(); i++) { - if (sections.get(i).contains("&")) { - String[] split = sections.get(i).split("&"); - isIf = getIsIf(split[0], models[1]) && getIsIf(split[1], models[1]); - } else { - isIf = getIsIf(sections.get(i), models[1]); - } - if (isIf) { - a.setSection(sections.get(i)); - a.setAsk(asks.get(i)); - a.setTell(tells.get(i)); - a.setPrice(prices.get(i)); - a.setManHour(manHours.get(i)); + if (Objects.equals(a.getBsm(), "1")) { return true; + } else { + if (sections.get(i).contains("&")) { + String[] split = sections.get(i).split("&"); + isIf = getIsIf(split[0], models[1]) && getIsIf(split[1], models[1]); + } else { + isIf = getIsIf(sections.get(i), models[1]); + } + if (isIf) { + a.setSection(sections.get(i)); + a.setAsk(asks.get(i)); + a.setTell(tells.get(i)); + a.setPrice(prices.get(i)); + a.setManHour(manHours.get(i)); + return true; + } } } return false; @@ -97,22 +107,27 @@ 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()) { + model2 += matcher.group(); + } if (str.contains("鈮�") || str.contains(">=")) { String param = str.replace("鈮�", "").replace(">=", ""); - return new BigDecimal(model).compareTo(new BigDecimal(param)) > -1; + return new BigDecimal(model2).compareTo(new BigDecimal(param)) > -1; } else if (str.contains("鈮�") || str.contains("<=")) { String param = str.replace("鈮�", "").replace("<=", ""); - return new BigDecimal(model).compareTo(new BigDecimal(param)) < 1; - } else if (str.contains(">")||str.contains("锛�")) { + return new BigDecimal(model2).compareTo(new BigDecimal(param)) < 1; + } else if (str.contains(">") || str.contains("锛�")) { String param = str.replace(">", "").replace("锛�", ""); - return new BigDecimal(model).compareTo(new BigDecimal(param)) > 0; - } else if (str.contains("<")||str.contains("锛�")) { + return new BigDecimal(model2).compareTo(new BigDecimal(param)) > 0; + } else if (str.contains("<") || str.contains("锛�")) { String param = str.replace("<", "").replace("锛�", ""); - return new BigDecimal(model).compareTo(new BigDecimal(param)) < 0; + return new BigDecimal(model2).compareTo(new BigDecimal(param)) < 0; } else if (str.contains("=")) { String param = str.replace("=", ""); - return new BigDecimal(model).compareTo(new BigDecimal(param)) == 0; + return new BigDecimal(model2).compareTo(new BigDecimal(param)) == 0; } return false; } @@ -160,7 +175,7 @@ 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.getModel(), pl.getModel()) && Objects.equals(sp.getStructureItemParameterId(), pl.getStructureItemParameterId())) { pl.setId(sp.getId()); @@ -188,7 +203,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; @@ -198,7 +213,11 @@ 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)); + 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]); -- Gitblit v1.9.3