liquanyu / talkonline

Download as
Browse Code »

Commit 4f091fee875335a284b23d7efeb1750355a18fb1

Authored by shiyang
1 parent 75765c4f8c
Exists in master and in 1 other branch dev

upate

Showing 2 changed files with 8 additions and 5 deletions

talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/LymsHisInfoController.java View file @ 4f091fe
... ... @@ -33,7 +33,7 @@
33 33 * @return
34 34 */
35 35 @GetMapping("getHisInfo")
36   - public BaseResponse getHisInfo(LymsHisInfo hisInfo, int current, int size){
  36 + public BaseResponse getHisInfo(LymsHisInfo hisInfo,int current,int size){
37 37 BaseResponse baseResponse=new BaseResponse();
38 38 Page<LymsHisInfo> page=new Page<>(current,size);
39 39 QueryWrapper<LymsHisInfo> query=new QueryWrapper();
40 40  
... ... @@ -46,10 +46,10 @@
46 46 .or().eq("phone", hisInfo.getPhone())
47 47 .or().eq("idCard", hisInfo.getIdcard()));
48 48 }
49   - if(null!=hisInfo.getStartCreatedtime()){
  49 + if(StringUtil.isNotEmpty(hisInfo.getStartCreatedtime())){
50 50 query.ge("createdtime", hisInfo.getStartCreatedtime());
51 51 }
52   - if(null!=hisInfo.getEndCreatedtime()){
  52 + if(StringUtil.isNotEmpty(hisInfo.getEndCreatedtime())){
53 53 query.le("createdtime", hisInfo.getEndCreatedtime());
54 54 }
55 55 Page<LymsHisInfo> hisInfoPage=lymsHisInfoService.page(page,query);
talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsHisInfo.java View file @ 4f091fe
... ... @@ -110,14 +110,17 @@
110 110 /**
111 111 * 筛选开始时间
112 112 */
113   - private Date startCreatedtime;
  113 + @TableField(exist = false)
  114 + private String startCreatedtime;
114 115 /**
115 116 * 筛选结束时间
116 117 */
117   - private Date endCreatedtime;
  118 + @TableField(exist = false)
  119 + private String endCreatedtime;
118 120 /**
119 121 * 综合查询（姓名/电话/身份证）
120 122 */
  123 + @TableField(exist = false)
121 124 private String synthesisQuery;
122 125  
123 126 @TableField(exist = false)