Merge remote-tracking branch 'remotes/origin/dev_resi_export' into develop

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcExportTemplateDTO.java

@@ -48,16 +48,6 @@ public class IcExportTemplateDTO implements Serializable {
      */
 	private String name;
 
-    /**
-     * 0:动态；1:文件
-     */
-	private Integer type;
-
-    /**
-     * 文件地址；http开头或者项目组模板存放相对路径
-     */
-	private String url;
-
     /**
      * 排序
      */

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcExportTemplateEntity.java

@@ -43,16 +43,6 @@ public class IcExportTemplateEntity extends BaseEpmetEntity {
      */
 	private String name;
 
-    /**
-     * 0:动态；1:文件
-     */
-	private Integer type;
-
-    /**
-     * 文件地址；http开头或者项目组模板存放相对路径
-     */
-	private String url;
-
     /**
      * 排序
      */

epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.25__add_export_temp.sql

@@ -0,0 +1,48 @@
+CREATE TABLE `ic_export_template` (
+                                      `ID` varchar(64) NOT NULL COMMENT '主键',
+                                      `CUSTOMER_ID` varchar(64) NOT NULL DEFAULT '' COMMENT '客户id',
+                                      `AGENCY_ID` varchar(64) NOT NULL COMMENT '所属机关ID（customer_agency.id）',
+                                      `PIDS` varchar(1024) DEFAULT NULL COMMENT '所有上级组织机构ID(以英文:隔开)包含本身id',
+                                      `FORM_CODE` varchar(32) NOT NULL COMMENT '表ic_form中的CODE',
+                                      `NAME` varchar(64) NOT NULL DEFAULT '' COMMENT '模板名称',
+                                      `SORT` int(11) NOT NULL COMMENT '排序',
+                                      `DEL_FLAG` int(10) NOT NULL COMMENT '0未删除，1已删除',
+                                      `REVISION` int(10) NOT NULL COMMENT '乐观锁',
+                                      `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人',
+                                      `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+                                      `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人',
+                                      `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+                                      PRIMARY KEY (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='自定义表单导出模板';
+
+CREATE TABLE `ic_export_template_config` (
+                                             `ID` varchar(64) NOT NULL COMMENT '主键',
+                                             `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id',
+                                             `TEMP_ID` varchar(64) NOT NULL COMMENT '模板主键id',
+                                             `PID` varchar(64) NOT NULL DEFAULT '0' COMMENT '当前表的id',
+                                             `ITEM_ID` varchar(64) NOT NULL DEFAULT '' COMMENT 'ic_form_item.id',
+                                             `WIDTH` int(4) DEFAULT NULL COMMENT '表头宽度',
+                                             `LABEL` varchar(32) NOT NULL COMMENT '项标签',
+                                             `SORT` int(11) NOT NULL COMMENT '排序',
+                                             `DEL_FLAG` int(10) NOT NULL COMMENT '0未删除，1已删除',
+                                             `REVISION` int(10) NOT NULL COMMENT '乐观锁',
+                                             `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人',
+                                             `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+                                             `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人',
+                                             `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+                                             PRIMARY KEY (`ID`) USING BTREE,
+                                             KEY `idx_temp_id` (`TEMP_ID`) USING BTREE COMMENT '模板主键Id'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='自定义表单导出模板配置项';
+
+#add 基础信息group
+INSERT INTO  ic_form_item_group
+SELECT DISTINCT  CONCAT( CUSTOMER_ID, '_0' ) ID,  CUSTOMER_ID,  `FORM_ID`,  `FORM_CODE`,  `TABLE_NAME`,  `SUPPORT_ADD`,  '基础信息' AS `LABEL`,  0 AS `SORT`,  0 AS `DISPLAY`,  `DEL_FLAG`,  `REVISION`,  'ljj' AS `CREATED_BY`,  NOW() CREATED_TIME,  'ljj' AS `UPDATED_BY`,  NOW() AS UPDATED_TIME
+FROM  ic_form_item_group   WHERE DEL_FLAG = '0'
+GROUP BY  customer_id;
+
+#更新 0分组为0 groupId
+UPDATE ic_form_item m set m.ITEM_GROUP_ID = CONCAT(m.CUSTOMER_ID,'_',m.ITEM_GROUP_ID) WHERE m.ITEM_GROUP_ID = '0';
+
+#更新表名
+UPDATE ic_form_item_group  SET TABLE_NAME='ic_resi_user' where (TABLE_NAME='' or TABLE_NAME is null) and DEL_FLAG='0';
+