From afebb0ff6b79092519377d943462cc084b9cdb28 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期日, 29 九月 2024 17:59:25 +0800
Subject: [PATCH] 检验下单新增附件,时间,电机编号
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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 0f2c8b5..9c4bbb2 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
@@ -12,9 +12,11 @@
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.dto.ProductDto;
import com.yuanchu.mom.exception.ErrorException;
+import com.yuanchu.mom.mapper.StandardMethodListMapper;
import com.yuanchu.mom.mapper.StandardProductListMapper;
import com.yuanchu.mom.mapper.StandardTreeMapper;
import com.yuanchu.mom.pojo.InsSample;
+import com.yuanchu.mom.pojo.StandardMethodList;
import com.yuanchu.mom.pojo.StandardProductList;
import com.yuanchu.mom.pojo.StandardTree;
import com.yuanchu.mom.service.StandardProductListService;
@@ -61,17 +63,19 @@
@Override
public List<StandardProductList> selectStandardProductList(InsSample insSample) {
String[] models = insSample.getModel().split("-(?=[^-]*$)");//鎷嗗垎鏈�鍚庝竴涓��-銆�
- List<StandardProductList> list = standardProductListMapper.selectDetail(insSample.getStandardMethodListId(), 1, models[0]);
+ List<Integer> ids = Arrays.stream(insSample.getStandardMethodListId().split(","))
+ .map(String::trim).map(Integer::parseInt).collect(Collectors.toList());
+ List<StandardProductList> list = standardProductListMapper.selectDetail(ids, 1, models[0]);
if (list.size() == 0) {
if (Objects.equals(insSample.getFactory(), "") || insSample.getFactory() == null) {
return null;
}
String[] split = insSample.getFactory().split(" - ");
String tree = split[0] + " - " + split[1] + " - " + split[2] + " - " + split[3] + " - null";
- list = standardProductListMapper.selectDetail2(insSample.getStandardMethodListId(), 1, tree);
+ list = standardProductListMapper.selectDetail2(ids, 1, tree);
if (list.size() == 0) {
String tree1 = split[0] + " - " + split[1] + " - " + split[2] + " - null - " + split[3];
- list = standardProductListMapper.selectDetail2(insSample.getStandardMethodListId(), 1, tree1);
+ list = standardProductListMapper.selectDetail2(ids, 1, tree1);
}
}
String[] split1 = insSample.getFactory().split(" - ");
@@ -118,6 +122,10 @@
return false;
}
return true;
+ }).map(standardProductList -> {
+ String code = baseMapper.selectStandardMethodById(standardProductList.getStandardMethodListId());
+ standardProductList.setMethodS(code);
+ return standardProductList;
}).collect(Collectors.toList());
return list;
}
--
Gitblit v1.9.3