From f0526b05b1577d995e1cb7185d1fdb555d18fd2c Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 14 五月 2024 13:26:30 +0800
Subject: [PATCH] 2024-5-14 展示最近7天的，今日在最右边
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java | 74 +++++++++++++++++++++++++------------
1 files changed, 50 insertions(+), 24 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 5496da7..270825e 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,5 +1,6 @@
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;
@@ -10,6 +11,7 @@
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;
@@ -17,6 +19,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
+import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors;
/**
@@ -35,6 +38,8 @@
private GetLook getLook;
+ private StandardProductListService2 standardProductListService2;
+
@Override
public int upStandardProductList(StandardProductList list) {
return standardProductListMapper.updateById(list);
@@ -47,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).eq(StandardProductList::getModel, insSample.getModel()));
+ 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;
@@ -87,7 +110,7 @@
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.selectStandardProductListByTree("\"" + trees[2] + "\"", standardTree.getSample(), standardTree.getModel(), str));
+ 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]));
@@ -124,14 +147,17 @@
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(() -> {
+ CompletableFuture.supplyAsync(() -> {
standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate().eq(StandardProductList::getStandardMethodListId, id).like(StandardProductList::getTree, tree));
- saveBatch(list.stream().map(a->{
+ standardProductListService2.saveBatch(list.stream().map(a->{
a.setFactory(trees[0]);
a.setLaboratory(trees[1]);
a.setSampleType(trees[2]);
@@ -140,12 +166,12 @@
a.setStandardMethodListId(id);
return a;
}).collect(Collectors.toList()));
- /*return null;
+ return null;
}).thenAccept(res -> {
}).exceptionally(e -> {
e.printStackTrace();
return null;
- });*/
+ });
return list;
}
}
--
Gitblit v1.9.3