From fc2a3b930ba6ea623c864f515115eb4fe39423c0 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 26 Oct 2021 16:39:02 +0800
Subject: [PATCH] zancun

---
 .../com/epmet/dto/result/FormGroupDTO.java    |   2 +-
 .../java/com/epmet/dto/result/FormItem2.java  | 112 ++++++++++++++++++
 .../main/java/com/epmet/dao/IcFormDao.java    |   2 +
 .../src/main/resources/mapper/IcFormDao.xml   |  86 +++++++++++---
 4 files changed, 185 insertions(+), 17 deletions(-)
 create mode 100644 epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FormItem2.java

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 ae71a9c160..dbb3f60e70 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
@@ -42,6 +42,6 @@ public class FormGroupDTO implements Serializable {
     /**
      * 分组里面的组件
      */
-    private List<FormItem> itemList;
+    private List<FormItem2> itemList;
 }
 
diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FormItem2.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FormItem2.java
new file mode 100644
index 0000000000..41f46c55d0
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FormItem2.java
@@ -0,0 +1,112 @@
+package com.epmet.dto.result;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description 分组里面的组件
+ * @Author yinzuomei
+ * @Date 2021/10/26 4:29 下午
+ */
+@Data
+public class FormItem2 implements Serializable {
+    private static final long serialVersionUID = -7571266621687396261L;
+    /**
+     * 父项ID
+     */
+    private String itemId;
+
+    /**
+     * 默认：ic_resi_user
+     */
+    private String tableName;
+
+    /**
+     * 父项ID
+     */
+    private String parentItemId;
+
+    /**
+     * 项标签
+     */
+    private String label;
+
+    /**
+     * 控件类型,EG:INPUT;从字典获取
+     */
+    private String itemType;
+
+    /**
+     * 分组ID,'默认，NONE'
+     */
+    private String itemGroupId;
+
+    /**
+     * 是否必填,1必填。0不必填
+     */
+    private Integer required;
+
+    /**
+     * 手机号：mobile; 身份证：id_card
+     */
+    private String validType;
+
+    /**
+     * 默认值
+     */
+    private String defaultValue;
+
+    /**
+     * 选项来源,REMOTE;LOCAL;如果是动态加载的下拉框或者CHECKBOX等的情况下使用。URL:接口获取(LABEL,VALUE)；JSON:直接从JSON中取
+     */
+    private String optionSourceType;
+
+    /**
+     * 来源地址,REMOTE才有，固定格式;如果OPTIONS_SOURCE是URL，则此处填写要调用的接口的URL相对路径，例如：/API/GOV/ORG/XXXX。此处不应设置参数，若需要参数应当完全由后端，通过TOKEN信息来获取
+     */
+    private String optionSourceValue;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 占位提示语
+     */
+    private String placeholder;
+
+    /**
+     * 是否查询显示,1展示。0不展示
+     */
+    @JsonIgnore
+    private Integer searchDisplay;
+
+    /**
+     * 是否列表显示，1展示，0不展示
+     */
+    @JsonIgnore
+    private Integer listDisplay;
+
+    /**
+     * 是否需要支持数据分析，1支持。0不支持
+     */
+    @JsonIgnore
+    private Integer dataAnalyse;
+
+    /**
+     * 列名
+     */
+    private String columnName;
+
+    /**
+     * 列名序号，根据表递增
+     */
+    private Integer columnNum;
+
+    private List<OptionDTO> options;
+}
+
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormDao.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormDao.java
index 1b2ffe357c..bed3566120 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormDao.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormDao.java
@@ -53,4 +53,6 @@ public interface IcFormDao extends BaseDao<IcFormEntity> {
     List<OptionDTO> selectListOption(String itemId);
 
     List<FormGroupDTO> selectListGroup(String formId);
+
+    FormGroupDTO selectChildGroup(String itemId);
 }
\ 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 8c872f115d..b3c51eaf84 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
@@ -17,7 +17,7 @@
     </select>
 
 
-    <resultMap id="FormItemMap" type="com.epmet.dto.result.FormItem">
+    <resultMap id="FormItemMap1" type="com.epmet.dto.result.FormItem">
         <id property="itemId" column="item_id" ></id>
         <result property="tableName" column="table_name"/>
         <result property="parentItemId" column="PARENT_ITEM_ID"/>
@@ -41,6 +41,9 @@
             <result property="label" column=""/>
             <result property="value" column="url"/>
         </collection>
+        <collection property="childGroup" ofType="com.epmet.dto.result.FormGroupDTO"
+                    column="item_id"  select="com.epmet.dao.IcFormDao.selectChildGroup">
+        </collection>
     </resultMap>
 
     <select id="selectListOption" parameterType="java.lang.String" resultType="com.epmet.dto.result.OptionDTO">
@@ -56,7 +59,29 @@
             i.SORT ASC
     </select>
 
