|
@@ -428,26 +428,27 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
|
|
|
new String[]{courseSchedule.getActualTeacherId().toString()},
|
|
|
null, DateUtil.dateToString(courseSchedule.getStartClassTime(), "yyyy年MM月dd日 HH点mm分"),
|
|
|
courseSchedule.getType().getMsg(), sysUser.getUsername(), remark);
|
|
|
-
|
|
|
- // 发送消息到学校端
|
|
|
- MusicGroup musicGroup = musicGroupDao.get(courseSchedule.getMusicGroupId());
|
|
|
-
|
|
|
- IPage<SchoolStaffWrapper.SchoolStaff> page = schoolStaffService.selectPage(new Page<>(1, -1),
|
|
|
- SchoolStaffWrapper.SchoolStaffQuery.builder().schoolId(musicGroup.getCooperationOrganId().longValue()).build());
|
|
|
- List<SchoolStaffWrapper.SchoolStaff> records = page.getRecords();
|
|
|
- if (org.apache.commons.collections.CollectionUtils.isNotEmpty(records)) {
|
|
|
-
|
|
|
- Map<Integer, String> userMap = new HashMap<>();
|
|
|
- records.forEach(o -> userMap.put(o.getUserId().intValue(), o.getUserId().toString()));
|
|
|
-
|
|
|
- String classDate = DateUtil.format(courseSchedule.getClassDate(), DateUtil.DEFAULT_PATTERN);
|
|
|
- String startClassTime = DateUtil.format(courseSchedule.getStartClassTime(), DateUtil.EXPANDED_TIME_FORMAT);
|
|
|
- String endClassTime = DateUtil.format(courseSchedule.getEndClassTime(), DateUtil.EXPANDED_TIME_FORMAT);
|
|
|
- String leaveTime = classDate + " " + startClassTime + "-" + endClassTime;
|
|
|
-
|
|
|
- sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.JIGUANG_STUDENT_LEAVE,
|
|
|
- userMap, null, 0, null,
|
|
|
- "SCHOOL",musicGroup.getName(),sysUser.getUsername(),leaveTime,courseSchedule.getName());
|
|
|
+ if(courseSchedule.getGroupType() == GroupType.MUSIC){
|
|
|
+ // 发送消息到学校端
|
|
|
+ MusicGroup musicGroup = musicGroupDao.get(courseSchedule.getMusicGroupId());
|
|
|
+
|
|
|
+ IPage<SchoolStaffWrapper.SchoolStaff> page = schoolStaffService.selectPage(new Page<>(1, -1),
|
|
|
+ SchoolStaffWrapper.SchoolStaffQuery.builder().schoolId(musicGroup.getCooperationOrganId().longValue()).build());
|
|
|
+ List<SchoolStaffWrapper.SchoolStaff> records = page.getRecords();
|
|
|
+ if (org.apache.commons.collections.CollectionUtils.isNotEmpty(records)) {
|
|
|
+
|
|
|
+ Map<Integer, String> userMap = new HashMap<>();
|
|
|
+ records.forEach(o -> userMap.put(o.getUserId().intValue(), o.getUserId().toString()));
|
|
|
+
|
|
|
+ String classDate = DateUtil.format(courseSchedule.getClassDate(), DateUtil.DEFAULT_PATTERN);
|
|
|
+ String startClassTime = DateUtil.format(courseSchedule.getStartClassTime(), DateUtil.EXPANDED_TIME_FORMAT);
|
|
|
+ String endClassTime = DateUtil.format(courseSchedule.getEndClassTime(), DateUtil.EXPANDED_TIME_FORMAT);
|
|
|
+ String leaveTime = classDate + " " + startClassTime + "-" + endClassTime;
|
|
|
+
|
|
|
+ sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.JIGUANG_STUDENT_LEAVE,
|
|
|
+ userMap, null, 0, null,
|
|
|
+ "SCHOOL",musicGroup.getName(),sysUser.getUsername(),leaveTime,courseSchedule.getName());
|
|
|
+ }
|
|
|
}
|
|
|
return true;
|
|
|
}
|