修复条件查询

eladmin-web/src/views/polling/qyxxcx/index.vue

@@ -4,8 +4,8 @@
     <div class="head-container">
       <div v-if="crud.props.searchToggle">
         <!-- 搜索 -->
-        <el-input v-model="query.qqjk" clearable placeholder="请求接口名称" style="width: 200px" class="filter-item" @keyup.enter.native="crud.toQuery" />
-        <date-range-picker v-model="query.createTime" class="date-item" />
+        <el-input v-model="query.qqjk" clearable placeholder="请求接口(左模糊)" style="width: 200px" class="filter-item" @keyup.enter.native="crud.toQuery" />
+        <date-range-picker v-model="query.qqsj" startPlaceholder="请求日期" class="date-item" />
         <rrOperation />
       </div>
       <crudOperation :permission="permission" />
@@ -23,7 +23,7 @@
           </el-col>
           <el-col :span="8">
             <div class="grid-content bg-purple-light">
-              <el-form-item label="请求时间" prop="qqsj">
+              <el-form-item label="请求日期" prop="qqsj">
                 <el-input v-model="form.qqsj" style="width: 370px" :disabled="true" />
               </el-form-item>
             </div>
@@ -39,7 +39,7 @@
         <el-row :gutter="20">
           <el-col :span="8">
             <div class="grid-content bg-purple">
-              <el-form-item label="响应时间" prop="xysj">
+              <el-form-item label="响应日期" prop="xysj">
                 <el-input v-model.number="form.xysj" style="width: 370px;" :disabled="true" />
               </el-form-item>
             </div>

eladmin/eladmin-interface/src/main/java/me/zhengjie/service/dto/QyxxcxDeployQueryCriteria.java

@@ -18,6 +18,9 @@ package me.zhengjie.service.dto;
 import lombok.Data;
 import me.zhengjie.annotation.Query;
 
+import java.sql.Timestamp;
+import java.util.List;
+
 /**
 * @author zhanghouying
 * @date 2019-08-24
@@ -25,7 +28,9 @@ import me.zhengjie.annotation.Query;
 @Data
 public class QyxxcxDeployQueryCriteria {
 
-	@Query(type = Query.Type.INNER_LIKE,propName="QQJK", joinName = "qqjk")
+	@Query(type = Query.Type.LEFT_LIKE)
 	private String qqjk;
 
+	@Query(type = Query.Type.BETWEEN)
+	private List<Timestamp> qqsj;
 }