From 3547641f25634eec4b6dcf379080e92ed5025ee1 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 21 六月 2024 14:21:52 +0800
Subject: [PATCH] 解决工时排序问题+考评bug调试
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java | 271 ++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 204 insertions(+), 67 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 5739ac1..a14f013 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
@@ -2,23 +2,28 @@
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.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;
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 java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
import java.util.concurrent.CompletableFuture;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import java.util.stream.Collectors;
/**
@@ -37,6 +42,8 @@
private GetLook getLook;
+ private StandardProductListService2 standardProductListService2;
+
@Override
public int upStandardProductList(StandardProductList list) {
return standardProductListMapper.updateById(list);
@@ -49,8 +56,22 @@
@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[] 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]);
+ 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]));*/
+
+ }
list = list.stream().filter(a -> {
try {
if (a.getSection() != null && !Objects.equals(a.getSection(), "")) {
@@ -59,34 +80,25 @@
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 = false;
- for (int i = 0;i<sections.size();i++){
- if (sections.get(i).contains("&")) {
- String[] split = sections.get(i).split("&");
- isIf = new BigDecimal(models[1]).compareTo(new BigDecimal(split[0])) > -1 && new BigDecimal(models[1]).compareTo(new BigDecimal(split[1])) < 1;
- } else if (sections.get(i).contains("鈮�") || sections.get(i).contains(">=")) {
- String param = sections.get(i).replace("鈮�", "").replace(">=", "");
- isIf = new BigDecimal(models[1]).compareTo(new BigDecimal(param)) > -1;
- } else if (sections.get(i).contains("鈮�") || sections.get(i).contains("<=")) {
- String param = sections.get(i).replace("鈮�", "").replace("<=", "");
- isIf = new BigDecimal(models[1]).compareTo(new BigDecimal(param)) < 1;
- } else if (sections.get(i).contains(">")) {
- String param = sections.get(i).replace(">", "");
- isIf = new BigDecimal(models[1]).compareTo(new BigDecimal(param)) > 0;
- } else if (sections.get(i).contains("<")) {
- String param = sections.get(i).replace("<", "");
- isIf = new BigDecimal(models[1]).compareTo(new BigDecimal(param)) < 0;
- } else if (sections.get(i).contains("=")) {
- String param = sections.get(i).replace("=", "");
- isIf = new BigDecimal(models[1]).compareTo(new BigDecimal(param)) == 0;
- }
- 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));
+ 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 {
+ 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;
@@ -99,74 +111,199 @@
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();
+ }
+ 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 List<StandardProductList> selectStandardProductListByMethodId(Integer id, String tree) {
+ 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]));
- for (StandardTree standardTree : treeList) {
- String str = tree+" - "+standardTree.getSample()+" - "+standardTree.getModel();
- list.addAll(standardTreeMapper.selectStandardProductListByTree3("\"" + trees[2] + "\"", standardTree.getSample(), standardTree.getModel(), str));
+ 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);
+ }
+ }
}
- } else if (trees.length == 4){
+ for (StandardTree standardTree2 : treeList) {
+// String str = tree + " - " + standardTree2.getSample() + " - " + standardTree2.getModel();
+// list.addAll(standardTreeMapper.selectStandardProductListByTree3("\"" + trees[2] + "\"", standardTree2.getSample(), standardTree2.getModel(), str));
+ list.addAll(standardTreeMapper.selectStandardProductListByTree("\"" + trees[2] + "\"", standardTree2.getSample(), standardTree2.getModel(), tree));
+ list.addAll(standardTreeMapper.selectStandardProductListByTree2("\"" + trees[2] + "\",\"" + standardTree2.getSample() + "\"", standardTree2.getSample(), standardTree2.getModel(), tree));
+ }
+ } 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();
+ 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));
+ 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));
+ }
+ 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(), pl.getInspectionItemSubclass())
- && Objects.equals(sp.getModel(), pl.getModel())) {
+ && Objects.equals((sp.getInspectionItemSubclass() == null) ? "" : sp.getInspectionItemSubclass(), pl.getInspectionItemSubclass() == null ? "" : pl.getInspectionItemSubclass())
+ && Objects.equals(sp.getSample(), pl.getSample())
+ && Objects.equals(sp.getModel(), pl.getModel())
+ && Objects.equals(sp.getStructureItemParameterId(), pl.getStructureItemParameterId())) {
pl.setId(sp.getId());
- pl.setState(sp.getState());
+ 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("")){
+ if (sp.getAsk() != null && !sp.getAsk().equals("")) {
pl.setAsk(sp.getAsk());
}
- if(sp.getTell()!=null&&!sp.getTell().equals("")){
+ if (sp.getTell() != null && !sp.getTell().equals("")) {
pl.setTell(sp.getTell());
}
- if(sp.getPrice()!=null&&!sp.getPrice().equals("")){
+ if (sp.getPrice() != null && !sp.getPrice().equals("")) {
pl.setPrice(sp.getPrice());
}
- if(sp.getManHour()!=null&&!sp.getManHour().equals("")){
+ if (sp.getManHour() != null && !sp.getManHour().equals("")) {
pl.setManHour(sp.getManHour());
}
- if(sp.getSection()!=null&&!sp.getSection().equals("")){
+ 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;
}
}
}
- Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
- CompletableFuture.supplyAsync(() -> {
- standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate().eq(StandardProductList::getStandardMethodListId, id).like(StandardProductList::getTree, tree));
- 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;
+ 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<>();
+ Collections.sort(list, (o1, o2) -> {
+ String field1 = o1.getManHourGroup();
+ String field2 = o2.getManHourGroup();
+
+ int num1 = extractNumber(field1);
+ int num2 = extractNumber(field2);
+
+ return Integer.compare(num1, num2);
});
- return list;
+ 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.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 Map<String, List<?>> selectStandardProductEnumByMethodId(Integer id, String tree) {
+ 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)));
+ return map;
}
}
--
Gitblit v1.9.3