教师考勤调整

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

@@ -82,7 +82,7 @@ public class TeacherStatisticsController {
         DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
         String today = LocalDate.now().format(dtf);
         Page<TeacherStatisticsPageVo> voIPage2 = attendanceRecordService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
-        if(!today.equals(dto.getDate()) && voIPage2.getRecords().isEmpty()){
+        if(!today.equals(dto.getDate()) && !voIPage2.getRecords().isEmpty()){
             PageOutput<TeacherStatisticsPageVo> pageOutput = ConventPage.getPageOutput(voIPage2, TeacherStatisticsPageVo.class);
             return RT.ok(pageOutput);
         }else{
@@ -190,6 +190,8 @@ public class TeacherStatisticsController {
                     outInDto.setEndTime(endTime);
                     outInDto.setStatus(OutInStatusEnum.enter.getCode());
                     outInDto.setUserId(record.getUserId());
+                    outInDto.setTimePeriod(dto.getTimePeriod());
+                    outInDto.setAmEndTime(amEndTime);
                     List<TeacherOutInRecord> outInRecords = teacherOutInRecordService.getListByParam(outInDto);
                     //查询该教师是否通过车辆进入
                     List<CarOutInRecord> list = carOutInRecordService.list(

src/test/java/com/xjrsoft/module/job/AttendanceRecordTaskTest.java

@@ -97,7 +97,7 @@ class AttendanceRecordTaskTest {
                         .select(User::getId)
                         .select(User.class, x -> VoToColumnUtil.fieldsToColumns(User.class).contains(x.getProperty()))
                         .innerJoin(BaseTeacher.class, BaseTeacher::getUserId, User::getId)
-                        .in(User::getName, nameList)
+                        //.in(User::getName, nameList)
         );
         List<Long> userIds = teacherList.stream().map(User::getId).collect(Collectors.toList());
         Map<Long, AttendanceRuleDetailsUserVo> teacherTodyRuleByUserId = ruleCategoryService.getTeacherTodyRuleByUserId(userIds);

src/test/java/com/xjrsoft/module/job/JianyuekbScheduleTaskTest2.java

@@ -353,7 +353,7 @@ class JianyuekbScheduleTaskTest2 {
             }
             Integer substituteTeacherCourseCount = courseTableService.getSubstituteTeacherCourseCountByParams(new ClassTeacherDto() {{
                 setWfCourseAdjustId(courseAdjust.getId());
-                setTeacherId(courseAdjust.getExchangeTeacherId());
+                setTeacherId(Long.parseLong(courseAdjust.getExchangeTeacherId()));
             }});
             if(courseAdjust.getId() == 1865923439122493440L){
                 System.out.println(courseAdjust.getId());