From b574bd6ac7822558c0bbe1a943957bd63be21661 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Thu, 29 Dec 2022 15:20:56 +0800
Subject: [PATCH] =?UTF-8?q?64523=E3=80=8164518bug=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ParamsCollectManifestEOServiceImpl.java   | 54 ++++++++++++++++++-
 1 file changed, 53 insertions(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index 9b923d513..af66d076a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -1232,6 +1232,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 				paramsConfigDataEO.setParamsCollectManifestId(paramsCollectManifestId);
 				paramsConfigDataEO.setParamsConfigId(paramsConfigEOId);
 				ParamsConfigEO paramsConfigEO = this.paramsConfigEOService.queryById(paramsConfigEOId);
+				if(Objects.isNull(paramsConfigEO)){
+					continue;
+				}
 				if (CollectionUtil.isNotEmpty(paramsConfigDataVOList)) {
 					boolean appendFlag = false; // 拼接标识
 					for (Map<String, Object> paramsConfigDataVO : paramsConfigDataVOList) {
@@ -5397,7 +5400,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
 		// 配置数据重构后入库
 		List<ParamsCollectManifestEO> updateEOList = new ArrayList<>();
-		for (ParamsReportConfigDataEO paramsReportConfigDataEO : paramsReportConfigDataEOList) {
+		/*for (ParamsReportConfigDataEO paramsReportConfigDataEO : paramsReportConfigDataEOList) {
 			StringBuilder referencesColBuilder = new StringBuilder();
 			if (StringUtils.isNotEmpty(paramsReportConfigDataEO.getTextData())) {
 				referencesColBuilder.append(paramsReportConfigDataEO.getTextData()).append("#");
@@ -5429,6 +5432,55 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 				}
 			}
 
+		}*/
+
+		for (ParamsCollectManifestEO paramsCollectManifestEO : paramsCollectManifestEOList) {
+			// 参考列值设置为空标识
+			boolean referencesColIsNullFlag = true;
+			for (ParamsReportConfigDataEO paramsReportConfigDataEO : paramsReportConfigDataEOList) {
+				if (StringUtils.equals(paramsCollectManifestEO.getNioNumber(),paramsReportConfigDataEO.getNioNumber())) {
+					// 控件类型相同 才能引用
+					if (paramsCollectManifestEO.getControlType().equals(paramsReportConfigDataEO.getControlType())) {
+
+						StringBuilder referencesColBuilder = new StringBuilder();
+						if (StringUtils.isNotEmpty(paramsReportConfigDataEO.getTextData())) {
+							referencesColBuilder.append(paramsReportConfigDataEO.getTextData()).append("#");
+						} else {
+							referencesColBuilder.append(" ").append("#");
+						}
+
+						if (StringUtils.isNotEmpty(paramsReportConfigDataEO.getPullData())) {
+							referencesColBuilder.append(paramsReportConfigDataEO.getPullData()).append("#");
+						} else {
+							referencesColBuilder.append(" ").append("#");
+						}
+
+						if (StringUtils.isNotEmpty(paramsReportConfigDataEO.getFileConnectId())) {
+							referencesColBuilder.append(paramsReportConfigDataEO.getFileConnectId()).append("#");
+						} else {
+							referencesColBuilder.append(" ").append("#");
+						}
+
+						String referencesCol = referencesColBuilder.toString();
+						ParamsCollectManifestEO updateCollectManifestEO = new ParamsCollectManifestEO();
+
+						updateCollectManifestEO.setId(paramsCollectManifestEO.getId());
+						updateCollectManifestEO.setReferencesCol(referencesCol);
+						updateEOList.add(updateCollectManifestEO);
+
+						referencesColIsNullFlag = false;
+						break;
+					}
+				}
+			}
+
+			if(referencesColIsNullFlag){
+				// 如果根据nio编号没有匹配到数据，将参考列的值设置为空
+				LambdaUpdateWrapper<ParamsCollectManifestEO> manifestUpdateWrap = new LambdaUpdateWrapper<>();
+				manifestUpdateWrap.eq(ParamsCollectManifestEO::getId,paramsCollectManifestEO.getId());
+				manifestUpdateWrap.set(ParamsCollectManifestEO::getReferencesCol,null);
+				this.update(manifestUpdateWrap);
+			}
 		}
 
 		// 修改参数清单的参考列名称