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 4d0a000b8a..386fffd4d5 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 @@ -96,5 +96,10 @@ public class ConditionResultDTO implements Serializable { * 这个表 是否支持添加 即是否是多对一 eg:居民需求是多个对一个 */ private boolean supportAdd; + + /** + * 是否为多选 1可以多选,0单选 + */ + private Integer multiSelect; } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormQueryBuilderEntity.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormQueryBuilderEntity.java index 22f83887ba..a6940e9499 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormQueryBuilderEntity.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormQueryBuilderEntity.java @@ -76,7 +76,12 @@ public class IcFormQueryBuilderEntity extends BaseEpmetEntity { * 手机号:mobile; 身份证:id_card;只能输入数字:num */ private String validType; - + + /** + * 是否为多选 1可以多选,0单选 + */ + private Integer multiSelect; + /** * 排序 */ diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.30__item_query.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.30__item_query.sql new file mode 100644 index 0000000000..cdf0174eab --- /dev/null +++ b/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; + 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 b58666f21c..20974d2afa 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 @@ -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 ) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index 81f3c65f49..edb2455bee 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -128,6 +128,16 @@ ${subCondition.tableName}.${subCondition.columnName} like concat('%',#{colValue},'%') + + + + + + and ${subCondition.tableName}.${colValue} ='1' + + + +