|
@@ -186,6 +186,14 @@ public class StudentStatisticsController {
|
|
if(dto.getDate() != null && !"".equals(dto.getDate())){
|
|
if(dto.getDate() != null && !"".equals(dto.getDate())){
|
|
DateTimeFormatter formatter = DateTimeFormatter.ISO_DATE;
|
|
DateTimeFormatter formatter = DateTimeFormatter.ISO_DATE;
|
|
LocalDate queryDate = LocalDate.parse(dto.getDate(), formatter);
|
|
LocalDate queryDate = LocalDate.parse(dto.getDate(), formatter);
|
|
|
|
+ HolidayDate holidayDate = holidayDateService.getOne(
|
|
|
|
+ new QueryWrapper<HolidayDate>().lambda()
|
|
|
|
+ .eq(HolidayDate::getDate, queryDate)
|
|
|
|
+ );
|
|
|
|
+ if(holidayDate != null && holidayDate.getWay() != null && holidayDate.getWay() != 0){
|
|
|
|
+ return RT.ok(new PageOutput<>());
|
|
|
|
+ }
|
|
|
|
+
|
|
LocalDateTime startTime, endTime;
|
|
LocalDateTime startTime, endTime;
|
|
|
|
|
|
if(dto.getTimePeriod() != null && dto.getTimePeriod() == 1){
|
|
if(dto.getTimePeriod() != null && dto.getTimePeriod() == 1){
|