From eb1a57285bb3468a4efe051781b8cc7a13ec23c6 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 14 五月 2024 14:15:06 +0800
Subject: [PATCH] 部分调整
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java | 131 +++++++++++++++++++++++++++++++------------
1 files changed, 94 insertions(+), 37 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 6aeb5bb..d75719a 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
@@ -1,18 +1,22 @@
package com.yuanchu.mom.service.impl;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.mom.common.GetLook;
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 org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.CompletableFuture;
@@ -32,7 +36,9 @@
private StandardTreeMapper standardTreeMapper;
- private StandardProductListService standardProductListService;
+ private GetLook getLook;
+
+ private StandardProductListService2 standardProductListService2;
@Override
public int upStandardProductList(StandardProductList list) {
@@ -46,29 +52,47 @@
@Override
public List<StandardProductList> selectStandardProductList(InsSample insSample) {
- List<StandardProductList> list = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery().eq(StandardProductList::getStandardMethodListId, insSample.getStandardMethodListId()).eq(StandardProductList::getState, 1));
+ 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]));
list = list.stream().filter(a -> {
try {
if (a.getSection() != null && !Objects.equals(a.getSection(), "")) {
- if (a.getSection().contains("~")) {
- String[] split = a.getSection().split("~");
- return new BigDecimal(insSample.getModel()).compareTo(new BigDecimal(split[0])) > -1 && new BigDecimal(insSample.getModel()).compareTo(new BigDecimal(split[1])) < 1;
- } else if (a.getSection().contains("鈮�") || a.getSection().contains(">=")) {
- String param = a.getSection().replace("鈮�", "").replace(">=", "");
- return new BigDecimal(insSample.getModel()).compareTo(new BigDecimal(param)) > -1;
- } else if (a.getSection().contains("鈮�") || a.getSection().contains("<=")) {
- String param = a.getSection().replace("鈮�", "").replace("<=", "");
- return new BigDecimal(insSample.getModel()).compareTo(new BigDecimal(param)) < 1;
- } else if (a.getSection().contains(">")) {
- String param = a.getSection().replace(">", "");
- return new BigDecimal(insSample.getModel()).compareTo(new BigDecimal(param)) > 0;
- } else if (a.getSection().contains("<")) {
- String param = a.getSection().replace("<", "");
- return new BigDecimal(insSample.getModel()).compareTo(new BigDecimal(param)) < 0;
- } else if (a.getSection().contains("=")) {
- String param = a.getSection().replace("=", "");
- return new BigDecimal(insSample.getModel()).compareTo(new BigDecimal(param)) == 0;
+ 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 = 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));
+ return true;
+ }
}
+ return false;
}
} catch (Exception ignored) {
return false;
@@ -79,42 +103,75 @@
}
@Override
- @Transactional(rollbackFor = Exception.class)
public List<StandardProductList> selectStandardProductListByMethodId(Integer id, String tree) {
String[] trees = tree.split(" - ");
- StringBuffer str = new StringBuffer();
+ List<StandardProductList> list = new ArrayList<>();
if (trees.length == 3) {
- str.append("\"").append(trees[2]).append("\"");
+ 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));
+ }
+ } 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]));
+ for (StandardTree standardTree : treeList) {
+ 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 {
- str.append("\"").append(trees[2]).append("\",\"").append(trees[3]).append("\"");
+ 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<StandardProductList> list = standardTreeMapper.selectStandardProductListByTree(str + "");
- List<StandardProductList> standardProductLists = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery().eq(StandardProductList::getStandardMethodListId, id).eq(StandardProductList::getTree, tree));
+ 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 (sp.getInspectionItem().equals(pl.getInspectionItem()) && sp.getInspectionItemSubclass().equals(pl.getInspectionItemSubclass())) {
+ if (Objects.equals(sp.getInspectionItem(), pl.getInspectionItem())
+ && Objects.equals(sp.getInspectionItemSubclass(), pl.getInspectionItemSubclass())
+ && Objects.equals(sp.getModel(), pl.getModel())) {
pl.setId(sp.getId());
- pl.setState(sp.getState());
- pl.setFactory(sp.getFactory());
- pl.setLaboratory(sp.getLaboratory());
- pl.setSampleType(sp.getSampleType());
- pl.setSample(sp.getSample());
- pl.setModel(sp.getModel());
+ pl.setState(id==0?1:sp.getState());
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());
+ }
break;
}
}
}
+ Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
CompletableFuture.supplyAsync(() -> {
- standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate().eq(StandardProductList::getStandardMethodListId, id).eq(StandardProductList::getTree, tree));
- standardProductListService.saveBatch(list);
+ 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;
});
- ;
return list;
}
}
--
Gitblit v1.9.3