|
@@ -437,6 +437,10 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
|
|
|
return true;
|
|
|
}
|
|
|
List<Long> courseScheduleIds = list.stream().map(m -> m.getCourseScheduleId().longValue()).collect(Collectors.toList());
|
|
|
+
|
|
|
+ List<CourseSchedule> courseSchedules = courseScheduleDao.findByCourseScheduleIds(courseScheduleIds);
|
|
|
+ Map<Long, CourseSchedule> idCourseMap = courseSchedules.stream().collect(Collectors.toMap(CourseSchedule::getId, c -> c, (c1, c2) -> c1));
|
|
|
+
|
|
|
List<CourseScheduleTeacherSalary> courseScheduleTeacherSalarys = courseScheduleTeacherSalaryDao.findByCourseSchedules(courseScheduleIds);
|
|
|
Map<Long, List<CourseScheduleTeacherSalary>> courseTeacherSalaryMap = new HashMap<>();
|
|
|
if(!CollectionUtils.isEmpty(courseScheduleTeacherSalarys)){
|
|
@@ -450,6 +454,8 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
|
|
|
|
|
|
String key = "SignOut_" + userId + "_" + mapper.getCourseScheduleId();
|
|
|
|
|
|
+ CourseSchedule courseSchedule = idCourseMap.get(mapper.getCourseScheduleId().longValue());
|
|
|
+
|
|
|
List<CourseScheduleTeacherSalary> courseScheduleTeacherSalaries = courseTeacherSalaryMap.get(mapper.getCourseScheduleId().longValue());
|
|
|
TeachTypeEnum teachType = TeachTypeEnum.BISHOP;
|
|
|
if(!CollectionUtils.isEmpty(courseScheduleTeacherSalaries)){
|
|
@@ -462,7 +468,8 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
|
|
|
|
|
|
if (!redisCache.exists(key)) {
|
|
|
sysMessageService.batchSendMessage(MessageSender.JIGUANG, MessageTypeEnum.TEACHER_PUSH_SIGN_OUT_MESSAGE, receivers, null, 0,
|
|
|
- "5?courseScheduleId=" + mapper.getCourseScheduleId() + "&teacherRole=" + teachType.getCode(), "TEACHER", mapper.getValue());
|
|
|
+ "5?courseScheduleId=" + mapper.getCourseScheduleId() + "&teacherRole=" + teachType.getCode(), "TEACHER",
|
|
|
+ mapper.getValue() + (Objects.isNull(courseSchedule)?"":("(" + courseSchedule.getStartClassTime() + ")")));
|
|
|
redisCache.put(key, 1, (int) DateUtil.getTomorrowZeroSeconds());
|
|
|
}
|
|
|
}
|