From 438464c01dc3d616dbe374c5c75de78ef7fe25bc Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Mon, 6 Feb 2023 09:26:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E6=A0=A1=E9=AA=8C=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ParamsReportDetailEOServiceImpl.java        | 12 ++++++++++++
 1 file changed, 12 insertions(+)

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 933c0e462..d4566d813 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
@@ -1467,6 +1467,18 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 				String configData = "";
 				List<ParamsReportConfigDataEO> paramsReportConfigDataEOS = paramsReportConfigDataEOService.queryByConfigIdListAndCollectManifestId(configIdList, paramsCollectManifestId);
 
+				// 匿名比较器排序
+				Collections.sort(paramsReportConfigDataEOS, new Comparator<ParamsReportConfigDataEO>() {
+					@Override
+					public int compare(ParamsReportConfigDataEO p1, ParamsReportConfigDataEO p2) {
+						if(p2.getOrderNum() == null || p1.getOrderNum() == null){
+							return 0;
+						}
+						// 倒序
+						return p2.getOrderNum().compareTo(p1.getOrderNum());
+					}
+				});
+
 				String textDatas = paramsReportConfigDataEOS.stream().filter(e->StringUtils.isNotEmpty(e.getTextData()))
 						.map(ParamsReportConfigDataEO::getTextData).distinct().collect(Collectors.joining(paramsReportDetailVO.getSeparator())); // 整合文本数据