修改统计

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

@@ -296,7 +296,7 @@ public class StudentStatisticsController {
         queryUser.disableSubLogicDel()
                 .eq(StudentAttendanceStatistics::getTimeInterval, dto.getTimePeriod())
                 .eq(StudentAttendanceStatistics::getAttendanceDate, dto.getDate())
-                .eq(StrUtil.isNotEmpty(dto.getAttendanceStatus()), StudentAttendanceStatistics::getAttendanceStatus, dto.getAttendanceStatus())
+
 
                 .like(StrUtil.isNotEmpty(dto.getName()), User::getName, dto.getName())
                 .like(StrUtil.isNotEmpty(dto.getCredentialNumber()), User::getCredentialNumber, dto.getCredentialNumber())
@@ -325,6 +325,15 @@ public class StudentStatisticsController {
                 .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, BaseStudentSchoolRoll::getStduyStatus)
                 .leftJoin("xjr_user ut on ut.id = t3.teacher_id");
 
+        if (StrUtil.isNotEmpty(dto.getAttendanceStatus())) {
+            if (dto.getAttendanceStatus().equals("请假")) {
+                queryUser.in(StudentAttendanceStatistics::getAttendanceStatus, Arrays.asList("病假", "事假"));
+
+            } else {
+                queryUser.eq(StudentAttendanceStatistics::getAttendanceStatus, dto.getAttendanceStatus());
+            }
+        }
+
         IPage<StudentStatisticsPageVo> voIPage = studentStatisticsService.selectJoinListPage(ConventPage.getPage(dto), StudentStatisticsPageVo.class, queryUser);
         PageOutput<StudentStatisticsPageVo> pageOutput = ConventPage.getPageOutput(voIPage, StudentStatisticsPageVo.class);
         return RT.ok(pageOutput);