-    <select id="selectItemList" parameterType="java.lang.String" resultMap="FormItemMap">
+    <select id="selectChildGroup" parameterType="java.lang.String" resultMap="FormGroupDTOMap">
+        SELECT
+            g.id AS group_id,
+            g.LABEL,
+            g.sort,
+            g.SUPPORT_ADD,
+            g.TABLE_NAME AS TABLE_NAME
+        FROM
+            ic_form_item_group g
+        WHERE
+            g.DEL_FLAG = '0'
+          AND g.id =(
+            SELECT DISTINCT
+                i.ITEM_GROUP_ID
+            FROM
+                ic_form_item i
+            WHERE
+                i.DEL_FLAG = '0'
+              AND i.PARENT_ITEM_ID = #{itemId}
+        )
+    </select>
+
+    <select id="selectItemList" parameterType="java.lang.String" resultMap="FormItemMap1">
         SELECT
             fi.ID AS item_id,
             'ic_resi_user' AS table_name,
@@ -65,16 +90,17 @@
             fi.ITEM_TYPE,
             fi.ITEM_GROUP_ID,
             fi.REQUIRED,
-            fi.VALID_TYPE,
-            fi.DEFAULT_VALUE,
-            fi.OPTION_SOURCE_TYPE,
-            fi.OPTION_SOURCE_VALUE,
+            IFNULL(fi.VALID_TYPE,'') as VALID_TYPE,
+            IFNULL(fi.DEFAULT_VALUE,'') as DEFAULT_VALUE,
+            IFNULL(fi.OPTION_SOURCE_TYPE,'') as OPTION_SOURCE_TYPE,
+            IFNULL(fi.OPTION_SOURCE_VALUE,'') as OPTION_SOURCE_VALUE,
             fi.SORT,
-            fi.PLACEHOLDER,
+            IFNULL(fi.PLACEHOLDER,'') as PLACEHOLDER,
             fi.SEARCH_DISPLAY,
             fi.LIST_DISPLAY,
             fi.DATA_ANALYSE,
-            fi.COLUMN_NAME
+            fi.COLUMN_NAME,
+            fi.COLUMN_NUM
         FROM
             ic_form_item fi
         WHERE
@@ -92,12 +118,39 @@
         <result property="sort" column="sort"/>
         <result property="supportAdd" column="SUPPORT_ADD"/>
         <result property="tableName" column="TABLE_NAME"/>
-        <collection property="itemList" ofType="com.epmet.dto.result.FormItem"
+        <collection property="itemList" ofType="com.epmet.dto.result.FormItem2"
                     column="group_id"  select="com.epmet.dao.IcFormDao.selectItemListByGroupId">
         </collection>
     </resultMap>
 
-    <select id="selectItemListByGroupId" parameterType="java.lang.String" resultMap="FormItemMap">
+
+    <resultMap id="FormItemMap2" type="com.epmet.dto.result.FormItem2">
+        <id property="itemId" column="item_id" ></id>
+        <result property="tableName" column="table_name"/>
+        <result property="parentItemId" column="PARENT_ITEM_ID"/>
+        <result property="label" column="LABEL"/>
+        <result property="itemType" column="ITEM_TYPE"/>
+        <result property="itemGroupId" column="ITEM_GROUP_ID"/>
+        <result property="required" column="REQUIRED"/>
+        <result property="validType" column="VALID_TYPE"/>
+        <result property="defaultValue" column="DEFAULT_VALUE"/>
+        <result property="optionSourceType" column="OPTION_SOURCE_TYPE"/>
+        <result property="optionSourceValue" column="OPTION_SOURCE_VALUE"/>
+        <result property="sort" column="SORT"/>
+        <result property="placeholder" column="PLACEHOLDER"/>
+        <result property="searchDisplay" column="SEARCH_DISPLAY"/>
+        <result property="listDisplay" column="LIST_DISPLAY"/>
+        <result property="dataAnalyse" column="DATA_ANALYSE"/>
+        <result property="columnName" column="COLUMN_NAME"/>
+        <result property="columnNum" column="COLUMN_NUM"/>
+        <collection property="options" ofType="com.epmet.dto.result.OptionDTO"
+                    column="item_id"  select="com.epmet.dao.IcFormDao.selectListOption">
+            <result property="label" column=""/>
+            <result property="value" column="url"/>
+        </collection>
+    </resultMap>
+
+    <select id="selectItemListByGroupId" parameterType="java.lang.String" resultMap="FormItemMap2">
         SELECT
             fi.ID AS item_id,
             'ic_resi_user' AS table_name,
@@ -106,16 +159,17 @@
             fi.ITEM_TYPE,
             fi.ITEM_GROUP_ID,
             fi.REQUIRED,
-            fi.VALID_TYPE,
-            fi.DEFAULT_VALUE,
-            fi.OPTION_SOURCE_TYPE,
-            fi.OPTION_SOURCE_VALUE,
+            IFNULL(fi.VALID_TYPE,'') as VALID_TYPE,
+            IFNULL(fi.DEFAULT_VALUE,'') as DEFAULT_VALUE,
+            IFNULL(fi.OPTION_SOURCE_TYPE,'') as OPTION_SOURCE_TYPE,
+            IFNULL(fi.OPTION_SOURCE_VALUE,'') as OPTION_SOURCE_VALUE,
             fi.SORT,
-            fi.PLACEHOLDER,
+            IFNULL(fi.PLACEHOLDER,'') as PLACEHOLDER,
             fi.SEARCH_DISPLAY,
             fi.LIST_DISPLAY,
             fi.DATA_ANALYSE,
-            fi.COLUMN_NAME
+            fi.COLUMN_NAME,
+            fi.COLUMN_NUM
         FROM
             ic_form_item fi
         WHERE