From a95eafbbe823abf1d20ee7cfc7ce3b5805fb2d8b Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 22 Apr 2022 16:00:37 +0800
Subject: [PATCH] =?UTF-8?q?/icform/conditionlist-bygroup=20label+queryType?=
 =?UTF-8?q?+funType=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/result/ConditionResultDTO.java     |  2 ++
 .../src/main/resources/mapper/IcFormItemDao.xml      | 12 ++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/ConditionResultDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/ConditionResultDTO.java
index 07953ef95c..730d8fa0e5 100644
--- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/ConditionResultDTO.java
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/ConditionResultDTO.java
@@ -88,6 +88,8 @@ public class ConditionResultDTO implements Serializable {
      */
     private String queryType;
 
+    private String funType;
+
     private List<OptionDTO> options;
 }
 
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml
index b52940c589..fb85fcd58b 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml
@@ -19,6 +19,8 @@
         <result property="sort" column="SORT"/>
         <result property="placeholder" column="PLACEHOLDER"/>
         <result property="columnName" column="COLUMN_NAME"/>
+        <result property="queryType" column="QUERY_TYPE"/>
+        <result property="funType" column="FUN_TYPE"/>
         <collection property="options" ofType="com.epmet.dto.result.OptionDTO"
                     column="item_id"  select="com.epmet.dao.IcFormDao.selectListOption">
             <result property="label" column="label"/>
@@ -48,7 +50,8 @@
             b.SORT,
             IFNULL(i.PLACEHOLDER,'') as PLACEHOLDER,
             IFNULL(i.COLUMN_NAME,'')as  COLUMN_NAME,
-            b.QUERY_TYPE
+            b.QUERY_TYPE,
+            b.FUN_TYPE
         FROM ic_form_query_builder b
                  inner join ic_form_item i on(i.id=b.FORM_ITEM_ID and i.DEL_FLAG='0')
                  LEFT JOIN ic_form_item_group g ON ( i.ITEM_GROUP_ID = g.id )
@@ -70,8 +73,8 @@
 
                 )AS TABLE_NAME,
             i.PARENT_ITEM_ID,
-            i.LABEL,
-            i.ITEM_TYPE,
+            b.LABEL,
+            b.ITEM_TYPE,
             i.ITEM_GROUP_ID,
             i.REQUIRED,
             IFNULL(i.VALID_TYPE,'')as VALID_TYPE,
@@ -81,7 +84,8 @@
             b.SORT,
             IFNULL(i.PLACEHOLDER,'') as PLACEHOLDER,
             IFNULL(i.COLUMN_NAME,'')as  COLUMN_NAME,
-            b.QUERY_TYPE
+            b.QUERY_TYPE,
+            b.FUN_TYPE
         FROM ic_form_query_builder b
                  inner join ic_form_item i on(i.id=b.FORM_ITEM_ID and i.DEL_FLAG='0')
                  LEFT JOIN ic_form_item_group g ON ( i.ITEM_GROUP_ID = g.id )