dzx vor 1 Jahr
Ursprung
Commit
a3d578a98d

+ 4 - 0
src/main/java/com/xjrsoft/module/attendance/controller/StatisticsController.java

@@ -103,9 +103,13 @@ public class StatisticsController {
             List<TeacherOutInRecord> outInRecords = teacherOutInRecordService.list(
                     new MPJLambdaWrapper<TeacherOutInRecord>()
                             .le(TeacherOutInRecord::getRecordTime, endTime)
+                            .select(TeacherOutInRecord::getId)
+                            .select(TeacherOutInRecord.class, x -> VoToColumnUtil.fieldsToColumns(TeacherOutInRecord.class).contains(x.getProperty()))
                             .eq(TeacherOutInRecord::getStatus, 1)
+                            .eq(dto.getDeptId() != null, UserDeptRelation::getDeptId, dto.getDeptId())
                             .eq("DATE_FORMAT(record_time, '%Y-%m-%d')", endTime.toLocalDate())
                             .ge(dto.getTimePeriod() == 2 && amEndTime != null, CarOutInRecord::getRecordTime, amEndTime)
+                            .leftJoin(UserDeptRelation.class, UserDeptRelation::getUserId, TeacherOutInRecord::getUserId)
                             .orderByAsc(TeacherOutInRecord::getRecordTime)
             );