feat:衔接老师

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherAttendanceController.java

@@ -96,17 +96,7 @@ public class TeacherAttendanceController extends BaseController {
         }
 
         List<StudentAttendance> normal = studentAttendances.stream().filter(studentAttendance -> studentAttendance.getStatus() == StudentAttendanceStatusEnum.NORMAL).collect(Collectors.toList());
-        if (normal != null && normal.size() > 0) {
-            Map<Integer, String> receivers = new HashMap<>();
-            normal.forEach(e -> {
-                receivers.put(e.getUserId(), e.getUserId().toString());
-            });
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_NAMES_ACHIEVE,
-                    receivers, null, 0, "2", "STUDENT", DateUtil.format(new Date(), DateUtil.DATE_FORMAT_MIN));
-        }else{
-            return failed("还未有学生到课");
-        }
-        studentAttendanceDao.updateNormalRemind(courseId);
+        //教务推送
         if(Objects.nonNull(courseSchedule)&& GroupType.MUSIC.equals(courseSchedule.getGroupType())){
             MusicGroup musicGroup = musicGroupService.get(courseSchedule.getMusicGroupId());
             if(Objects.isNull(musicGroup)||Objects.isNull(musicGroup.getTransactionTeacherId())){
@@ -118,8 +108,20 @@ public class TeacherAttendanceController extends BaseController {
             Map<Integer, String> receivers = new HashMap<>();
             receivers.put(musicGroup.getTransactionTeacherId(), musicGroup.getTransactionTeacherId().toString());
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.SYSTEM_PUSH_NAMES_ACHIEVE,
-                    receivers, null, 0, null, "SYSTEM", normalStudentNum, leaveStudentNum, truantStudentNum);
+                    receivers, null, 0, null, "SYSTEM", courseSchedule.getName(), normalStudentNum, leaveStudentNum, truantStudentNum);
         }
+
+        if (normal != null && normal.size() > 0) {
+            Map<Integer, String> receivers = new HashMap<>();
+            normal.forEach(e -> {
+                receivers.put(e.getUserId(), e.getUserId().toString());
+            });
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_NAMES_ACHIEVE,
+                    receivers, null, 0, "2", "STUDENT", DateUtil.format(new Date(), DateUtil.DATE_FORMAT_MIN));
+        }else{
+            return failed("还未有学生到课");
+        }
+        studentAttendanceDao.updateNormalRemind(courseId);
         return succeed();
     }