|
@@ -30,10 +30,10 @@ public class CourseHomeworkServiceImpl extends BaseServiceImpl<Long, CourseHomew
|
|
|
|
|
|
@Autowired
|
|
|
private CourseHomeworkDao courseHomeworkDao;
|
|
|
-
|
|
|
+
|
|
|
@Autowired
|
|
|
private StudentCourseHomeworkDao studentCourseHomeworkDao;
|
|
|
-
|
|
|
+
|
|
|
@Autowired
|
|
|
private SysMessageService sysMessageService;
|
|
|
|
|
@@ -51,22 +51,22 @@ public class CourseHomeworkServiceImpl extends BaseServiceImpl<Long, CourseHomew
|
|
|
int count = courseHomeworkDao.countByClassGroupAndTeacher(params);
|
|
|
if (count > 0) {
|
|
|
dataList = courseHomeworkDao.findByClassGroupAndTeacher(params);
|
|
|
-// List<Integer> courseScheduleIds=dataList.stream()
|
|
|
-// .map(TeacherHomeworkListDto::getCourseScheduleId)
|
|
|
-// .distinct()
|
|
|
-// .collect(Collectors.toList());
|
|
|
-// List<Map<Integer, Integer>> courseTimeByClassGroup = teacherAttendanceDao.findCourseTimeByCourseSchedules(courseScheduleIds);
|
|
|
-// Map<Integer, Integer> map = MapUtil.convertIntegerMap(courseTimeByClassGroup);
|
|
|
-// dataList.forEach(teacherHomeworkListDto -> {
|
|
|
-// teacherHomeworkListDto.setCurrentClassTimes(map.get(teacherHomeworkListDto.getCourseScheduleId().longValue()));
|
|
|
-// });
|
|
|
-// List<Integer> courseScheduleIds = dataList.stream().map(TeacherHomeworkListDto::getCourseScheduleId).collect(Collectors.toList());
|
|
|
-// if (!CollectionUtils.isEmpty(courseScheduleIds)) {
|
|
|
-// Map<Integer, Integer> courseScheduleCurrentTimes = courseScheduleService.findCourseScheduleCurrentTimes(courseScheduleIds);
|
|
|
-// dataList.forEach(teacherHomeworkListDto -> {
|
|
|
-// teacherHomeworkListDto.setCurrentClassTimes(courseScheduleCurrentTimes.get(teacherHomeworkListDto.getCourseScheduleId()));
|
|
|
-// });
|
|
|
-// }
|
|
|
+ // List<Integer> courseScheduleIds=dataList.stream()
|
|
|
+ // .map(TeacherHomeworkListDto::getCourseScheduleId)
|
|
|
+ // .distinct()
|
|
|
+ // .collect(Collectors.toList());
|
|
|
+ // List<Map<Integer, Integer>> courseTimeByClassGroup = teacherAttendanceDao.findCourseTimeByCourseSchedules(courseScheduleIds);
|
|
|
+ // Map<Integer, Integer> map = MapUtil.convertIntegerMap(courseTimeByClassGroup);
|
|
|
+ // dataList.forEach(teacherHomeworkListDto -> {
|
|
|
+ // teacherHomeworkListDto.setCurrentClassTimes(map.get(teacherHomeworkListDto.getCourseScheduleId().longValue()));
|
|
|
+ // });
|
|
|
+ // List<Integer> courseScheduleIds = dataList.stream().map(TeacherHomeworkListDto::getCourseScheduleId).collect(Collectors.toList());
|
|
|
+ // if (!CollectionUtils.isEmpty(courseScheduleIds)) {
|
|
|
+ // Map<Integer, Integer> courseScheduleCurrentTimes = courseScheduleService.findCourseScheduleCurrentTimes(courseScheduleIds);
|
|
|
+ // dataList.forEach(teacherHomeworkListDto -> {
|
|
|
+ // teacherHomeworkListDto.setCurrentClassTimes(courseScheduleCurrentTimes.get(teacherHomeworkListDto.getCourseScheduleId()));
|
|
|
+ // });
|
|
|
+ // }
|
|
|
}
|
|
|
if (count != 0) {
|
|
|
Map<String, List<TeacherHomeworkListDto>> collect = dataList.stream().collect(Collectors.groupingBy(TeacherHomeworkListDto::getDay));
|
|
@@ -89,19 +89,30 @@ public class CourseHomeworkServiceImpl extends BaseServiceImpl<Long, CourseHomew
|
|
|
Integer userId = (Integer) mapper.getKey();
|
|
|
receivers.put(userId, userId + "");
|
|
|
|
|
|
- sysMessageService.batchSendMessage(MessageSender.JIGUANG, MessageTypeEnum.TEACHER_PUSH_JOB_WAIT_REPLY, receivers, null, 0, "6?", "TEACHER", mapper.getValue());
|
|
|
+ sysMessageService.batchSendMessage(MessageSender.JIGUANG, MessageTypeEnum.TEACHER_PUSH_JOB_WAIT_REPLY, receivers, null, 0, "6?", "TEACHER",
|
|
|
+ mapper.getValue());
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
|
|
|
+ @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
|
|
|
public boolean delHomwworkByCourseScheduleId(Long courseScheduleId) {
|
|
|
- //删除作业
|
|
|
+ // 删除作业
|
|
|
courseHomeworkDao.delByCourseScheduleId(courseScheduleId);
|
|
|
- //删除学生作业
|
|
|
+ // 删除学生作业
|
|
|
studentCourseHomeworkDao.delByCourseScheduleId(courseScheduleId);
|
|
|
- //删除学生回复的作业
|
|
|
-
|
|
|
+ // 删除学生回复的作业
|
|
|
+
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
|
|
|
+ public boolean delHomwworkByCourseScheduleId(List<Long> courseScheduleIdList) {
|
|
|
+ // 删除作业
|
|
|
+ courseHomeworkDao.batchDelByCourseScheduleId(courseScheduleIdList);
|
|
|
+ // 删除学生作业
|
|
|
+ studentCourseHomeworkDao.batchDelByCourseScheduleId(courseScheduleIdList);
|
|
|
return true;
|
|
|
}
|
|
|
}
|