From f989b014f2ffa1425d2badc507673197a4fb6aec Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 18 Nov 2022 10:25:52 +0800
Subject: [PATCH] =?UTF-8?q?ic=5Fform=5Fitem=5Fgroup=E5=A2=9E=E5=8A=A0GROUP?=
=?UTF-8?q?=5FCODE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/epmet/dto/IcFormItemGroupDTO.java | 14 +++++
.../com/epmet/dto/result/FormGroupDTO.java | 5 ++
.../epmet/entity/IcFormItemGroupEntity.java | 10 ++++
.../db/migration/V0.0.40__itemgroup_code.sql | 56 +++++++++++++++++++
.../src/main/resources/mapper/IcFormDao.xml | 7 ++-
5 files changed, 90 insertions(+), 2 deletions(-)
create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.40__itemgroup_code.sql
diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcFormItemGroupDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcFormItemGroupDTO.java
index 660171fce0..fa39a45b01 100644
--- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcFormItemGroupDTO.java
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcFormItemGroupDTO.java
@@ -78,4 +78,18 @@ public class IcFormItemGroupDTO implements Serializable {
*/
private Boolean display;
+ /**
+ * 政策人员信息组件;1:展示；0：不展示；默认0
+ */
+ private String policyFlag;
+
+ /**
+ * 1展示，0不展示，默认0
+ */
+ private String childShowFlag;
+
+ /**
+ * 组编码,唯一标识
+ */
+ private String groupCode;
}
diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FormGroupDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FormGroupDTO.java
index 1b2a6c8964..297b4e7163 100644
--- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FormGroupDTO.java
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FormGroupDTO.java
@@ -39,6 +39,11 @@ public class FormGroupDTO implements Serializable {
*/
private String tableName;
+ /**
+ *组编码,唯一标识
+ */
+ private String groupCode;
+
/**
* 分组里面的组件
*/
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormItemGroupEntity.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormItemGroupEntity.java
index 0ce8f42320..9b0e91dde2 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormItemGroupEntity.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormItemGroupEntity.java
@@ -79,4 +79,14 @@ public class IcFormItemGroupEntity extends BaseEpmetEntity {
* 政策人员信息组件;1:展示；0：不展示；默认0
*/
private String policyFlag;
+
+ /**
+ * 1展示，0不展示，默认0
+ */
+ private String childShowFlag;
+
+ /**
+ * 组编码,唯一标识
+ */
+ private String groupCode;
}
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.40__itemgroup_code.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.40__itemgroup_code.sql
new file mode 100644
index 0000000000..0e11715c94
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.40__itemgroup_code.sql
@@ -0,0 +1,56 @@
+alter table ic_form_item_group add COLUMN GROUP_CODE VARCHAR(32) DEFAULT '' COMMENT '组编码,唯一标识' after CHILD_SHOW_FLAG;
+
+update ic_form_item_group g set g.GROUP_CODE='jcxx'
+where g.LABEL='基础信息';
+
+
+update ic_form_item_group g set g.GROUP_CODE='jyxx'
+where g.LABEL='教育信息';
+
+update ic_form_item_group g set g.GROUP_CODE='xqah'
+where g.LABEL='兴趣爱好';
+
+update ic_form_item_group g set g.GROUP_CODE='zjxy'
+where g.LABEL='宗教信仰';
+
+update ic_form_item_group g set g.GROUP_CODE='jkxx'
+where g.LABEL='健康信息';
+
+update ic_form_item_group g set g.GROUP_CODE='gzxx'
+where g.LABEL='工作信息';
+
+update ic_form_item_group g set g.GROUP_CODE='jjzk'
+where g.LABEL='经济状况';
+
+update ic_form_item_group g set g.GROUP_CODE='jzxx'
+where g.LABEL='居住信息';
+
+update ic_form_item_group g set g.GROUP_CODE='jtxx'
+where g.LABEL='家庭信息';
+
+update ic_form_item_group g set g.GROUP_CODE='dyxx'
+where g.LABEL='党员信息';
+
+update ic_form_item_group g set g.GROUP_CODE='bzfxx'
+where g.LABEL='保障房信息';
+
+update ic_form_item_group g set g.GROUP_CODE='syxx'
+where g.LABEL='失业信息';
+
+update ic_form_item_group g set g.GROUP_CODE='tyjrxx'
+where g.LABEL='退役军人信息';
+
+update ic_form_item_group g set g.GROUP_CODE='zyzxx'
+where g.LABEL='志愿者信息';
+
+update ic_form_item_group g set g.GROUP_CODE='tsrqxx'
+where g.LABEL='特殊人群信息';
+
+update ic_form_item_group g set g.GROUP_CODE='tzry'
+where g.LABEL='统战人员';
+
+update ic_form_item_group g set g.GROUP_CODE='lnrxx'
+where g.LABEL='老年人信息';
+
+update ic_form_item_group g set g.GROUP_CODE='resi_demand'
+where g.LABEL='居民需求信息';
\ No newline at end of file
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormDao.xml
index d0cca510ad..6109c59bf5 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormDao.xml
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormDao.xml
@@ -66,7 +66,8 @@
g.LABEL,
g.sort,
g.SUPPORT_ADD,
- g.TABLE_NAME AS TABLE_NAME
+ g.TABLE_NAME AS TABLE_NAME,
+ g.GROUP_CODE
FROM
ic_form_item_group g
WHERE
@@ -124,6 +125,7 @@
+
@@ -200,7 +202,8 @@
case when g.table_name is null or g.table_name ='' then 'ic_resi_user'
else g.TABLE_NAME
end
- ) AS TABLE_NAME
+ ) AS TABLE_NAME,
+ g.GROUP_CODE
FROM
ic_form_item_group g
WHERE