考勤统计

src/main/java/com/xjrsoft/module/attendance/controller/StatisticsController.java

@@ -74,12 +74,15 @@ public class StatisticsController {
             DateTimeFormatter formatter = DateTimeFormatter.ISO_DATE;
             LocalDate queryDate = LocalDate.parse(dto.getDate(), formatter);
             LocalDateTime startTime, endTime;
-            if(dto.getTimePeriod() == 1){
+            if(dto.getTimePeriod() != null && dto.getTimePeriod() == 1){
                 startTime = queryDate.atTime(9, 0, 0);
                 endTime = queryDate.atTime(12, 0, 0);
-            }else if(dto.getTimePeriod() == 2){
+            }else if(dto.getTimePeriod() != null && dto.getTimePeriod() == 2){
                 startTime = queryDate.atTime(12, 0, 0);
                 endTime = queryDate.atTime(18, 0, 0);
+            }else if(dto.getTimePeriod() != null && dto.getTimePeriod() == 3){
+                startTime = queryDate.atTime(18, 0, 0);
+                endTime = queryDate.atTime(23, 59, 59);
             }else{
                 startTime = queryDate.atTime(0, 0, 0);
                 endTime = queryDate.atTime(23, 59, 59);

src/main/java/com/xjrsoft/module/attendance/controller/StudentStatisticsController.java

@@ -178,6 +178,9 @@ public class StudentStatisticsController {
             }else if(dto.getTimePeriod() != null && dto.getTimePeriod() == 2){
                 startTime = queryDate.atTime(12, 0, 0);
                 endTime = queryDate.atTime(18, 0, 0);
+            }else if(dto.getTimePeriod() != null && dto.getTimePeriod() == 3){
+                startTime = queryDate.atTime(18, 0, 0);
+                endTime = queryDate.atTime(23, 59, 59);
             }else{
                 startTime = queryDate.atTime(0, 0, 0);
                 endTime = queryDate.atTime(23, 59, 59);
@@ -297,6 +300,9 @@ public class StudentStatisticsController {
             }else if(dto.getTimePeriod() != null && dto.getTimePeriod() == 2){
                 startTime = queryDate.atTime(12, 0, 0);
                 endTime = queryDate.atTime(18, 0, 0);
+            }else if(dto.getTimePeriod() != null && dto.getTimePeriod() == 3){
+                startTime = queryDate.atTime(18, 0, 0);
+                endTime = queryDate.atTime(23, 59, 59);
             }else{
                 startTime = queryDate.atTime(0, 0, 0);
                 endTime = queryDate.atTime(23, 59, 59);

src/main/java/com/xjrsoft/module/attendance/controller/TeacherStatisticsController.java

@@ -66,7 +66,7 @@ public class TeacherStatisticsController {
                 .selectAs(User::getMobile, TeacherStatisticsPageVo::getMobile)
                 .selectAs(Department::getName, TeacherStatisticsPageVo::getDeptName)
                 .innerJoin(BaseTeacher.class, BaseTeacher::getUserId, User::getId)
-                .leftJoin(UserDeptRelation.class, UserDeptRelation::getUserId, User::getId)
+                .innerJoin(UserDeptRelation.class, UserDeptRelation::getUserId, User::getId)
                 .leftJoin(Department.class, Department::getId, UserDeptRelation::getDeptId);
         IPage<TeacherStatisticsPageVo> voIPage = xjrUserService.selectJoinListPage(ConventPage.getPage(dto), TeacherStatisticsPageVo.class, queryUser);