xuanyan 4 years ago
parent
commit
d97f96899c

+ 7 - 4
blade-service/estate/src/main/java/org/springblade/estate/service/impl/GuestRecordServiceImpl.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.estate.service.impl;
 
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
@@ -148,12 +149,14 @@ public class GuestRecordServiceImpl extends BaseServiceImpl<GuestRecordMapper, G
 
 		}
 		if(StringUtil.isNotBlank(beginDate) && StringUtil.isNotBlank(endDate)){
-			queryWrapper.lambda().ge(GuestRecord::getBeginTime, beginDate);
-			queryWrapper.lambda().le(GuestRecord::getEndTime, endDate);
+			queryWrapper.lambda().ge(GuestRecord::getInterviewTime, beginDate);
+			queryWrapper.lambda().le(GuestRecord::getInterviewTime, endDate);
 		}else{
 			Date today = new Date();
-			queryWrapper.lambda().ge(GuestRecord::getBeginTime, DateUtil.beginOfDay(today));
-			queryWrapper.lambda().le(GuestRecord::getEndTime, DateUtil.endOfDay(today));
+			DateTime dateTime = DateUtil.beginOfDay(today);
+			queryWrapper.lambda().ge(GuestRecord::getInterviewTime, dateTime);
+			DateTime endTime = DateUtil.endOfDay(today);
+			queryWrapper.lambda().le(GuestRecord::getInterviewTime, endTime);
 		}
 		return this.count(queryWrapper);
 	}