From faaf296cbb86bcb2fb5e3de2541852d91e35e3c5 Mon Sep 17 00:00:00 2001
From: JYW <2013732181@qq.com>
Date: 星期二, 30 四月 2024 14:45:09 +0800
Subject: [PATCH] 2024-04-30 将遗漏的两个接口加入，完善角色管理中接口权限
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java | 71 ++++++++++++++++++++++++++++++++---
1 files changed, 64 insertions(+), 7 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 53363b1..521b17d 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.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;
@@ -12,8 +13,10 @@
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
+import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors;
/**
@@ -30,6 +33,8 @@
private StandardTreeMapper standardTreeMapper;
+ private GetLook getLook;
+
@Override
public int upStandardProductList(StandardProductList list) {
return standardProductListMapper.updateById(list);
@@ -42,7 +47,7 @@
@Override
public List<StandardProductList> selectStandardProductList(InsSample insSample) {
- List<StandardProductList> list = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery().eq(StandardProductList::getStandardMethodListId, insSample.getStandardMethodListId()).eq(StandardProductList::getState, 1));
+ List<StandardProductList> list = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery().eq(StandardProductList::getStandardMethodListId, insSample.getStandardMethodListId()).eq(StandardProductList::getState, 1).eq(StandardProductList::getModel, insSample.getModel()));
list = list.stream().filter(a -> {
try {
if (a.getSection() != null && !Objects.equals(a.getSection(), "")) {
@@ -77,13 +82,65 @@
@Override
public List<StandardProductList> selectStandardProductListByMethodId(Integer id, String tree) {
String[] trees = tree.split(" - ");
- List<StandardProductList> list;
- if(tree.length() == 3){
- list = standardTreeMapper.selectStandardProductListByTree(trees[2], trees[3]);
- }else{
- list = standardTreeMapper.selectStandardProductListByTree(trees[2], null);
+ StringBuffer str = new StringBuffer();
+ List<StandardProductList> list = new ArrayList<>();
+ if (trees.length == 3) {
+ str.append("\"").append(trees[2]).append("\"");
+ } else {
+ str.append("\"").append(trees[2]).append("\",\"").append(trees[3]).append("\"");
+ list.addAll(standardTreeMapper.selectStandardProductListByTree("\"" + trees[2] + "\""));
}
- List<StandardProductList> standardProductLists = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery().eq(StandardProductList::getStandardMethodListId, id));
+ list.addAll(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 (Objects.equals(sp.getInspectionItem(), pl.getInspectionItem())
+ && Objects.equals(sp.getInspectionItemSubclass(), 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());
+ pl.setTemplateId(sp.getTemplateId());
+ if(sp.getAsk()!=null&&!sp.getAsk().equals("")){
+ pl.setAsk(sp.getAsk());
+ }
+ if(sp.getTell()!=null&&!sp.getTell().equals("")){
+ pl.setTell(sp.getTell());
+ }
+ break;
+ }
+ }
+ }
+ Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
+ CompletableFuture.supplyAsync(() -> {
+ standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate().eq(StandardProductList::getStandardMethodListId, id).eq(StandardProductList::getTree, tree));
+ saveBatch(list.stream().map(a->{
+ a.setFactory(trees[0]);
+ a.setLaboratory(trees[1]);
+ a.setSampleType(trees[2]);
+ try {
+ a.setSample(trees[3]);
+ }catch (Exception e){}
+ try {
+ a.setModel(trees[4]);
+ }catch (Exception e){}
+ a.setTree(tree);
+ 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