|
@@ -199,7 +199,7 @@ public class TeacherStatisticsController {
|
|
|
.le(CarOutInRecord::getRecordTime, endTime)
|
|
|
.eq("DATE_FORMAT(record_time, '%Y-%m-%d')", endTime.toLocalDate())
|
|
|
.eq(CarMessageApply::getUserId, record.getUserId())
|
|
|
- .ge(dto.getTimePeriod() == 2 && amEndTime != null, CarOutInRecord::getRecordTime, amEndTime)
|
|
|
+ .ge(dto.getTimePeriod() != null && dto.getTimePeriod() == 2 && amEndTime != null, CarOutInRecord::getRecordTime, amEndTime)
|
|
|
.eq(CarOutInRecord::getStatus, OutInStatusEnum.enter.getCode())
|
|
|
.orderByAsc(CarOutInRecord::getRecordTime)
|
|
|
);
|