项目初始化

datax-modules/data-masterdata-service-parent/data-masterdata-service-api/src/main/java/cn/datax/service/data/masterdata/api/query/Condition.java

@@ -20,7 +20,22 @@ public class Condition implements Serializable {
     private String value;
 
     /**
-     * 查询类型，如llike,eq,gt,ge,lt,le
+     * 查询类型，如like,eq,gt,ge,lt,le,eq,ne,between
+     */
+    private String queryType;
+
+    /**
+     * 字段类型，如int、varchar、datetime
      */
     private String type;
+
+    /**
+     * 查询类型between时left查询字段值
+     */
+    private String leftValue;
+
+    /**
+     * 查询类型between时right查询字段值
+     */
+    private String rightValue;
 }

datax-modules/data-masterdata-service-parent/data-masterdata-service/src/main/java/cn/datax/service/data/masterdata/service/impl/ModelServiceImpl.java

@@ -142,7 +142,8 @@ public class ModelServiceImpl extends BaseServiceImpl<ModelDao, ModelEntity> imp
         List<Map<String, Object>> queryList = modelColumns.stream().filter(s -> DataConstant.TrueOrFalse.TRUE.getKey().equals(s.getIsQuery())).map(s -> {
             Map<String, Object> map = new HashMap<>(2);
             map.put("column", s.getColumnName());
-            map.put("type", s.getQueryType());
+            map.put("queryType", s.getQueryType());
+            map.put("type", s.getColumnType());
             map.put("columnName", s.getColumnComment());
             return map;
         }).collect(Collectors.toList());

datax-modules/data-masterdata-service-parent/data-masterdata-service/src/main/java/cn/datax/service/data/masterdata/utils/SearchUtil.java

@@ -15,7 +15,7 @@ public class SearchUtil {
         List<Condition> conditionList = modelDataQuery.getConditions();
         if(CollUtil.isNotEmpty(conditionList)){
             for(Condition condition : conditionList){
-                switch (condition.getType()) {
+                switch (condition.getQueryType()) {
                     case "eq":
                         queryWrapper.eq(StrUtil.isNotBlank(condition.getValue()), condition.getColumn(), condition.getValue());
                         break;
@@ -35,7 +35,10 @@ public class SearchUtil {
                         queryWrapper.lt(StrUtil.isNotBlank(condition.getValue()), condition.getColumn(), condition.getValue());
                         break;
                     case "le":
-                        queryWrapper.le(StrUtil.isNotBlank(condition.getValue()), condition.getColumn(),condition.getValue());
+                        queryWrapper.le(StrUtil.isNotBlank(condition.getValue()), condition.getColumn(), condition.getValue());
+                        break;
+                    case "between":
+                        queryWrapper.between(StrUtil.isNotBlank(condition.getLeftValue()) && StrUtil.isNotBlank(condition.getRightValue()), condition.getColumn(), condition.getLeftValue(), condition.getRightValue());
                         break;
                     default:
                         break;

datax-ui/src/views/masterdata/datamanage/DataList.vue

@@ -24,11 +24,33 @@
         <div v-if="tableName">
           <el-form ref="queryForm" :model="queryParams" :inline="true">
             <el-form-item v-for="(item, index) in queryParams.conditions" :label="item.columnName" :prop="item.column" :key="index">
-              <el-input
-                v-model.trim="queryParams.conditions[index].value"
-                clearable
-                size="small"
-              ></el-input>
+              <template v-if="item.type === 'char'">
+                <el-input
+                  v-model.trim="queryParams.conditions[index].value"
+                  clearable
+                  size="small"
+                ></el-input>
+              </template>
+              <template v-if="item.type === 'int'">
+                <el-input-number
+                  v-model.trim="queryParams.conditions[index].value"
+                  :controls="false"
+                  :precision="0"
+                  clearable
+                  size="small"
+                ></el-input-number>
+              </template>
+              <template v-if="item.type === 'datetime'">
+                <el-date-picker
+                  v-model.trim="queryParams.conditions[index].value"
+                  format="yyyy-MM-dd HH:mm:ss"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  type="datetime"
+                  placeholder="选择日期时间"
+                  clearable
+                  size="small"
+                ></el-date-picker>
+              </template>
             </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>