From ce7184b9b054e4cd98af2d747545d04ae85c2728 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 29 四月 2024 01:45:52 +0800
Subject: [PATCH] 修改产品绑定和标准库关系
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 49 insertions(+), 8 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 046bf93..6aeb5bb 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,19 +1,21 @@
package com.yuanchu.mom.service.impl;
-import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+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.service.StandardProductListService;
-import com.yuanchu.mom.mapper.StandardProductListMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.List;
import java.util.Objects;
+import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors;
/**
@@ -28,6 +30,10 @@
private StandardProductListMapper standardProductListMapper;
+ private StandardTreeMapper standardTreeMapper;
+
+ private StandardProductListService standardProductListService;
+
@Override
public int upStandardProductList(StandardProductList list) {
return standardProductListMapper.updateById(list);
@@ -40,18 +46,18 @@
@Override
public List<StandardProductList> selectStandardProductList(InsSample insSample) {
- List<StandardProductList> list = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery().eq(StandardProductList::getFactory, insSample.getFactory()).eq(StandardProductList::getLaboratory, insSample.getLaboratory()).eq(StandardProductList::getSampleType, insSample.getSampleType()).eq(StandardProductList::getSample, insSample.getSample()).eq(StandardProductList::getModel, insSample.getModel()));
+ List<StandardProductList> list = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery().eq(StandardProductList::getStandardMethodListId, insSample.getStandardMethodListId()).eq(StandardProductList::getState, 1));
list = list.stream().filter(a -> {
try {
- if(a.getSection()!=null && !Objects.equals(a.getSection(), "")){
+ 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(">=","");
+ 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("<=","");
+ 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(">", "");
@@ -73,8 +79,43 @@
}
@Override
- public List<StandardProductList> selectStandardProductListByMethodId(Integer id) {
- return standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery().eq(StandardProductList::getStandardMethodListId, id));
+ @Transactional(rollbackFor = Exception.class)
+ public List<StandardProductList> selectStandardProductListByMethodId(Integer id, String tree) {
+ String[] trees = tree.split(" - ");
+ StringBuffer str = new StringBuffer();
+ if (trees.length == 3) {
+ str.append("\"").append(trees[2]).append("\"");
+ } else {
+ str.append("\"").append(trees[2]).append("\",\"").append(trees[3]).append("\"");
+ }
+ List<StandardProductList> list = standardTreeMapper.selectStandardProductListByTree(str + "");
+ List<StandardProductList> standardProductLists = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery().eq(StandardProductList::getStandardMethodListId, id).eq(StandardProductList::getTree, tree));
+ for (StandardProductList sp : standardProductLists) {
+ for (StandardProductList pl : list) {
+ if (sp.getInspectionItem().equals(pl.getInspectionItem()) && sp.getInspectionItemSubclass().equals(pl.getInspectionItemSubclass())) {
+ 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.setMethodS(sp.getMethodS());
+ break;
+ }
+ }
+ }
+ CompletableFuture.supplyAsync(() -> {
+ standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate().eq(StandardProductList::getStandardMethodListId, id).eq(StandardProductList::getTree, tree));
+ standardProductListService.saveBatch(list);
+ return null;
+ }).thenAccept(res -> {
+ }).exceptionally(e -> {
+ e.printStackTrace();
+ return null;
+ });
+ ;
+ return list;
}
}
--
Gitblit v1.9.3