ic_form_item_group增加GROUP_CODE

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;
 }

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;
+
     /**
      * 分组里面的组件
      */

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;
 }

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='居民需求信息';

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 @@
         <result property="sort" column="sort"/>
         <result property="supportAdd" column="SUPPORT_ADD"/>
         <result property="tableName" column="TABLE_NAME"/>
+        <result property="groupCode" column="GROUP_CODE"/>
         <collection property="itemList" ofType="com.epmet.dto.result.FormItemResult2"
                     column="group_id"  select="com.epmet.dao.IcFormDao.selectItemListByGroupId">
         </collection>
@@ -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