From 755719035ca505756530438a6250131c32236b3e Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 22 Apr 2022 17:57:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DummyInventoryInfoEOServiceImpl.java | 35 +++++++++++++++----
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
index 12ed3c214..dc4542c77 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
@@ -153,6 +153,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 				BeanUtils.copyProperties(bussDocumentLibraryEO,dummyInventoryInfoEOTemp);
 				String id = UUID.randomUUID().toString().replace("-", "");
 				dummyInventoryInfoEOTemp.setId(id);
+				dummyInventoryInfoEOTemp.setDummyInventoryBaseId(dummyInventoryInfoEO.getDummyInventoryBaseId());
 				dummyInventoryInfoEOTemp.setCreateTime(new Date());
 				dummyInventoryInfoEOTemp.setUpdateTime(new Date());
 				list.add(dummyInventoryInfoEOTemp);
@@ -232,7 +233,9 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 	@Override
     public List<DummyInventoryInfoEO> queryList(DummyInventoryInfoEO dummyInventoryInfoEO,HttpServletRequest req) {
 		QueryWrapper<DummyInventoryInfoEO> queryWrapper = QueryGenerator.initQueryWrapper(dummyInventoryInfoEO,req.getParameterMap());
+		queryWrapper.in("dummy_inventory_base_id",dummyInventoryInfoEO.getDummyInventoryBaseId());
 		queryWrapper.orderByDesc("create_time");
+
 		List<DummyInventoryInfoEO> dummyInventoryInfoEOList = this.list(queryWrapper);
 		//技术领域处理
 		treeDict(dummyInventoryInfoEO, dummyInventoryInfoEOList);
@@ -769,6 +772,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 					for (Map<String, String> stringStringMap : dataList) {
 						DummyInventoryInfoEO dummyInventoryInfoEOTemp = JSON.parseObject(JSON.toJSONString(stringStringMap), DummyInventoryInfoEO.class);
 						dummyInventoryInfoEOTemp.setCut(dummyInventoryInfoEO.getCut());
+						dummyInventoryInfoEOTemp.setDummyInventoryBaseId(dummyInventoryInfoEO.getDummyInventoryBaseId());
 						datas.add(dummyInventoryInfoEOTemp);
 					}
 				}
@@ -1284,6 +1288,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 	public void exportData(HttpServletResponse response, HttpServletRequest request, DummyInventoryInfoEO dummyInventoryInfoEO) {
 		List<DummyInventoryInfoEO> dataList = new ArrayList<>();
 		QueryWrapper<DummyInventoryInfoEO> queryWrapper = QueryGenerator.initQueryWrapper(dummyInventoryInfoEO,request.getParameterMap());
+		queryWrapper.in("dummy_inventory_base_id",dummyInventoryInfoEO.getDummyInventoryBaseId());
 		if(StringUtils.isNotBlank(dummyInventoryInfoEO.getIds())){
 			queryWrapper.in("id",Arrays.asList(dummyInventoryInfoEO.getIds().split(",")));
 		}
@@ -1444,13 +1449,29 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 	 */
 	private List<OSSFile> getOssFiles(List<DummyInventoryInfoEO> dataList) {
 		List<String> fileIdList = new ArrayList<>();
-		List<String> design = dataList.stream().map(DummyInventoryInfoEO::getDesignDeliverableTemplate).collect(Collectors.toList());
-		List<String> prehomo = dataList.stream().map(DummyInventoryInfoEO::getPrehomoDeliverableTemplate).collect(Collectors.toList());
-		List<String> verify = dataList.stream().map(DummyInventoryInfoEO::getVerifyDeliverableTemplate).collect(Collectors.toList());
-		fileIdList.addAll(design);
-		fileIdList.addAll(prehomo);
-		fileIdList.addAll(verify);
-
+		List<String> design = new ArrayList<>();
+		List<String> prehomo = new ArrayList<>();
+		List<String> verify = new ArrayList<>();
+		for (DummyInventoryInfoEO dummyInventoryInfoEO : dataList) {
+			if(StringUtils.isNotBlank(dummyInventoryInfoEO.getDesignDeliverableTemplate())){
+				design.add(dummyInventoryInfoEO.getDesignDeliverableTemplate());
+			}
+			if(StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoDeliverableTemplate())){
+				prehomo.add(dummyInventoryInfoEO.getPrehomoDeliverableTemplate());
+			}
+			if(StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyDeliverableTemplate())){
+				verify.add(dummyInventoryInfoEO.getVerifyDeliverableTemplate());
+			}
+		}
+		if(design.size() != 0){
+			fileIdList.addAll(design);
+		}
+		if(prehomo.size() != 0){
+			fileIdList.addAll(prehomo);
+		}
+		if(verify.size() != 0){
+			fileIdList.addAll(verify);
+		}
 		//查询所有的文件
 		List<OSSFile> fileInfos = new ArrayList<>();
 		if(fileIdList.size() != 0){