From 9116abf53b1dd05f342e89ed5e287964433637fa Mon Sep 17 00:00:00 2001
From: 晏有为 <13214124+yan-youwei@user.noreply.gitee.com>
Date: 星期三, 15 五月 2024 14:23:06 +0800
Subject: [PATCH] 访问第三方接口
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java | 55 +++++++++++++++++++++++++++++++------------------------
1 files changed, 31 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 270825e..660938b 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
@@ -16,9 +16,7 @@
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors;
@@ -103,7 +101,7 @@
}
@Override
- public List<StandardProductList> selectStandardProductListByMethodId(Integer id, String tree) {
+ public Map<String, Object> selectStandardProductListByMethodId(Integer id, String tree, Integer page) {
String[] trees = tree.split(" - ");
List<StandardProductList> list = new ArrayList<>();
if (trees.length == 3) {
@@ -130,7 +128,7 @@
&& Objects.equals(sp.getInspectionItemSubclass(), pl.getInspectionItemSubclass())
&& Objects.equals(sp.getModel(), pl.getModel())) {
pl.setId(sp.getId());
- pl.setState(sp.getState());
+ pl.setState(id==0?1:sp.getState());
pl.setMethodS(sp.getMethodS());
if(sp.getAsk()!=null&&!sp.getAsk().equals("")){
pl.setAsk(sp.getAsk());
@@ -154,25 +152,34 @@
}
}
}
- Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
- CompletableFuture.supplyAsync(() -> {
- 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;
+ if(page == 1){
+ Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
+ CompletableFuture.supplyAsync(() -> {
+ 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;
+ });
+ }
+ Map<String, Object> map = new HashMap<>();
+ try {
+ map.put("productList", list.subList((page - 1)*50, page * 50));
+ }catch (IndexOutOfBoundsException e){
+ map.put("productList", list.subList((page - 1)*50, list.size()));
+ }
+ map.put("total", list.size());
+ return map;
}
}
--
Gitblit v1.9.3