From 941ada66eface370269115bc5c769099c0f4ccbe Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Fri, 3 Feb 2023 09:26:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=BA=93=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=A1=B9=E6=9F=A5=E7=9C=8B=E9=A1=B5-?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE=E7=BB=93=E6=9E=84=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IParamsReportConfigDataEOService.java     |  2 ++
 .../ParamsReportConfigDataEOServiceImpl.java  | 15 ++++++++++
 .../impl/ParamsReportDetailEOServiceImpl.java | 28 ++++++++++++++++++-
 3 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java
index e4b308c54..94b9c8c6c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java
@@ -22,6 +22,8 @@ public interface IParamsReportConfigDataEOService extends IService<ParamsReportC
 	 */
 	ParamsReportConfigDataEO queryByConfigIdAndCollectManifestId(String paramsConfigId, String paramsCollectManifestId);
 
+	List<ParamsReportConfigDataEO> queryListByConfigIdAndCollectManifestId(String paramsConfigId, String paramsCollectManifestId);
+
 	List<ParamsReportConfigDataEO> queryByConfigIdListAndCollectManifestId(List<String> paramsConfigIdList, String paramsCollectManifestId);
 
 	/**
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java
index 5396e71ab..5f4e4e796 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java
@@ -35,6 +35,21 @@ public class ParamsReportConfigDataEOServiceImpl extends ServiceImpl<ParamsRepor
 		return getOne(queryWrapper);
 	}
 
+	/**
+	 * 通过id查询
+	 *
+	 * @param paramsConfigId
+	 * @param paramsCollectManifestId
+	 * @return
+	 */
+	@Override
+	public List<ParamsReportConfigDataEO> queryListByConfigIdAndCollectManifestId(String paramsConfigId, String paramsCollectManifestId) {
+		LambdaQueryWrapper<ParamsReportConfigDataEO> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.eq(ParamsReportConfigDataEO::getParamsConfigId, paramsConfigId);
+		queryWrapper.eq(ParamsReportConfigDataEO::getParamsCollectManifestId, paramsCollectManifestId);
+		return this.list(queryWrapper);
+	}
+
 	@Override
 	public List<ParamsReportConfigDataEO> queryByConfigIdListAndCollectManifestId(List<String> paramsConfigIdList, String paramsCollectManifestId) {
 		return baseMapper.selectByConfigIdListAndCollectManifestId(paramsConfigIdList, paramsCollectManifestId);
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
index 15d3aac78..858d70b32 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
@@ -198,12 +198,38 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 
 			if (CollectionUtil.isNotEmpty(paramsConfigEOList)) {
 				paramsConfigEOList.forEach(paramsConfigEO -> { // 参数配置
-					Map<String, Object> configMap = new HashMap<>();
+					/*Map<String, Object> configMap = new HashMap<>();
 					String paramsConfigId = paramsConfigEO.getId();
 					ParamsReportConfigDataEO paramsConfigDataEO = paramsReportConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据
 					List<ParamsConfigDataVO> paramsConfigDataVOList = getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据
 					configMap.put("controlType", controlType);
 					configMap.put("list", paramsConfigDataVOList);
+					manifestMap.put(paramsConfigEO.getId(), configMap);*/
+
+					Map<String,Object> paramsConfigDataVO = new HashMap<>();
+					Map<String, Object> configMap = new HashMap<>();
+
+					String paramsConfigId = paramsConfigEO.getId();
+					List<ParamsReportConfigDataEO> paramsConfigDataEOList = this.paramsReportConfigDataEOService.queryListByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据
+					if(CollectionUtils.isNotEmpty(paramsConfigDataEOList)){
+						// 匿名比较器排序
+						Collections.sort(paramsConfigDataEOList, new Comparator<ParamsReportConfigDataEO>() {
+							@Override
+							public int compare(ParamsReportConfigDataEO p1, ParamsReportConfigDataEO p2) {
+								if(p2.getOrderNum() == null || p1.getOrderNum() == null){
+									return 0;
+								}
+								return p1.getOrderNum().compareTo(p2.getOrderNum());
+							}
+						});
+						for (ParamsReportConfigDataEO paramsConfigDataEO : paramsConfigDataEOList) {
+							List<ParamsConfigDataVO> paramsConfigDataVOList = this.getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据
+							paramsConfigDataVO.put(paramsConfigDataEO.getId(),paramsConfigDataVOList);
+						}
+					}
+
+					configMap.put("paramsConfigData", paramsConfigDataVO);
+					configMap.put("controlType", controlType);
 					manifestMap.put(paramsConfigEO.getId(), configMap);
 
 					configIdList.add(paramsConfigEO.getId());