|
|
@ -314,7 +314,7 @@ public class DutyServiceImpl implements DutyService {
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public List<DutyRecordVo> findRecords(FindDutyRecordDto findDutyRecordDto) {
|
|
|
|
public List<DutyRecordVo> findRecords(FindDutyRecordDto findDutyRecordDto) {
|
|
|
|
String classId = StringUtils.isEmpty(findDutyRecordDto.getClassId()) ? null : findDutyRecordDto.getClassId();
|
|
|
|
String classId = StringUtils.isEmpty(findDutyRecordDto.getClassId()) ? null : findDutyRecordDto.getClassId();
|
|
|
|
String academicYearId = findDutyRecordDto.getAcademicYearId();
|
|
|
|
String periodId = findDutyRecordDto.getPeriodId();
|
|
|
|
Boolean positive = findDutyRecordDto.getPositive();
|
|
|
|
Boolean positive = findDutyRecordDto.getPositive();
|
|
|
|
Long startTime = findDutyRecordDto.getStartTime();
|
|
|
|
Long startTime = findDutyRecordDto.getStartTime();
|
|
|
|
Long endTime = findDutyRecordDto.getEndTime();
|
|
|
|
Long endTime = findDutyRecordDto.getEndTime();
|
|
|
@ -322,6 +322,9 @@ public class DutyServiceImpl implements DutyService {
|
|
|
|
String schoolId = user.getSchoolId();
|
|
|
|
String schoolId = user.getSchoolId();
|
|
|
|
String userId = user.getId();
|
|
|
|
String userId = user.getId();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
List<School.Semester> semesters = schoolRepository.findSemestersById(schoolId, periodId);
|
|
|
|
|
|
|
|
String academicYearId = SchoolDateUtil.calculateAcademicYearId(semesters, LocalDate.now());
|
|
|
|
|
|
|
|
|
|
|
|
if (startTime == null || endTime == null) {
|
|
|
|
if (startTime == null || endTime == null) {
|
|
|
|
LocalDateTime mondayOfCurWeek = LocalDateTime.now().with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY))
|
|
|
|
LocalDateTime mondayOfCurWeek = LocalDateTime.now().with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY))
|
|
|
|
.withHour(0)
|
|
|
|
.withHour(0)
|
|
|
|