From 6c3b64f52182038accf1c27a2f040d64ddc4528a Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期五, 07 六月 2024 11:15:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java | 85 +++++++++++++++++++++++++++---------------
1 files changed, 54 insertions(+), 31 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 4fdd84c..d363088 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
@@ -3,6 +3,7 @@
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;
@@ -42,9 +43,6 @@
@Override
public int upStandardProductList(StandardProductList list) {
- /*if(list.getId()==null || list.getId().equals("")){
-
- }*/
return standardProductListMapper.updateById(list);
}
@@ -58,7 +56,14 @@
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]));
if (list.size() == 0) {
- list = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery().eq(StandardProductList::getStandardMethodListId, insSample.getStandardMethodListId()).eq(StandardProductList::getState, 1));
+ 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())
+ .eq(StandardProductList::getState, 1)
+ .like(StandardProductList::getTree, split[0] + " - " + split[1] + " - " + split[2] + " - " + split[3]));
}
list = list.stream().filter(a -> {
try {
@@ -68,34 +73,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;
+ boolean isIf;
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));
+ 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;
@@ -106,6 +102,26 @@
return true;
}).collect(Collectors.toList());
return list;
+ }
+
+ private boolean getIsIf(String str, String model){
+ 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("<=")) {
+ String param = str.replace("鈮�", "").replace("<=", "");
+ return new BigDecimal(model).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("锛�")) {
+ String param = str.replace("<", "").replace("锛�", "");
+ return new BigDecimal(model).compareTo(new BigDecimal(param)) < 0;
+ } else if (str.contains("=")) {
+ String param = str.replace("=", "");
+ return new BigDecimal(model).compareTo(new BigDecimal(param)) == 0;
+ }
+ return false;
}
@Override
@@ -144,12 +160,16 @@
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())) {
+ && 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());
@@ -175,6 +195,9 @@
if (sp.getTemplateId() != null && !sp.getTemplateId().equals("")) {
pl.setTemplateId(sp.getTemplateId());
}
+ if(sp.getTree() != null && !sp.getTree().equals("")){
+ pl.setTree(sp.getTree());
+ }
break;
}
}
--
Gitblit v1.9.3