From 4f091fee875335a284b23d7efeb1750355a18fb1 Mon Sep 17 00:00:00 2001
From: shiyang <316555390@qq.com>
Date: Thu, 24 Feb 2022 17:08:23 +0800
Subject: [PATCH] upate

---
 .../com/lyms/talkonlineweb/controller/LymsHisInfoController.java   | 6 +++---
 .../src/main/java/com/lyms/talkonlineweb/domain/LymsHisInfo.java   | 7 +++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/LymsHisInfoController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/LymsHisInfoController.java
index 3b6c504..a0e674a 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/LymsHisInfoController.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/LymsHisInfoController.java
@@ -33,7 +33,7 @@ public class LymsHisInfoController {
      * @return
      */
     @GetMapping("getHisInfo")
-    public BaseResponse getHisInfo(LymsHisInfo hisInfo, int current, int size){
+    public BaseResponse getHisInfo(LymsHisInfo hisInfo,int current,int size){
         BaseResponse baseResponse=new BaseResponse();
         Page<LymsHisInfo> page=new Page<>(current,size);
         QueryWrapper<LymsHisInfo> query=new QueryWrapper();
@@ -46,10 +46,10 @@ public class LymsHisInfoController {
                     .or().eq("phone", hisInfo.getPhone())
                     .or().eq("idCard", hisInfo.getIdcard()));
         }
-        if(null!=hisInfo.getStartCreatedtime()){
+        if(StringUtil.isNotEmpty(hisInfo.getStartCreatedtime())){
             query.ge("createdtime", hisInfo.getStartCreatedtime());
         }
-        if(null!=hisInfo.getEndCreatedtime()){
+        if(StringUtil.isNotEmpty(hisInfo.getEndCreatedtime())){
             query.le("createdtime", hisInfo.getEndCreatedtime());
         }
         Page<LymsHisInfo> hisInfoPage=lymsHisInfoService.page(page,query);
diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsHisInfo.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsHisInfo.java
index 46ddf8e..6634f56 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsHisInfo.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsHisInfo.java
@@ -110,14 +110,17 @@ public class LymsHisInfo implements Serializable {
     /**
      * 筛选开始时间
      */
-    private Date startCreatedtime;
+    @TableField(exist = false)
+    private String startCreatedtime;
     /**
      * 筛选结束时间
      */
-    private Date endCreatedtime;
+    @TableField(exist = false)
+    private String endCreatedtime;
     /**
      * 综合查询（姓名/电话/身份证）
      */
+    @TableField(exist = false)
     private String synthesisQuery;
 
     @TableField(exist = false)
-- 
1.8.3.1