|
@@ -173,11 +173,11 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
|
|
|
Integer studentId = null;
|
|
|
Integer educationalTeacherId = null;
|
|
|
|
|
|
- if(courseSchedule.getType().equals(CourseSchedule.CourseScheduleType.PRACTICE)){
|
|
|
+ if (courseSchedule.getType().equals(CourseSchedule.CourseScheduleType.PRACTICE)) {
|
|
|
PracticeGroup practiceGroup = practiceGroupDao.get(Long.parseLong(courseSchedule.getMusicGroupId()));
|
|
|
studentId = practiceGroup.getStudentId();
|
|
|
educationalTeacherId = practiceGroup.getEducationalTeacherId();
|
|
|
- }else if(courseSchedule.getType().equals(CourseSchedule.CourseScheduleType.VIP)){
|
|
|
+ } else if (courseSchedule.getType().equals(CourseSchedule.CourseScheduleType.VIP)) {
|
|
|
VipGroup vipGroup = vipGroupDao.get(Long.parseLong(courseSchedule.getMusicGroupId()));
|
|
|
educationalTeacherId = vipGroup.getEducationalTeacherId();
|
|
|
}
|
|
@@ -202,12 +202,12 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
|
|
|
CourseHomework courseHomework = new CourseHomework();
|
|
|
List<CourseScheduleStudentPayment> courseScheduleStudentPayments = courseScheduleStudentPaymentDao.findByCourseSchedule(courseSchedule.getId());
|
|
|
|
|
|
- if(Objects.nonNull(existHomework)){
|
|
|
+ if (Objects.nonNull(existHomework)) {
|
|
|
courseHomework.setId(existHomework.getId());
|
|
|
courseHomework.setContent(courseScheduleReview.getHomeWork());
|
|
|
courseHomework.setExpiryDate(DateUtil.addDays(date, 7));
|
|
|
courseHomeworkService.update(courseHomework);
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
courseHomework.setContent(courseScheduleReview.getHomeWork());
|
|
|
courseHomework.setCourseScheduleId(courseSchedule.getId());
|
|
|
courseHomework.setMusicGroupId(courseSchedule.getMusicGroupId());
|
|
@@ -224,7 +224,7 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
|
|
|
String dateStr = DateUtil.dateToString(DateUtil.addDays(date, 3), "MM月dd日");
|
|
|
for (CourseScheduleStudentPayment courseScheduleStudentPayment : courseScheduleStudentPayments) {
|
|
|
StudentCourseHomework studentCourseHomework = new StudentCourseHomework();
|
|
|
- if(Objects.isNull(existHomework)){
|
|
|
+ if (Objects.isNull(existHomework)) {
|
|
|
studentCourseHomework.setCourseHomeworkId(courseHomework.getId());
|
|
|
studentCourseHomework.setUserId(courseScheduleStudentPayment.getUserId());
|
|
|
studentCourseHomework.setCourseScheduleId(courseSchedule.getId());
|
|
@@ -235,7 +235,7 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
|
|
|
studentCourseHomework.setIsReplied(YesOrNoEnum.NO);
|
|
|
studentCourseHomework.setIsRepliedTimely(0);
|
|
|
studentCourseHomeworkDao.insert(studentCourseHomework);
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
studentCourseHomework = studentCourseHomeworkDao.findByStudentAndCourseHomewok(existHomework.getId(), courseScheduleStudentPayment.getUserId());
|
|
|
}
|
|
|
|
|
@@ -243,17 +243,17 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
|
|
|
userMap.put(courseScheduleStudentPayment.getUserId(), courseScheduleStudentPayment.getUserId().toString());
|
|
|
String notifyUrl = "?courseScheduleID=" + courseSchedule.getId() + "&studentCourseHomeworkId=" + studentCourseHomework.getId() + "&extra=0";
|
|
|
String extra = "dayaedu" + notifyUrl + "&userId=" + courseScheduleStudentPayment.getUserId();
|
|
|
- if (courseScheduleReview.getMsgType() != ImSendTypeEnum.TXT){
|
|
|
- sysMessageService.batchSendImMessage(MessageTypeEnum.IM_HOMEWORK_REMIND_DETAIL,courseScheduleReview.getTeacherId().toString(),extra,
|
|
|
+ if (courseScheduleReview.getMsgType() != ImSendTypeEnum.TXT) {
|
|
|
+ sysMessageService.batchSendImMessage(MessageTypeEnum.IM_HOMEWORK_REMIND_DETAIL, courseScheduleReview.getTeacherId().toString(), extra,
|
|
|
new String[]{courseScheduleStudentPayment.getUserId().toString()},
|
|
|
- null,courseSchedule.getName(), dateStr,courseHomework.getContent());
|
|
|
- }else {
|
|
|
- sysMessageService.batchSendImMessage(MessageTypeEnum.IM_HOMEWORK_REMIND,courseScheduleReview.getTeacherId().toString(),extra,
|
|
|
+ null, courseSchedule.getName(), dateStr, courseHomework.getContent());
|
|
|
+ } else {
|
|
|
+ sysMessageService.batchSendImMessage(MessageTypeEnum.IM_HOMEWORK_REMIND, courseScheduleReview.getTeacherId().toString(), extra,
|
|
|
new String[]{courseScheduleStudentPayment.getUserId().toString()},
|
|
|
- null,courseSchedule.getName(), dateStr,courseHomework.getContent());
|
|
|
+ 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);
|
|
|
+ userMap, null, 0, 3 + notifyUrl, "STUDENT", teacher.getRealName(), courseSchedule.getName(), dateStr);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -528,4 +528,79 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
|
|
|
pageInfo.setRows(dataList);
|
|
|
return pageInfo;
|
|
|
}
|
|
|
+
|
|
|
+ @Override
|
|
|
+ @Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
|
|
|
+ public CourseHomework addHomeWork(Integer courseScheduleId, String content, Date expiryDate) {
|
|
|
+ if (StringUtils.isBlank(content)) {
|
|
|
+ throw new BizException("作业内容不能为空");
|
|
|
+ }
|
|
|
+ if (courseScheduleId == null || courseScheduleId <= 0) {
|
|
|
+ throw new BizException("课程id必须大于0");
|
|
|
+ }
|
|
|
+ Date date = new Date();
|
|
|
+ CourseSchedule courseSchedule = courseScheduleDao.get(courseScheduleId.longValue());
|
|
|
+ if (courseSchedule == null) {
|
|
|
+ throw new BizException("课程不存在");
|
|
|
+ }
|
|
|
+ studentDao.lockUser(courseSchedule.getActualTeacherId());
|
|
|
+
|
|
|
+ CourseHomework existHomework = courseHomeworkDao.findByCourseSchedule(courseScheduleId.longValue());
|
|
|
+
|
|
|
+ //新增课堂作业
|
|
|
+ CourseHomework courseHomework = new CourseHomework();
|
|
|
+ List<CourseScheduleStudentPayment> courseScheduleStudentPayments = courseScheduleStudentPaymentDao.findByCourseSchedule(courseSchedule.getId());
|
|
|
+
|
|
|
+ if (Objects.nonNull(existHomework)) {
|
|
|
+ courseHomework.setId(existHomework.getId());
|
|
|
+ courseHomework.setContent(content);
|
|
|
+ courseHomework.setExpiryDate(expiryDate);
|
|
|
+ courseHomeworkService.update(courseHomework);
|
|
|
+ } else {
|
|
|
+ courseHomework.setContent(content);
|
|
|
+ courseHomework.setCourseScheduleId(courseSchedule.getId());
|
|
|
+ courseHomework.setMusicGroupId(courseSchedule.getMusicGroupId());
|
|
|
+ courseHomework.setGroupType(courseSchedule.getGroupType());
|
|
|
+ courseHomework.setClassGroupId(courseSchedule.getClassGroupId());
|
|
|
+ courseHomework.setExpiryDate(expiryDate);
|
|
|
+ courseHomework.setExpectNum(CollectionUtils.isEmpty(courseScheduleStudentPayments) ? 0 : courseScheduleStudentPayments.size());
|
|
|
+ courseHomeworkService.insert(courseHomework);
|
|
|
+ }
|
|
|
+
|
|
|
+ if (!CollectionUtils.isEmpty(courseScheduleStudentPayments)) {
|
|
|
+ Teacher teacher = teacherDao.get(courseSchedule.getActualTeacherId());
|
|
|
+ String dateStr = DateUtil.dateToString(DateUtil.addDays(date, 3), "MM月dd日");
|
|
|
+ for (CourseScheduleStudentPayment courseScheduleStudentPayment : courseScheduleStudentPayments) {
|
|
|
+ StudentCourseHomework studentCourseHomework = new StudentCourseHomework();
|
|
|
+ if (Objects.isNull(existHomework)) {
|
|
|
+ studentCourseHomework.setCourseHomeworkId(courseHomework.getId());
|
|
|
+ studentCourseHomework.setUserId(courseScheduleStudentPayment.getUserId());
|
|
|
+ studentCourseHomework.setCourseScheduleId(courseSchedule.getId());
|
|
|
+ studentCourseHomework.setCreateTime(date);
|
|
|
+ studentCourseHomework.setUpdateTime(date);
|
|
|
+ studentCourseHomework.setStatus(YesOrNoEnum.NO);
|
|
|
+ studentCourseHomework.setIsView(YesOrNoEnum.NO);
|
|
|
+ studentCourseHomework.setIsReplied(YesOrNoEnum.NO);
|
|
|
+ studentCourseHomework.setIsRepliedTimely(0);
|
|
|
+ studentCourseHomeworkDao.insert(studentCourseHomework);
|
|
|
+ } else {
|
|
|
+ studentCourseHomework = studentCourseHomeworkDao.findByStudentAndCourseHomewok(existHomework.getId(), courseScheduleStudentPayment.getUserId());
|
|
|
+ }
|
|
|
+
|
|
|
+ Map<Integer, String> userMap = new HashMap<>();
|
|
|
+ userMap.put(courseScheduleStudentPayment.getUserId(), courseScheduleStudentPayment.getUserId().toString());
|
|
|
+ String notifyUrl = "?courseScheduleID=" + courseSchedule.getId() + "&studentCourseHomeworkId=" + studentCourseHomework.getId() + "&extra=0";
|
|
|
+ String extra = "dayaedu" + notifyUrl + "&userId=" + courseScheduleStudentPayment.getUserId();
|
|
|
+
|
|
|
+ sysMessageService.batchSendImMessage(MessageTypeEnum.IM_HOMEWORK_REMIND, courseSchedule.getActualTeacherId().toString(), extra,
|
|
|
+ new String[]{courseScheduleStudentPayment.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);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ return courseHomework;
|
|
|
+ }
|
|
|
}
|