dzx пре 5 месеци
родитељ
комит
4d3a8cd88d

+ 3 - 2
src/main/java/com/xjrsoft/module/attendance/controller/TeacherStatisticsController.java

@@ -192,10 +192,11 @@ public class TeacherStatisticsController {
                             new MPJLambdaWrapper<CarOutInRecord>()
                                     .select(CarOutInRecord.class, x -> VoToColumnUtil.fieldsToColumns(CarOutInRecord.class).contains(x.getProperty()))
                                     .leftJoin(CarMessageApply.class, CarMessageApply::getId, CarOutInRecord::getCarMessageApplyId)
-                                    .le(TeacherOutInRecord::getRecordTime, endTime)
+                                    .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, TeacherOutInRecord::getRecordTime, amEndTime)
+                                    .ge(dto.getTimePeriod() == 2 && amEndTime != null, CarOutInRecord::getRecordTime, amEndTime)
+                                    .eq(CarOutInRecord::getReleaseResult, 1)
                                     .orderByAsc(CarOutInRecord::getRecordTime)
                     );
                     if(!list.isEmpty()){