|
@@ -196,7 +196,7 @@ public class TeacherStatisticsController {
|
|
.eq("DATE_FORMAT(record_time, '%Y-%m-%d')", endTime.toLocalDate())
|
|
.eq("DATE_FORMAT(record_time, '%Y-%m-%d')", endTime.toLocalDate())
|
|
.eq(CarMessageApply::getUserId, record.getUserId())
|
|
.eq(CarMessageApply::getUserId, record.getUserId())
|
|
.ge(dto.getTimePeriod() == 2 && amEndTime != null, CarOutInRecord::getRecordTime, amEndTime)
|
|
.ge(dto.getTimePeriod() == 2 && amEndTime != null, CarOutInRecord::getRecordTime, amEndTime)
|
|
- .eq(CarOutInRecord::getReleaseResult, 1)
|
|
|
|
|
|
+ .eq(CarOutInRecord::getStatus, 0)
|
|
.orderByAsc(CarOutInRecord::getRecordTime)
|
|
.orderByAsc(CarOutInRecord::getRecordTime)
|
|
);
|
|
);
|
|
if(!list.isEmpty()){
|
|
if(!list.isEmpty()){
|