From 89460823039065b32e913af1d25a4074b92dc497 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 18 Apr 2022 16:33:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95--=E5=AF=B9?=
 =?UTF-8?q?=E5=BA=94=E6=A0=87=E5=87=86=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dummy/entity/DummyInventoryInfoEO.java    |  2 ++
 .../impl/DummyInventoryInfoEOServiceImpl.java | 31 +++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java
index 122681a34..737b587ee 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java
@@ -120,6 +120,8 @@ public class DummyInventoryInfoEO implements Serializable {
 	@Excel(name = "对应标准", width = 15)
     @ApiModelProperty(value = "对应标准")
     private java.lang.String correspondingStandard;
+    @TableField(exist = false)
+    private java.lang.String correspondingStandardName;
 
 	/**WVTA ID*/
 	@Excel(name = "WVTA ID", width = 15)
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 70e50e874..a2fdbde13 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
@@ -342,6 +342,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 	 */
 	private void treeDict(DummyInventoryInfoEO dummyInventoryInfoEO, List<DummyInventoryInfoEO> dummyInventoryInfoEOList) {
 		Set<String> technologyTerritorySet = new HashSet<>();
+		Set<String> correspondingStandardSet = new HashSet<>();
 		List<String> deliverableList = new ArrayList<>();
 		if(dummyInventoryInfoEOList.size() != 0){
 			for (DummyInventoryInfoEO record : dummyInventoryInfoEOList) {
@@ -350,6 +351,11 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 					List<String> list = Arrays.asList(record.getTechnologyTerritory().split(","));
 					technologyTerritorySet.addAll(list);
 				}
+				//对应标准
+				if(StringUtils.isNotBlank(record.getCorrespondingStandard())){
+					List<String> list = Arrays.asList(record.getCorrespondingStandard().split(","));
+					correspondingStandardSet.addAll(list);
+				}
 				//设计符合性确认交付物模板
 				if(StringUtils.isNotBlank(record.getDesignDeliverableTemplate())){
 					deliverableList.addAll(Arrays.asList(record.getDesignDeliverableTemplate().split(",")));
@@ -364,6 +370,13 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 				}
 			}
 
+			//对应标准 iBussDocumentLibraryEOService
+			LambdaQueryWrapper<BussDocumentLibraryEO> wrapperTemp = new LambdaQueryWrapper<>();
+			wrapperTemp.in(BussDocumentLibraryEO::getId,correspondingStandardSet);
+			List<BussDocumentLibraryEO> bussDocumentLibraryEOList = iBussDocumentLibraryEOService.list(wrapperTemp);
+
+
+
 			//文件
 			List<OSSFile> fileInfos = new ArrayList<>();
 			if(deliverableList.size() != 0){
@@ -379,6 +392,24 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 			}
 
 			for (DummyInventoryInfoEO record : dummyInventoryInfoEOList) {
+				//对应标准
+				if(bussDocumentLibraryEOList.size() != 0 && StringUtils.isNotBlank(record.getCorrespondingStandard())){
+					StringBuilder stringBuilder = new StringBuilder();
+					for (String bussDocumentLibraryId : record.getCorrespondingStandard().split(",")) {
+						List<BussDocumentLibraryEO> bussDocumentLibraryEOS = bussDocumentLibraryEOList.stream()
+								.filter(e -> e.getId().equals(bussDocumentLibraryId)).collect(Collectors.toList());
+						if(bussDocumentLibraryEOS.size() != 0){
+							stringBuilder.append(bussDocumentLibraryEOS.get(0).getSerialNumber()+",");
+						}else{
+							//手动输入的情况
+							stringBuilder.append(bussDocumentLibraryId + ",");
+						}
+					}
+					if(StringUtils.isNotBlank(stringBuilder)){
+						String substring = stringBuilder.substring(0, stringBuilder.length() - 1);
+						record.setCorrespondingStandardName(substring);
+					}
+				}
 				//技术领域
 				if (categoryList.size() != 0 && StringUtils.isNotBlank(record.getTechnologyTerritory())) {
 					List<String> technologyTerritoryList = Arrays.asList(record.getTechnologyTerritory().split(","));