feat:课表列表教师列表增加兼职全职

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleTeacherSalaryServiceImpl.java

@@ -1421,8 +1421,11 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
         List<TeacherAttendance> teacherAttendances = teacherAttendanceDao.findByCourseSchedules(Arrays.asList(courseScheduleId));
         Map<Integer, TeacherAttendance> idTeacherAttendanceMap = teacherAttendances.stream().collect(Collectors.toMap(TeacherAttendance::getTeacherId, t -> t, (t1, t2) -> t1));
         List<SimpleUserDto> usersSimpleInfo = new ArrayList<>();
+        Map<Integer, Teacher> idTeacherMap = new HashMap<>();
         if(!CollectionUtils.isEmpty(teacherIds)){
             usersSimpleInfo = teacherDao.getUsersSimpleInfo(new ArrayList<>(teacherIds));
+            List<Teacher> teachers = teacherDao.findByTeacherIds(new ArrayList<>(teacherIds));
+            idTeacherMap = teachers.stream().collect(Collectors.toMap(Teacher::getId, t->t, (t1, t2)->t1));
         }
         Map<Integer, SimpleUserDto> idUserMap = usersSimpleInfo.stream().collect(Collectors.toMap(SimpleUserDto::getUserId, s -> s));
 
@@ -1444,10 +1447,15 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
                 t.setSignOutStatus(Objects.nonNull(teacherAttendance.getSignOutStatus())?(YesOrNoEnum.NO.equals(teacherAttendance.getSignOutStatus())?SignOutStatusEnum.UNUSUAL:SignOutStatusEnum.NORMAL):SignOutStatusEnum.NO);
                 t.setSignInLongitudeLatitude(teacherAttendance.getSignInLongitudeLatitude());
                 t.setSignOutLongitudeLatitude(teacherAttendance.getSignOutLongitudeLatitude());
+                t.setComplaintsStatus(teacherAttendance.getComplaintsStatus());
             }
             if(Objects.nonNull(school)){
                 t.setSchoolLongitudeLatitude(school.getLongitudeLatitude());
             }
+            if(idTeacherMap.containsKey(courseScheduleTeacherSalary.getUserId())){
+                Teacher teacher = idTeacherMap.get(courseScheduleTeacherSalary.getUserId());
+                t.setJobNature(teacher.getJobNature());
+            }
             result.add(t);
         }
         return result;