From ee22e4cdf5656272443365aa54bf08863f7fae52 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期三, 17 七月 2024 13:47:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java | 636 ++++++++++++++++++++++-----------------------------------
1 files changed, 247 insertions(+), 389 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 0a79c13..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
@@ -11,7 +11,6 @@
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.StandardProductListMapper;
import com.yuanchu.mom.mapper.StandardTreeMapper;
import com.yuanchu.mom.pojo.InsSample;
@@ -49,429 +48,288 @@
@Override
public int upStandardProductList(StandardProductList list) {
- String section = list.getSection();
- String a = section;
- if (a != null) {
- section = interval(section);
- list.setSection(section);
- } else {
- list.setSection(null);
- }
-
return standardProductListMapper.updateById(list);
}
- private String interval(String section) {
- section = section.replace("\"", "");
- section = section.replace("[", "");
- section = section.replace("]", "");
- String[] split = section.split(",");
- int[] start1 = new int[20];
- int[] start2 = new int[20];
- int[] end1 = new int[20];
- int[] end2 = new int[20];
- int y = 0;
- for (String str : split) {
- String[] conditions = str.split("&");
- for (int i = 0; i < conditions.length; i++) {
-
- if (conditions[i].contains("<=")) {
- end2[y] = Integer.parseInt(conditions[i].replace("<=", ""));
- y++;
- } else if (conditions[i].contains("<")) {
- end1[y] = Integer.parseInt(conditions[i].replace("<", ""));
- y++;
- }
- if (conditions[i].contains(">=")) {
- start2[y] = Integer.parseInt(conditions[i].replace(">=", ""));
- y++;
- } else if (conditions[i].contains(">")) {
- start1[y] = Integer.parseInt(conditions[i].replace(">", ""));
- y++;
- }
- }
- }
- Set<Integer> start = new TreeSet<>();
- for (
- int value : start1) {
- start.add(value);
- }
- for (
- int value : start2) {
- start.add(value);
- }
-
- Set<Integer> end = new TreeSet<>();
- for (
- int value : end1) {
- end.add(value);
- }
- for (
- int value : end2) {
- end.add(value);
- }
- section = "";
- ArrayList<Integer> ab = new ArrayList<>();
- for (Integer integer : end) {
- if (integer != 0) {
- ab.add(integer);
- }
- }
- ArrayList<Integer> ac = new ArrayList<>();
- for (Integer integer : start) {
- if (integer != 0) {
- ac.add(integer);
- }
- }
- if (!ab.isEmpty() && !ac.isEmpty()) {
- int min = Collections.min(ab);
- int max = Collections.max(ac);
- if (min <= max) {
- throw new ErrorException("鍖洪棿閿欒");
- }
- int minValue = 0;
- int maxValue = 0;
- for (int i = 1; i < end2.length; i++) {
- if (end2[i] < minValue) {
- minValue = end2[i];
- }
- }
- for (int i = 1; i < start2.length; i++) {
- if (start2[i] > maxValue) {
- maxValue = start2[i];
- }
- }
- if (min == minValue && max == maxValue) {
- section = ("[" + "\"" + ">" + "=" + max + "&" + "<" + "=" + min + "\"" + "]");
- }
- if (min != minValue && max == maxValue) {
- section = ("[" + "\"" + ">" + "=" + max + "&" + "<" + min + "\"" + "]");
- }
- if (min == minValue && max != maxValue) {
- section = ("[" + "\"" + ">" + max + "&" + "<" + "=" + min + "\"" + "]");
- }
- if (min != minValue && max != maxValue) {
- section = ("[" + "\"" + ">" + max + "&" + "<" + min + "\"" + "]");
- }
- }
- if (ab.isEmpty() && !ac.isEmpty()) {
- int max = Collections.max(ac);
- int maxValue = 0;
- for (int i = 1; i < start2.length; i++) {
- if (start2[i] > maxValue) {
- maxValue = start2[i];
- }
- }
- if (max == maxValue) {
- section = ("[" + "\"" + ">" + "=" + max + "\"" + "]");
- }
- if (max != maxValue) {
- section = ("[" + "\"" + ">" + max + "\"" + "]");
- }
- }
- if (!ab.isEmpty() && ac.isEmpty()) {
- int min = Collections.min(ab);
- int minValue = 0;
- for (int i = 1; i < end2.length; i++) {
- if (end2[i] < minValue) {
- minValue = end2[i];
- }
- }
- if (min == minValue) {
- section = ("[" + "\"" + "<" + "=" + min + "\"" + "]");
- }
- if (min != minValue) {
- section = ("[" + "\"" + "<" + min + "\"" + "]");
- }
- }
- return section;
+ @Override
+ public int delStandardProduct(JSONArray list) {
+ return standardProductListMapper.deleteBatchIds(list);
}
-
- @Override
- public int delStandardProduct (JSONArray list){
- return standardProductListMapper.deleteBatchIds(list);
+ @Override
+ public List<StandardProductList> selectStandardProductList(InsSample insSample) {
+ String[] models = insSample.getModel().split("-(?=[^-]*$)");//鎷嗗垎鏈�鍚庝竴涓��-銆�
+ List<StandardProductList> list = standardProductListMapper.selectDetail(insSample.getStandardMethodListId(), 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);
+ if (list.size()==0){
+ String tree1 = split[0] + " - " + split[1] + " - " + split[2] + " - null - " + split[3] ;
+ list = standardProductListMapper.selectDetail2(insSample.getStandardMethodListId(), 1, tree1);
+ }
}
-
- @Override
- public List<StandardProductList> selectStandardProductList (InsSample insSample){
- String[] models = insSample.getModel().split("-(?=[^-]*$)");//鎷嗗垎鏈�鍚庝竴涓��-銆�
- List<StandardProductList> list = new ArrayList<>();
- if (models.length==1) {
- list=standardProductListMapper.selectDetail(insSample.getStandardMethodListId(), 1, models[0]);
- }
- if (models.length==2) {
- list=standardProductListMapper.selectDetail(insSample.getStandardMethodListId(), 1, models[0]+"-"+models[1]);
- }
- 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);
- 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 {
- if (a.getSection() != null && !Objects.equals(a.getSection(), "")) {
- List<String> sections = JSON.parseArray(a.getSection(), String.class);
- List<String> asks = JSON.parseArray(a.getAsk(), String.class);
- List<String> tells = JSON.parseArray(a.getTell(), String.class);
- List<String> manHours = JSON.parseArray(a.getManHour(), String.class);
- 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")) {
- return true;
+ list = list.stream().filter(a -> {
+ try {
+ if (a.getSection() != null && !Objects.equals(a.getSection(), "")) {
+ List<String> sections = JSON.parseArray(a.getSection(), String.class);
+ List<String> asks = JSON.parseArray(a.getAsk(), String.class);
+ List<String> tells = JSON.parseArray(a.getTell(), String.class);
+ List<String> manHours = JSON.parseArray(a.getManHour(), String.class);
+ 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")) {
+ 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 {
- 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;
- }
+ 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;
}
- } catch (Exception ignored) {
return false;
}
- return true;
- }).collect(Collectors.toList());
- return list;
- }
-
- private boolean getIsIf (String str, String model){
- Matcher matcher = Pattern.compile("\\d+(\\.\\d+)?").matcher(model);
- String model2 = "";
- while (matcher.find()) {
- model2 += matcher.group();
+ } catch (Exception ignored) {
+ return false;
}
- 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("<=")) {
- String param = str.replace("鈮�", "").replace("<=", "");
- return new BigDecimal(model2).compareTo(new BigDecimal(param)) < 1;
- } 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("锛�")) {
- String param = str.replace("<", "").replace("锛�", "");
- 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;
- }
- return false;
- }
+ return true;
+ }).collect(Collectors.toList());
+ return list;
+ }
- @Override
- 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 = new ArrayList<>();
+ 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(model2).compareTo(new BigDecimal(param)) > -1;
+ } 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("锛�")) {
+ String param = str.replace(">", "").replace("锛�", "");
+ return new BigDecimal(model2).compareTo(new BigDecimal(param)) > 0;
+ } else if (str.contains("<") || str.contains("锛�")) {
+ String param = str.replace("<", "").replace("锛�", "");
+ 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;
+ }
+ return false;
+ }
+
+ @Override
+ 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 = 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 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]));
+ if (treeList.size() == 0) {
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 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]));
- if (treeList.size() == 0) {
- StandardTree standardTree = new StandardTree();
- standardTree.setFactory(trees[0]);
- standardTree.setLaboratory(trees[1]);
- standardTree.setSampleType(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, 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, trees[1]));
- list.addAll(standardTreeMapper.selectStandardProductListByTree2("\"" + trees[2] + "\",\"" + trees[3] + "\"", trees[3].equals("null") ? null : trees[3], trees[4], tree, trees[1]));
+ standardTree.setSample(trees[3]);
+ treeList.add(standardTree);
}
- for (StandardProductList productList : list) {
- productList.setId(IdWorker.getId());
+ for (StandardTree standardTree : treeList) {
+ String str = tree + " - " + standardTree.getModel();
+ 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]));
}
- 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())
+ } 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());
+ }
+ 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.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("")) {
- 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));
+ && 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("")) {
+ pl.setState(sp.getState());
} else {
- standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate().eq(StandardProductList::getStandardMethodListId, id).like(StandardProductList::getTree, tree));
+ pl.setState(id == 0 ? 1 : 0);
}
- 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<>();
- 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);
+ 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(() -> {
+ 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));
+ }
+ 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()));
+ System.out.println("缁撴潫缁撴潫缁撴潫缁撴潫@@@@@@@@@@@@");
+ return null;
+ }).thenAccept(res -> {
+ }).exceptionally(e -> {
+ e.printStackTrace();
+ return null;
});
- 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<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);
}
- map.put("total", list.size());
- return map;
+ });
+ 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;
+ }
- private int extractNumber (String s){
- // 浠庡瓧绗︿覆涓彁鍙栨暟瀛楃殑閫昏緫锛岃繖閲屽亣璁惧瓧娈电殑鏍煎紡鏄� "text<number>"
- String number = s;
- if (!s.matches("\\d+")) {
- number = s.replaceAll("\\D", "");
- }
- return Integer.parseInt(number);
+ private int extractNumber(String s) {
+ // 浠庡瓧绗︿覆涓彁鍙栨暟瀛楃殑閫昏緫锛岃繖閲屽亣璁惧瓧娈电殑鏍煎紡鏄� "text<number>"
+ String number = s;
+ if (!s.matches("\\d+")) {
+ number = s.replaceAll("\\D", "");
}
+ return Integer.parseInt(number);
+ }
- @Override
- public IPage<StandardProductList> selectStandardProductByMethodId (Integer id, String tree, Integer page, String
- laboratory, String item, String items){
- IPage<StandardProductList> iPage = new Page<>();
- iPage.setSize(100);
- iPage.setCurrent(page);
- return standardProductListMapper.standardProductListIPage(id, tree, iPage, laboratory, item, items);
- }
+ @Override
+ public IPage<StandardProductList> selectStandardProductByMethodId(Integer id, String tree, Integer page, String laboratory, String item, String items) {
+ IPage<StandardProductList> iPage = new Page<>();
+ iPage.setSize(100);
+ iPage.setCurrent(page);
+ return standardProductListMapper.standardProductListIPage(id, tree, iPage, laboratory, item, items);
+ }
- @Override
- 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()
+ @Override
+ 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)));
+ 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::getInspectionItem)
- .groupBy(StandardProductList::getInspectionItem)));
- 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;
+ .select(StandardProductList::getInspectionItemSubclass)
+ .groupBy(StandardProductList::getInspectionItemSubclass)));
}
+ return map;
}
+}
--
Gitblit v1.9.3