|
@@ -15,6 +15,7 @@ import com.ym.mec.common.exception.BizException;
|
|
|
import com.ym.mec.common.page.PageInfo;
|
|
|
import com.ym.mec.common.redis.service.RedisCache;
|
|
|
import com.ym.mec.common.service.impl.BaseServiceImpl;
|
|
|
+import com.ym.mec.thirdparty.message.MessageSenderPluginContext;
|
|
|
import com.ym.mec.thirdparty.message.MessageSenderPluginContext.MessageSender;
|
|
|
import com.ym.mec.util.collection.MapUtil;
|
|
|
import com.ym.mec.util.date.DateUtil;
|
|
@@ -298,12 +299,30 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
|
|
|
// }
|
|
|
// }
|
|
|
courseHomework.setExpectNum(studentCourseHomeworks.size());
|
|
|
+
|
|
|
+ Teacher teacher = teacherDao.get(courseSchedule.getActualTeacherId());
|
|
|
+ String dateStr = DateUtil.dateToString(DateUtil.addDays(date, 3), "MM月dd日");
|
|
|
+
|
|
|
if(!CollectionUtils.isEmpty(studentCourseHomeworks)){
|
|
|
courseHomeworkService.update(courseHomework);
|
|
|
|
|
|
studentCourseHomeworkDao.batchInsertStudentCourseHomeworkRecord(studentCourseHomeworks);
|
|
|
List<Integer> studentIds = studentCourseHomeworks.stream().map(StudentCourseHomework::getUserId).collect(Collectors.toList());
|
|
|
studentServeService.updateExercisesSituation(courseSchedule.getClassDate(), studentIds, teacherAttendance.getTeacherId());
|
|
|
+
|
|
|
+ for (StudentCourseHomework studentCourseHomework : studentCourseHomeworks) {
|
|
|
+ Map<Integer, String> userMap = new HashMap<>();
|
|
|
+ userMap.put(studentCourseHomework.getUserId(), studentCourseHomework.getUserId().toString());
|
|
|
+ String notifyUrl = "?courseScheduleID=" + courseSchedule.getId() + "&studentCourseHomeworkId=" + studentCourseHomework.getId() + "&extra=0";
|
|
|
+ String extra = "dayaedu" + notifyUrl + "&userId=" + studentCourseHomework.getUserId();
|
|
|
+
|
|
|
+ sysMessageService.batchSendImMessage(MessageTypeEnum.IM_HOMEWORK_REMIND, courseSchedule.getActualTeacherId().toString(), extra,
|
|
|
+ new String[]{studentCourseHomework.getUserId().toString()},
|
|
|
+ null, courseSchedule.getName(), dateStr, courseHomework.getContent());
|
|
|
+
|
|
|
+ sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.HOMEWORK_REMIND,
|
|
|
+ userMap, null, 0, 3 + notifyUrl, "STUDENT", teacher.getRealName(), courseSchedule.getName(), dateStr);
|
|
|
+ }
|
|
|
}
|
|
|
}else{
|
|
|
courseHomework.setContent(teacherSignOutDto.getCourseHomeworkInfo().getContent());
|