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 f88bdf2144..07953ef95c 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 @@ -83,6 +83,11 @@ public class ConditionResultDTO implements Serializable { */ private String columnName; + /** + * 查询类型: equal, like,daterange.... + */ + private String queryType; + private List 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 5c1a6ab869..5a929a1b3d 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 @@ -41,7 +41,8 @@ IFNULL(i.OPTION_SOURCE_VALUE,'') as OPTION_SOURCE_VALUE, b.SORT, IFNULL(i.PLACEHOLDER,'') as PLACEHOLDER, - IFNULL(i.COLUMN_NAME,'')as COLUMN_NAME + IFNULL(i.COLUMN_NAME,'')as COLUMN_NAME, + b.QUERY_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 )