Merge remote-tracking branch 'origin/dev_18category_resi'

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

@@ -96,5 +96,10 @@ public class ConditionResultDTO implements Serializable {
      * 这个表 是否支持添加 即是否是多对一 eg:居民需求是多个对一个
      */
     private boolean supportAdd;
+
+    /**
+     * 是否为多选 1可以多选，0单选
+     */
+    private Integer multiSelect;
 }
 

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

@@ -77,6 +77,11 @@ public class IcFormQueryBuilderEntity extends BaseEpmetEntity {
 	 */
 	private String validType;
 
+	/**
+	 * 是否为多选 1可以多选，0单选
+	 */
+	private Integer multiSelect;
+
     /**
      * 排序
      */

epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.30__item_query.sql

@@ -0,0 +1,2 @@
+alter TABLE ic_form_query_builder add COLUMN `MULTI_SELECT` tinyint(1) NOT NULL DEFAULT '0' COMMENT '1可以多选，0单选，默认0' after VALID_TYPE;
+

epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml

@@ -85,7 +85,8 @@
             IFNULL(i.PLACEHOLDER,'') as PLACEHOLDER,
             IFNULL(i.COLUMN_NAME,'')as  COLUMN_NAME,
             b.QUERY_TYPE,
-            b.FUN_TYPE
+            b.FUN_TYPE,
+            b.MULTI_SELECT as multiSelect
         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 )

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

@@ -128,6 +128,16 @@
                             ${subCondition.tableName}.${subCondition.columnName} like concat('%',#{colValue},'%')
                         </foreach>
                     </if>
+
+                    <if test="subCondition.queryType!= null and subCondition.queryType == 'resi_category' ">
+                        <if test="null!=subCondition.columnValue[0] and ''!=subCondition.columnValue[0]">
+                            <foreach collection="subCondition.columnValue" item="colValue" open="" separator="" close="">
+                                <if test="colValue != null and colValue != ''">
+                                    and ${subCondition.tableName}.${colValue} ='1'
+                                </if>
+                            </foreach>
+                        </if>
+                    </if>
                 </if>
             </foreach>
         </if>