From f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 10:46:24 +0800
Subject: [PATCH] 分支合并冲突解决
---
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java | 607 ++++++++++++------------------------------------------
1 files changed, 142 insertions(+), 465 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
index ea94918..bb8b583 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
@@ -1,25 +1,22 @@
package com.ruoyi.basic.service.impl;
+import cn.hutool.core.util.NumberUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.*;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.basic.dto.ProductDto;
+import com.ruoyi.basic.mapper.StandardProductListMapper;
+import com.ruoyi.basic.mapper.StandardTreeMapper;
+import com.ruoyi.basic.pojo.InsSample1;
+import com.ruoyi.basic.pojo.StandardProductList;
+import com.ruoyi.basic.pojo.StandardTree;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.basic.dto.CopyStandardProductListDto;
-import com.ruoyi.basic.dto.InsSampleReceiveDto;
-import com.ruoyi.basic.dto.ProductDto;
-import com.ruoyi.basic.dto.ResetTreeDragDTO;
-import com.ruoyi.basic.mapper.StandardProductListMapper;
-import com.ruoyi.basic.mapper.StandardProductListSupplierAskMapper;
-import com.ruoyi.basic.mapper.StandardTreeMapper;
-import com.ruoyi.basic.pojo.StandardProductList;
-import com.ruoyi.basic.pojo.StandardProductListSupplierAsk;
-import com.ruoyi.basic.pojo.StandardTree;
import com.ruoyi.basic.service.StandardProductListService;
-import com.ruoyi.basic.service.StandardProductListService2;
+import com.ruoyi.common.utils.StringUtils;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -44,10 +41,6 @@
private StandardTreeMapper standardTreeMapper;
- private StandardProductListService2 standardProductListService2;
-
- private StandardProductListSupplierAskMapper standardProductListSupplierAskMapper;
-
@Override
public int upStandardProductList(StandardProductList list) {
@@ -60,190 +53,132 @@
}
@Override
- public List<StandardProductList> selectStandardProductList(InsSampleReceiveDto insSample) {
- // 鏄惁娌℃湁浜у搧
- boolean isNoSample = false;
-// String[] models = insSample.getModel().split("-(?=[^-]*$)");//鎷嗗垎鏈�鍚庝竴涓��-銆�
- String model = insSample.getModel();
- String modelNum = insSample.getModelNum();
- List<StandardProductList> list = standardProductListMapper.selectDetail(insSample.getStandardMethodListId(), 1, model, insSample.getIsCableTag());
- if (list.size() == 0) {
+ public List<StandardProductList> selectStandardProductList(InsSample1 insSample) {
+ String[] models = insSample.getModel().split("-(?=[^-]*$)");//鎷嗗垎鏈�鍚庝竴涓��-銆�
+ String[] splits = StringUtils.isNotEmpty(insSample.getFactory())?insSample.getFactory().split(" - "):new String[0];
+ List<StandardProductList> list = new ArrayList<>();
+ if(splits.length<4){
+ list = standardProductListMapper.selectDetail(insSample.getStandardMethodListId(), 1, models[0],"","");
+ }else {
+ list = standardProductListMapper.selectDetail(insSample.getStandardMethodListId(), 1, models[0],splits[2],splits[3]);
+ }
+ if (list.isEmpty()) {
if (Objects.equals(insSample.getFactory(), "") || insSample.getFactory() == null) {
return null;
}
String[] split = insSample.getFactory().split(" - ");
- split[3] = split[3].replace("- ", "");
String tree = split[0] + " - " + split[1] + " - " + split[2] + " - " + split[3] + " - null";
- list = standardProductListMapper.selectDetail2(insSample.getStandardMethodListId(), 1, tree, insSample.getIsCableTag());
- if (list.size() == 0) {
+ list = standardProductListMapper.selectDetail2(insSample.getStandardMethodListId(), 1, tree);
+ if (list.isEmpty()) {
String tree1 = split[0] + " - " + split[1] + " - " + split[2] + " - null - " + split[3];
- list = standardProductListMapper.selectDetail2(insSample.getStandardMethodListId(), 1, tree1, insSample.getIsCableTag());
-
- // 鍙湁瀵硅薄鐨勪竴灞�
- if (list.size() == 0) {
- String tree2 = split[0] + " - " + split[1] + " - " + split[2] + " - null - null";
- list = standardProductListMapper.selectDetail2(insSample.getStandardMethodListId(), 1, tree2, insSample.getIsCableTag());
- // 鏍峰搧鐩存帴璧嬪�兼牱鍝佸垎绫�
- list.forEach(standardProductList -> standardProductList.setSample(standardProductList.getSampleType()));
- isNoSample = true;
+ list = standardProductListMapper.selectDetail2(insSample.getStandardMethodListId(), 1, tree1);
+ if(list.isEmpty()) {
+ String tree2 = split[0] + " - " + split[1] + " - " + split[2] + " - " + split[3] + " - ";
+ list = standardProductListMapper.selectDetail2(insSample.getStandardMethodListId(), 1, tree2);
}
}
}
- String[] split1 = insSample.getFactory().split(" - ");
- if (!isNoSample) {
- //鍒ゆ柇闀垮害
- 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());
- }
+ //鍒ゆ柇闀垮害
+ if (splits.length > 4) {
+ if (ObjectUtils.isNotEmpty(splits[3])) {
+ list = list.stream().filter(list1 -> Objects.nonNull(list1.getSample())&&Objects.equals(list1.getSample(),splits[3])).collect(Collectors.toList());
+ }else if (splits[3].isEmpty()) {
+ list = list.stream().filter(list1 -> Objects.nonNull(list1.getSampleType())&&Objects.equals(list1.getSampleType(),splits[2])).collect(Collectors.toList());
}
}
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> cores = JSON.parseArray(a.getCores(), String.class); // 鑺暟
- List<String> conductorMaterials = JSON.parseArray(a.getConductorMaterial(), String.class); // 瀵间綋鏉愯川
- List<String> conductorTypes = JSON.parseArray(a.getConductorType(), String.class); // 瀵间綋绫诲瀷
- List<String> asks = JSON.parseArray(a.getAsk(), String.class);
- List<String> tells = JSON.parseArray(a.getTell(), 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], modelNum, cores.get(i), conductorMaterials.get(i), conductorTypes.get(i), insSample)
- && getIsIf(split[1], modelNum, cores.get(i), conductorMaterials.get(i), conductorTypes.get(i), insSample);
- } else {
- isIf = getIsIf(sections.get(i), modelNum, cores.get(i), conductorMaterials.get(i), conductorTypes.get(i), insSample);
- }
- if (isIf) {
- a.setSection(sections.get(i));
- a.setAsk(asks.get(i));
- a.setTell(tells.get(i));
- return true;
- }
- }
+ 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 {
+ isIf = getIsIf(sections.get(i), models[1]);
}
- return false;
- }
- } catch (Exception ignored) {
- return false;
- }
- return true;
- }).peek(standardProductList -> {
- // todo: 鍒ゆ柇鏄惁鏄師鏉愪笅鍗�, 闇�瑕佸晩鎶婇鑹茬粦瀹氬埌璇曟牱棰滆壊鐨勮姹傚�间笂
- if (StringUtils.isNotBlank(insSample.getPartNo())) {
- // 鍒ゆ柇鏄惁鏈夎繖涓瓧娈典笖鏄枃鏈被鍨�
- if (StringUtils.isNotBlank(standardProductList.getInspectionItem())
- && standardProductList.getInspectionItem().contains("璇曟牱棰滆壊")) {
- Map<String, String> partColor = baseMapper.selectPartColor(insSample.getPartNo());
- if (CollectionUtils.isNotEmpty(partColor)) {
- if (StringUtils.isNotBlank(partColor.get("color"))) {
- // 鍒ゆ柇妫�楠屽�兼槸鍚︿负绌哄拰涓嶇瓑浜� - 鍜� /
- if (StringUtils.isBlank(standardProductList.getAsk()) || partColor.get("color").contains("鏈�")) { // 娌℃湁ask鐩存帴澶嶅埗
- // 鏌ヨ瀵硅薄缁戝畾琛ㄥ拰浜у搧缁戝畾琛�
- standardProductList.setAsk("=" + partColor.get("color")
- + (StringUtils.isBlank(partColor.get("color_code")) ? "" : "(" + partColor.get("color_code") + ")"));
- standardProductList.setTell(partColor.get("color")
- + (StringUtils.isBlank(partColor.get("color_code")) ? "" : "(" + partColor.get("color_code") + ")"));
- standardProductList.setInspectionValueType("2");
- } else { // 鎷兼帴鍒拌姹傛弿杩板墠闈�
- standardProductList.setTell(partColor.get("color")
- + (StringUtils.isBlank(partColor.get("color_code")) ? "" : "(" + partColor.get("color_code") + ")") + "@" + standardProductList.getTell());
- }
- }
+ 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;
}
}
}
- })
- .collect(Collectors.toList());
-
-
-
+ return false;
+ }
+ } catch (Exception ignored) {
+ return false;
+ }
+ return true;
+ }).collect(Collectors.toList());
return list;
}
- /**
- *
- * @param str 鍒ゅ畾鍏紡
- * @param model 鍨嬪彿
- * @param standardCores 鑺暟
- * @param conductorMaterial 瀵间綋鏉愯川
- * @param conductorType 瀵间綋绫诲瀷
- * @param insSample
- * @return
- */
- private boolean getIsIf(String str, String model, String standardCores, String conductorMaterial, String conductorType,InsSampleReceiveDto insSample) {
+ private boolean getIsIf(String str, String model) {
Matcher matcher = Pattern.compile("\\d+(\\.\\d+)?").matcher(model);
+ BigDecimal modelNumber = BigDecimal.ZERO;
String model2 = "";
while (matcher.find()) {
model2 += matcher.group();
+ modelNumber = BigDecimal.valueOf(Double.parseDouble(model2));
break;
}
- boolean flag = false;
+ Double param = matchNumber(str);
if (str.contains("鈮�") || str.contains(">=")) {
- String param = str.replace("鈮�", "").replace(">=", "");
- flag = new BigDecimal(model2).compareTo(new BigDecimal(param)) > -1;
+// String param = str.replace("鈮�", "").replace(">=", "");
+ return modelNumber.compareTo(new BigDecimal(param)) > -1;
} else if (str.contains("鈮�") || str.contains("<=")) {
- String param = str.replace("鈮�", "").replace("<=", "");
- flag = new BigDecimal(model2).compareTo(new BigDecimal(param)) < 1;
+// String param = str.replace("鈮�", "").replace("<=", "");
+ return modelNumber.compareTo(new BigDecimal(param)) < 1;
} else if (str.contains(">") || str.contains("锛�")) {
- String param = str.replace(">", "").replace("锛�", "");
- flag = new BigDecimal(model2).compareTo(new BigDecimal(param)) > 0;
+// String param = str.replace(">", "").replace("锛�", "");
+ return modelNumber.compareTo(new BigDecimal(param)) > 0;
} else if (str.contains("<") || str.contains("锛�")) {
- String param = str.replace("<", "").replace("锛�", "");
- flag = new BigDecimal(model2).compareTo(new BigDecimal(param)) < 0;
+// String param = str.replace("<", "").replace("锛�", "");
+ return modelNumber.compareTo(new BigDecimal(param)) < 0;
} else if (str.contains("=")) {
- String param = str.replace("=", "");
- flag = new BigDecimal(model2).compareTo(new BigDecimal(param)) == 0;
+// String param = str.replace("=", "");
+ return modelNumber.compareTo(new BigDecimal(param)) == 0;
}
- if (flag) {
- boolean coresMatch = true;
- boolean conductorMaterialMatch = true;
- boolean conductorTypeMatch = true;
-
- // 鍒ゆ柇鏄惁鏈夌嚎鑺暟閲�
- if (StringUtils.isNotBlank(standardCores)) {
- if (StringUtils.isBlank(insSample.getCores()) || !standardCores.equals(insSample.getCores())) {
- coresMatch = false;
- }
+ return false;
+ }
+ public Double matchNumber(String str) {
+ String regex = "[>锛溾墺鈮�=]?[>=<]?\\s*(-?\\d+(\\.\\d+)?)";
+ // 缂栬瘧姝ｅ垯琛ㄨ揪寮�
+ Matcher matcher = Pattern.compile(regex).matcher(str);
+ List<Double> numbers = new ArrayList<>();
+ while(matcher.find()) {
+ if(matcher.group(1) != null) {
+ numbers.add(Double.parseDouble(matcher.group(1)));
}
-
- // 鍒ゆ柇鏄惁鏈夊浣撴潗璐�
- if (StringUtils.isNotBlank(conductorMaterial)) {
- if (StringUtils.isBlank(insSample.getConductorMaterial()) || !conductorMaterial.equals(insSample.getConductorMaterial())) {
- conductorMaterialMatch = false;
- }
- }
-
- // 鍒ゆ柇鏄惁鏈夊浣撶被鍨�
- if (StringUtils.isNotBlank(conductorType)) {
- if (StringUtils.isBlank(insSample.getConductorType()) || !conductorType.equals(insSample.getConductorType())) {
- conductorTypeMatch = false;
- }
- }
- // 鏈�缁堝垽鏂�
- flag = coresMatch && conductorMaterialMatch && conductorTypeMatch;
}
-
- return flag;
+ if(numbers.size() > 0) {
+ return numbers.get(0);
+ }
+ return 0.00;
}
@Override
@Transactional(rollbackFor = Exception.class)
public Map<String, Object> selectStandardProductListByMethodId(Integer id, String tree, Integer page) {
String[] trees = tree.split(" - ");
- try {
- String tree1 = trees[2];
- } catch (Exception e) {
- throw new BaseException("鎿嶄綔澶揩,绯荤粺浼犲弬閿欒!!!!");
- }
- boolean isDrag = false;
+// try {
+// String tree1 = trees[2];
+// } catch (Exception e) {
+// throw new ErrorException("鎿嶄綔澶揩,绯荤粺浼犲弬閿欒!!!!");
+// }
+ //list涓烘牴鎹潯浠舵煡璇㈢殑鑳藉姏鑼冨洿鏁版嵁
List<StandardProductList> list = new ArrayList<>();
if (trees.length == 3) {
List<StandardTree> treeList = new ArrayList<>();
@@ -252,9 +187,9 @@
standardTree.setLaboratory(trees[1]);
standardTree.setSampleType(trees[2]);
List<ProductDto> pList = standardTreeMapper.selectPList(trees[2]);
- if (pList.size() == 0 || pList.get(0) == null) {
+ if (pList.isEmpty() || 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) {
+ if (treeList1.isEmpty()) {
treeList.add(standardTree);
} else {
treeList.addAll(treeList1);
@@ -263,7 +198,7 @@
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) {
+ if (treeList1.isEmpty()) {
treeList.add(JSON.parseObject(JSON.toJSONString(standardTree), StandardTree.class));
} else {
treeList.addAll(treeList1);
@@ -275,19 +210,10 @@
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) {
- // 鍒ゆ柇绗洓灞傛槸鍚︽湁鍨嬪彿
- Long count = standardProductListMapper.selectCount(Wrappers.<StandardProductList>lambdaQuery()
- .eq(StandardProductList::getStandardMethodListId, id)
- .isNull(StandardProductList::getModel)
- .like(StandardProductList::getTree, tree));
- if (count == 0) {
- isDrag = true;
- }
-
- isDrag = true;
+ }
+ 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) {
+ if (treeList.isEmpty()) {
StandardTree standardTree = new StandardTree();
standardTree.setFactory(trees[0]);
standardTree.setLaboratory(trees[1]);
@@ -300,140 +226,56 @@
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 {
- isDrag = true;
+ }
+ 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;
-
- if (isDrag) {
- standardProductLists = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery()
- .eq(StandardProductList::getStandardMethodListId, id)
- .like(StandardProductList::getTree, tree)
- .orderByAsc(StandardProductList::getSort));
- // 鍒ゆ柇鏄惁鏈夋病鏈夊簭鍙风殑, 娌℃湁搴忓彿閲嶇疆
- boolean b = standardProductLists.stream().anyMatch(standardProductList -> standardProductList.getSort() == null);
- } else {
- standardProductLists = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery()
- .eq(StandardProductList::getStandardMethodListId, id)
- .like(StandardProductList::getTree, tree));
- }
-
+ //鏍囧噯搴撳搴旀楠岄」鏁版嵁
+ List<StandardProductList> standardProductLists = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery()
+ .eq(StandardProductList::getStandardMethodListId, id)//鏍囧噯鏂规硶id
+ .eq(StandardProductList::getSampleType,trees[2])//鏍峰搧澶х被
+ .eq(trees.length>3,StandardProductList::getSample,trees.length>3?trees[3]:"")//鏍峰搧
+ .eq(trees.length>4,StandardProductList::getModel,trees.length>4?trees[4]:"")//鍨嬪彿
+ );
+ //澶勭悊鏁版嵁
+ //涓嶈兘缂栬緫鐨勬暟鎹互鑳藉姏鑼冨洿涓轰富锛屽彲缂栬緫鐨勬暟鎹互鏍囧噯搴撲负涓�
for (StandardProductList sp : standardProductLists) {
for (StandardProductList pl : list) {
- // 鍒ゆ柇鏉′欢鏄惁鍙湁涓�涓�, 鏈変竴涓殑璇濋粯璁ょ涓�涓�
- String radiusList = pl.getRadiusList();
- if (StringUtils.isNotBlank(radiusList) && !radiusList.equals("null") && !radiusList.equals("\"\"")) {
- JSONArray jsonArray = JSON.parseArray(radiusList);
- List<String> radius = jsonArray.toJavaList(String.class);
- if (CollectionUtils.isNotEmpty(radius) && radius.size() == 1) {
- pl.setRadius(radius.get(0));
- }
- }
- 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());
- // 娣诲姞鎺掑簭瀛楁
- pl.setSort(sp.getSort());
- if (sp.getState() != null && !sp.getState().equals("")) {
- pl.setState(sp.getState());
- } else {
- pl.setState(id == 0 ? 1 : 0);
- }
- if (sp.getMethodS() != null && !sp.getMethodS().equals("")) {
- pl.setMethod(sp.getMethodS());
- }
- if (sp.getRadius() != null && !sp.getRadius().equals("")) {
- pl.setRadius(sp.getRadius());
- }
- if (sp.getRates() != null && !sp.getRates().equals("")) {
- pl.setRates(sp.getRates());
- }
- 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.getCores() != null && !sp.getCores().equals("")) {
- pl.setCores(sp.getCores());
- }
- if (sp.getConductorMaterial() != null && !sp.getConductorMaterial().equals("")) {
- pl.setConductorMaterial(sp.getConductorMaterial());
- }
- if (sp.getConductorType() != null && !sp.getConductorType().equals("")) {
- pl.setConductorType(sp.getConductorType());
- }
- if (sp.getTemplateId() != null && !sp.getTemplateId().equals("")) {
- pl.setTemplateId(sp.getTemplateId());
- }
- //鍥犱负杩樻湁涓骇鍝佸彨鑰愬紶绾垮す 鎺ョ画閲戝叿 ,杩欎袱涓」鐩殑鏁版嵁瀹屽叏涓�鏍�,鐗规畩澶勭悊
- if (sp.getTree() != null && !sp.getTree().equals("") && !pl.getTree().equals("涓ぉ绉戞妧妫�娴嬩腑蹇� - 鐢靛姏浜у搧瀹為獙瀹� - 閲戝叿 - 鑰愬紶绾垮す - null")) {
- pl.setTree(sp.getTree());
- }
+ if(Objects.isNull(sp.getStructureItemParameterId())){
break;
}
- }
- }
- if (page == 1) {
- Integer userId = SecurityUtils.getUserId().intValue();
-// 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));
- }
-
- boolean success = false;
- int retryCount = 0;
- while (!success && retryCount < 100) {
- try {
- 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()));
- ;
- success = true;
- } catch (Exception e) {
- // 澶勭悊閲嶅 ID 鐨勮褰曪紝閲嶆柊鐢熸垚 ID 骞剁户缁皾璇曟彃鍏�
- for (StandardProductList productList : list) {
- productList.setId(IdWorker.getId());
- }
+ pl.setFactory(sp.getFactory());
+ pl.setSampleType(sp.getSampleType());
+ pl.setStandardMethodListId(id);//鏍囧噯鏂规硶id
+ if(NumberUtil.equals(sp.getStructureItemParameterId(),pl.getStructureItemParameterId()) && (trees.length <= 4 || Objects.equals(sp.getModel(), pl.getModel()))){
+ pl.setId(sp.getId());
+ pl.setAsk(sp.getAsk());//瑕佹眰鍊�
+ pl.setTell(sp.getTell());//瑕佹眰鎻忚堪
+ pl.setManHour(sp.getManHour());//宸ユ椂绯绘暟
+ pl.setManHourGroup(sp.getManHourGroup());//宸ユ椂鍒嗙粍
+ pl.setPrice(sp.getPrice());//鍗曚环
+ pl.setTemplateId(sp.getTemplateId());//妯℃澘id
+ pl.setSection(sp.getSection());//鍖洪棿
+ pl.setState(sp.getState());//鍕鹃�夌姸鎬�
+ pl.setMethodS(sp.getMethodS());//璇曢獙鏂规硶
+ pl.setMethodS(sp.getMethodS());//鏂规硶
+ pl.setTree(sp.getTree());//鏍戝舰缁撴瀯瀛楃
}
}
- if (!success) {
- throw new RuntimeException("鎻掑叆澶辫触");
- }
-
}
+ //鏌ヨ鏍囧噯搴撳搴旂殑鏁版嵁涓虹┖锛岃瘉鏄庢槸鏂板姞鐨勬爣鍑嗭紝浠ヨ兘鍔涜寖鍥翠负涓�
+ if(standardProductLists.isEmpty()){
+ list.forEach(l->{
+ l.setStandardMethodListId(id);
+ l.setFactory(org.apache.commons.lang3.StringUtils.isNotBlank(trees[0])?trees[0]:"");
+ l.setSampleType(org.apache.commons.lang3.StringUtils.isNotBlank(trees[2])?trees[2]:"");
+ });
+ }
+ //娣诲姞鏂板姞鐨勯」鐩�
+ list.stream().filter(l->Objects.isNull(l.getId())).forEach(this::save);
Map<String, Object> map = new HashMap<>();
- Collections.sort(list, (o1, o2) -> {
+ list.sort((o1, o2) -> {
String field1 = o1.getManHourGroup();
String field2 = o2.getManHourGroup();
@@ -452,15 +294,10 @@
return Integer.compare(num1, num2);
}
});
- // 鎸夌収绱㈠紩鎺掑簭
- if (isDrag) {
- list.sort((o1, o2) -> (o1.getSort() == null ? 0 : o1.getSort())
- - (o2.getSort() == null ? 0 : o2.getSort()));
- }
try {
- map.put("productList", list.subList((page - 1) * 300, page * 300));
+ map.put("productList", list.subList((page - 1) * 50, page * 50));
} catch (IndexOutOfBoundsException e) {
- map.put("productList", list.subList((page - 1) * 300, list.size()));
+ map.put("productList", list.subList((page - 1) * 50, list.size()));
}
map.put("total", list.size());
return map;
@@ -506,166 +343,6 @@
.groupBy(StandardProductList::getInspectionItemSubclass)));
}
return map;
- }
-
- /**
- * 淇敼鏍囧噯搴撳尯闂�
- * @param list
- * @return
- */
- @Override
- public boolean updateSection(StandardProductList list) {
- standardProductListMapper.updateSection(list);
- return true;
- }
-
-
- /**
- * 鏍囧噯搴撴嫋鎷�
- * @param resetTreeDragDTO
- */
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void resetTreeDrag(ResetTreeDragDTO resetTreeDragDTO) {
- Integer beginIndex = Integer.parseInt(resetTreeDragDTO.getBeginIndex());
- Integer endIndex = Integer.parseInt(resetTreeDragDTO.getEndIndex());
- Integer methodId = Integer.parseInt(resetTreeDragDTO.getMethodId());
- Long productionId = Long.parseLong(resetTreeDragDTO.getProductionId());
- // 鍒ゆ柇鏄粠涓婂線涓嬫嫋鎷借繕鏄粠涓嬪線涓婃斁鎷栨嫿
- // 浠庝笂寰�涓�
- if (beginIndex < endIndex) {
- standardProductListMapper.updateSortUp(beginIndex,
- endIndex,
- methodId,
- resetTreeDragDTO.getTree());
-
- // 浠庝笅寰�涓�
- } else if (beginIndex > endIndex){
- standardProductListMapper.updateSortDown(beginIndex,
- endIndex,
- methodId,
- resetTreeDragDTO.getTree());
- } else {
- return;
- }
- // 淇敼鏍囧噯搴撻」椤哄簭
- standardProductListMapper.update(null, Wrappers.<StandardProductList>lambdaUpdate()
- .eq(StandardProductList::getId, productionId)
- .set(StandardProductList::getSort, endIndex));
- }
-
- @Override
- public void resetTreeDragBatch(List<StandardProductList> standardProductLists) {
- standardProductListService2.updateBatchById(standardProductLists);
- }
-
- /**
- * 妫�楠岄」瑕佹眰鍊煎姣�
- * @param copyDto
- * @return
- */
- @Override
- public List<StandardProductList> copyStandardProductList(CopyStandardProductListDto copyDto) {
- List<StandardProductList> productLists = new ArrayList<>();
-
- // 瀵规瘮妫�楠岄」涓�鏍风殑濉厖瑕佹眰鍊艰姹傛弿杩�
- for (StandardProductList oldProductList : copyDto.getOldStandardProductList()) {
- String oldItemName = oldProductList.getInspectionItemClassEn()
- + oldProductList.getInspectionItem()
- + oldProductList.getInspectionItemSubclass();
- for (StandardProductList newProductList : copyDto.getNewStandardProductList()) {
- String newItemName = newProductList.getInspectionItemClassEn()
- + newProductList.getInspectionItem()
- + newProductList.getInspectionItemSubclass();
- // 鍒ゆ柇鍚嶇О鏄惁涓�鏍�
- if (oldItemName.equals(newItemName)) {
- // 鍖洪棿
- oldProductList.setSection(newProductList.getSection());
- // 鑺暟
- oldProductList.setCores(newProductList.getCores());
- // 瑕佹眰鍊�
- oldProductList.setAsk(newProductList.getAsk());
- // 瑕佹眰鎻忚堪
- oldProductList.setTell(newProductList.getTell());
- // 鍗曚环
- oldProductList.setPrice(newProductList.getPrice());
- // 宸ユ椂鍒嗙粍
- oldProductList.setManHour(newProductList.getManHour());
- // 瀵间綋鏉愯川
- oldProductList.setConductorMaterial(newProductList.getConductorMaterial());
- // 瀵间綋绫诲瀷
- oldProductList.setConductorType(newProductList.getConductorType());
- productLists.add(oldProductList);
- }
- }
- }
- return productLists;
- }
-
- /**
- * 妫�楠岄」澶嶅埗瀵规瘮涓�涓�
- * @param dto
- * @return
- */
- @Override
- public List<StandardProductList> copyStandardProductOne(CopyStandardProductListDto dto) {
- if (CollectionUtils.isEmpty(dto.getNewStandardProductList()) && dto.getNewStandardProductList().size() == 1 &&
- CollectionUtils.isEmpty(dto.getOldStandardProductList()) && dto.getOldStandardProductList().size() == 1) {
- throw new BaseException("闇�瑕佸姣旂殑妫�楠岄」璇烽�夋嫨涓�涓�");
- }
- StandardProductList newProductList = dto.getNewStandardProductList().get(0);
- StandardProductList oldProductList = dto.getOldStandardProductList().get(0);
- // 鍖洪棿
- oldProductList.setSection(newProductList.getSection());
- // 鑺暟
- oldProductList.setCores(newProductList.getCores());
- // 瑕佹眰鍊�
- oldProductList.setAsk(newProductList.getAsk());
- // 瑕佹眰鎻忚堪
- oldProductList.setTell(newProductList.getTell());
- // 鍗曚环
- oldProductList.setPrice(newProductList.getPrice());
- // 宸ユ椂鍒嗙粍
- oldProductList.setManHour(newProductList.getManHour());
- // 瀵间綋鏉愯川
- oldProductList.setConductorMaterial(newProductList.getConductorMaterial());
- // 瀵间綋绫诲瀷
- oldProductList.setConductorType(newProductList.getConductorType());
- List<StandardProductList> productLists = new ArrayList<>();
- productLists.add(oldProductList);
- return productLists;
- }
-
- /**
- * 妫�楠岄」澶嶅埗鎺掑簭
- * @param copyDto
- * @return
- */
- @Override
- public boolean copyStandardProductSort(CopyStandardProductListDto copyDto) {
- List<StandardProductList> productLists = new ArrayList<>();
-
- // 瀵规瘮妫�楠岄」涓�鏍风殑濉厖瑕佹眰鍊艰姹傛弿杩�
- for (StandardProductList oldProductList : copyDto.getOldStandardProductList()) {
- String oldItemName = oldProductList.getInspectionItemClassEn()
- + oldProductList.getInspectionItem()
- + oldProductList.getInspectionItemSubclass();
- for (StandardProductList newProductList : copyDto.getNewStandardProductList()) {
- String newItemName = newProductList.getInspectionItemClassEn()
- + newProductList.getInspectionItem()
- + newProductList.getInspectionItemSubclass();
- // 鍒ゆ柇鍚嶇О鏄惁涓�鏍�
- if (oldItemName.equals(newItemName)) {
- StandardProductList standardProductList = new StandardProductList();
- standardProductList.setId(oldProductList.getId());
- // 澶嶅埗鎺掑簭
- standardProductList.setSort(newProductList.getSort());
- productLists.add(standardProductList);
- }
- }
- }
- this.updateBatchById(productLists);
- return false;
}
}
--
Gitblit v1.9.3