From 646b48f2365284c9d5d47700ade6d64c5268edb2 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 6 Apr 2023 17:05:21 +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              | 4 +++-
 .../java/com/jero/modules/head/entity/HeadCustomEO.java  | 6 ++++++
 .../head/service/impl/HeadCustomEOServiceImpl.java       | 9 ++++++---
 .../main/java/com/jero/modules/head/vo/HeadCustomVO.java | 4 ++++
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql
index 721f6328c..202e6b297 100644
--- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql
+++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql
@@ -487,4 +487,6 @@ 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 `db_field_name` varchar(255) NULL COMMENT '动态表头使用' AFTER `click6`,
-ADD COLUMN `db_field_txt` varchar(255) NULL COMMENT '动态表头使用' AFTER `db_field_name`;
+ADD COLUMN `db_field_txt` varchar(255) NULL COMMENT '动态表头使用' AFTER `db_field_name`,
+ADD COLUMN `is_lock` varchar(255) NULL COMMENT '动态表头使用' AFTER `db_field_txt`,
+ADD COLUMN `type` varchar(255) NULL COMMENT '动态表头使用' AFTER `is_lock`;
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 1e6d52d22..92b5cc362 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
@@ -132,6 +132,12 @@ public class HeadCustomEO implements Comparable<HeadCustomEO> {
     @ApiModelProperty(value = "动态表头使用")
     private String dbFieldTxt;
 
+    @ApiModelProperty(value = "动态表头使用")
+    private String isLock;
+
+    @ApiModelProperty(value = "动态表头使用")
+    private String type;
+
     @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 bd2e9990c..1b96f21c9 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
@@ -175,6 +175,8 @@ public class HeadCustomEOServiceImpl extends ServiceImpl<HeadCustomEOMapper, Hea
         headCustomEOTemp.setClick6(headCustomEO.getClick6());
         headCustomEOTemp.setDbFieldName(headCustomEO.getDbFieldName());
         headCustomEOTemp.setDbFieldTxt(headCustomEO.getDbFieldTxt());
+        headCustomEOTemp.setIsLock(headCustomEO.getIsLock());
+        headCustomEOTemp.setType(headCustomEO.getType());
         return headCustomEOTemp;
     }
 
@@ -340,7 +342,6 @@ 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.getDbFieldName());
         headCustomVO.setDb_field_txt(headCustomEO.getDbFieldTxt());
         headCustomVO.setSortParams(headCustomEO.getSortParams());
         headCustomVO.setSort(headCustomEO.getSort());
@@ -351,12 +352,14 @@ public class HeadCustomEOServiceImpl extends ServiceImpl<HeadCustomEOMapper, Hea
         headCustomVO.setClick4(headCustomEO.getClick4());
         headCustomVO.setClick5(headCustomEO.getClick5());
         headCustomVO.setClick6(headCustomEO.getClick6());
+        headCustomVO.setIsLock(headCustomEO.getIsLock());
+        headCustomVO.setType(headCustomEO.getType());
         if (CutEnum.CN.getValue().equals(cut)) {
             headCustomVO.setTitle(headCustomEO.getHeadFieldCn());
-            headCustomVO.setDb_field_txt(headCustomEO.getHeadFieldCn());
+            headCustomVO.setDb_field_name(headCustomEO.getHeadFieldCn());
         } else {
             headCustomVO.setTitle(headCustomEO.getHeadFieldEn());
-            headCustomVO.setDb_field_txt(headCustomEO.getHeadFieldEn());
+            headCustomVO.setDb_field_name(headCustomEO.getHeadFieldEn());
         }
         //每个功能模块列表表头固定的列可能不相同，所以需要单独处理（后期变更的时候继续维护此处即可）
         if ("法规清单".equals(headCustomEO.getModuleFlag())) {
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/vo/HeadCustomVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/vo/HeadCustomVO.java
index 26976b78d..fd4a8a349 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/vo/HeadCustomVO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/vo/HeadCustomVO.java
@@ -41,5 +41,9 @@ public class HeadCustomVO {
 
     private String db_field_txt;
 
+    private String isLock;
+
+    private String type;
+
 
 }