From 58e65b9f7c5b33e52ca6ea701c6923130dcc90ad Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 6 Apr 2023 16:29:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8=E5=A4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-boot/db/蔚来标准sql/dev_2nd_period.sql        |  3 ++-
 .../com/jero/modules/head/entity/HeadCustomEO.java |  3 +++
 .../head/service/impl/HeadCustomEOServiceImpl.java | 14 ++++++++++----
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql
index b5f3844fa..040cac9f4 100644
--- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql
+++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql
@@ -485,4 +485,5 @@ ADD COLUMN `click2` varchar(255) NULL COMMENT '动态表头使用' AFTER `click1
 ADD COLUMN `click3` varchar(255) NULL COMMENT '动态表头使用' AFTER `click2`,
 ADD COLUMN `click4` varchar(255) NULL COMMENT '动态表头使用' AFTER `click3`,
 ADD COLUMN `click5` varchar(255) NULL COMMENT '动态表头使用' AFTER `click4`,
-ADD COLUMN `click6` varchar(255) NULL COMMENT '动态表头使用' AFTER `click5`;
+ADD COLUMN `click6` varchar(255) NULL COMMENT '动态表头使用' AFTER `click5`,
+ADD COLUMN `db_field_name` varchar(255) NULL COMMENT '动态表头使用' AFTER `click6`;
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/entity/HeadCustomEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/entity/HeadCustomEO.java
index 5af44c0b2..d1eef12cd 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/entity/HeadCustomEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/entity/HeadCustomEO.java
@@ -126,6 +126,9 @@ public class HeadCustomEO implements Comparable<HeadCustomEO> {
     @ApiModelProperty(value = "动态表头使用")
     private String click6;
 
+    @ApiModelProperty(value = "动态表头使用")
+    private String dbFieldName;
+
     @Override
     public int compareTo(HeadCustomEO o) {
         return Integer.valueOf(this.getSort())-Integer.valueOf(o.getSort());//升序
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java
index 33af06df3..105533937 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java
@@ -55,7 +55,9 @@ public class HeadCustomEOServiceImpl extends ServiceImpl<HeadCustomEOMapper, Hea
                     && !headCustomEnum.REPORT_DATABASE_DETAILS.getName().equals(headCustomEOList.get(0).getModuleFlag())){
                 Collections.sort(oneList);
             }else{
-                oneList.sort(Comparator.comparing(HeadCustomEO::getSortParams));
+                Collections.sort(oneList,(a,b)->{
+                    return Integer.valueOf(a.getSortParams()) - Integer.valueOf(b.getSortParams());
+                });
             }
             //二级标题
             List<HeadCustomEO> twoList = headCustomEOList.stream().filter(e -> StringUtils.isNotBlank(e.getAffirmFlag())).collect(Collectors.toList());
@@ -171,6 +173,7 @@ public class HeadCustomEOServiceImpl extends ServiceImpl<HeadCustomEOMapper, Hea
         headCustomEOTemp.setClick4(headCustomEO.getClick4());
         headCustomEOTemp.setClick5(headCustomEO.getClick5());
         headCustomEOTemp.setClick6(headCustomEO.getClick6());
+        headCustomEOTemp.setDbFieldName(headCustomEO.getDbFieldName());
         return headCustomEOTemp;
     }
 
@@ -244,7 +247,9 @@ public class HeadCustomEOServiceImpl extends ServiceImpl<HeadCustomEOMapper, Hea
                     && !headCustomEnum.REPORT_DATABASE_DETAILS.getName().equals(moduleFlag)){
                 Collections.sort(oneList);
             }else{
-                oneList.sort(Comparator.comparing(HeadCustomEO::getSortParams));
+                Collections.sort(oneList,(a,b)->{
+                    return Integer.valueOf(a.getSortParams()) - Integer.valueOf(b.getSortParams());
+                });
             }
             for (HeadCustomEO headCustomEO : oneList) {
                 HeadCustomVO headCustomVO = new HeadCustomVO();
@@ -334,8 +339,7 @@ public class HeadCustomEOServiceImpl extends ServiceImpl<HeadCustomEOMapper, Hea
     @NotNull
     private HeadCustomVO getHeadCustomVO(String cut, HeadCustomEO headCustomEO, HeadCustomVO headCustomVO) {
         headCustomVO.setDataIndex(headCustomEO.getField());
-        headCustomVO.setDb_field_name(headCustomEO.getHeadFieldEn());
-        headCustomVO.setDb_field_txt(headCustomEO.getHeadFieldCn());
+        headCustomVO.setDb_field_name(headCustomEO.getDbFieldName());
         headCustomVO.setSortParams(headCustomEO.getSortParams());
         headCustomVO.setSort(headCustomEO.getSort());
         headCustomVO.setClick(headCustomEO.getClick());
@@ -347,8 +351,10 @@ public class HeadCustomEOServiceImpl extends ServiceImpl<HeadCustomEOMapper, Hea
         headCustomVO.setClick6(headCustomEO.getClick6());
         if (CutEnum.CN.getValue().equals(cut)) {
             headCustomVO.setTitle(headCustomEO.getHeadFieldCn());
+            headCustomVO.setDb_field_txt(headCustomEO.getHeadFieldCn());
         } else {
             headCustomVO.setTitle(headCustomEO.getHeadFieldEn());
+            headCustomVO.setDb_field_txt(headCustomEO.getHeadFieldEn());
         }
         //每个功能模块列表表头固定的列可能不相同，所以需要单独处理（后期变更的时候继续维护此处即可）
         if ("法规清单".equals(headCustomEO.getModuleFlag())) {