1、添加教务老师字段

2、布置作业

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentCourseHomeworkReplyServiceImpl.java

@@ -56,7 +56,7 @@ public class StudentCourseHomeworkReplyServiceImpl extends BaseServiceImpl<Long,
 		Map<Integer, String> userMap = new HashMap<>();
 		userMap.put(courseSchedule.getActualTeacherId(), courseSchedule.getActualTeacherId().toString());
 		SysUser user = teacherDao.getUser(studentCourseHomework.getUserId());
-		String notifyUrl = "3?courseScheduleID=" + courseSchedule.getId() + "&studentCourseHomeworkId=" + studentCourseHomework.getId();
+		String notifyUrl = "3?courseScheduleID=" + courseSchedule.getId() + "&userId=" + studentCourseHomework.getUserId() + "&studentCourseHomeworkId=" + studentCourseHomework.getId();
 		sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.HOMEWORK_STUDENT_REPLY_PUSH,
 				userMap, null, 0, notifyUrl, "TEACHER", courseSchedule.getName(), DateUtil.dateToString(courseSchedule.getClassDate(),"yyyy年MM月dd日"), user.getUsername());
 		return super.insert(bean);

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentCourseHomeworkServiceImpl.java

@@ -32,153 +32,153 @@ import java.util.*;
 @Service
 public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, StudentCourseHomework> implements StudentCourseHomeworkService {
 
-	@Autowired
-	private StudentCourseHomeworkDao studentCourseHomeworkDao;
-	@Autowired
-	private CourseHomeworkService courseHomeworkService;
-	@Autowired
-	private CourseHomeworkDao courseHomeworkDao;
-	@Autowired
-	private CourseScheduleDao courseScheduleDao;
-	@Autowired
-	private SysUserFeignService sysUserFeignService;
-
-	@Autowired
-	private SysMessageService sysMessageService;
-	@Autowired
-	private CourseScheduleReviewDao courseScheduleReviewDao;
-	@Autowired
-	private TeacherDao teacherDao;
-
-	@Override
-	public BaseDAO<Long, StudentCourseHomework> getDAO() {
-		return studentCourseHomeworkDao;
-	}
-
-	@Transactional(rollbackFor = Exception.class)
-	@Override
-	public long insert(StudentCourseHomework bean) {
-		SysUser user = sysUserFeignService.queryUserInfo();
-		bean.setUserId(user.getId());
-		bean.setStatus(YesOrNoEnum.YES);
-		long insert = super.insert(bean);
-
-		CourseSchedule courseSchedule = courseScheduleDao.get(bean.getCourseScheduleId());
-
-		CourseHomework courseHomework = new CourseHomework();
-		courseHomework.setId(bean.getCourseHomeworkId());
-		courseHomework.setGroupType(courseSchedule.getGroupType());
-		courseHomework.setCompletedNum(studentCourseHomeworkDao.countCompletedStudentNum(bean.getCourseHomeworkId()));
-
-		courseHomeworkService.update(courseHomework);
-		return insert;
-	}
-
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int update(StudentCourseHomework bean) {
-		if(Objects.isNull(bean)||Objects.isNull(bean.getId())){
-			throw new BizException("作业不存在");
-		}
-		super.update(bean);
-		bean=studentCourseHomeworkDao.get(bean.getId());
-		CourseSchedule courseSchedule = courseScheduleDao.get(bean.getCourseScheduleId());
-
-		CourseHomework courseHomework = new CourseHomework();
-		courseHomework.setId(bean.getCourseHomeworkId());
-		courseHomework.setGroupType(courseSchedule.getGroupType());
-		courseHomework.setCompletedNum(studentCourseHomeworkDao.countCompletedStudentNum(bean.getCourseHomeworkId()));
-
-		CourseHomework temp = courseHomeworkService.get(courseHomework.getId());
-		if(temp.getExpectNum().equals(courseHomework.getCompletedNum())){
-			CourseScheduleReview review = courseScheduleReviewDao.findByCourseScheduleAndStudent(bean.getCourseScheduleId(),bean.getUserId());
-			if(Objects.nonNull(review)){
-				review.setHandHomework(YesOrNoEnum.YES.getCode());
-			}
-			courseScheduleReviewDao.update(review);
-		}
-
-		Map<Integer, String> userMap = new HashMap<>();
-		userMap.put(courseSchedule.getActualTeacherId(), courseSchedule.getActualTeacherId().toString());
-		SysUser user = teacherDao.getUser(bean.getUserId());
-		String notifyUrl = "3?courseScheduleID=" + courseSchedule.getId() + "&studentCourseHomeworkId=" + bean.getId();
-		sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.HOMEWORK_SUBMIT_PUSH,
-				userMap, null, 0, notifyUrl, "TEACHER", courseSchedule.getName(), DateUtil.dateToString(courseSchedule.getClassDate(),"yyyy年MM月dd日"), user.getUsername());
-
-		return courseHomeworkService.update(courseHomework);
-	}
-
-	@Override
-	public CourseHomeworkStudentDetailDto findCourseHomeworkStudentDetail(Long courseScheduleID, Long userId) {
-		if(Objects.isNull(courseScheduleID)){
-			throw new BizException("作业不存在");
-		}
-		return studentCourseHomeworkDao.findCourseHomeworkStudentDetail(courseScheduleID, userId);
-	}
-
-	@Override
-	public boolean updateReplyStatus(Integer teacherId, Long courseHomeworkId, Integer studentId) {
-		StudentCourseHomework byStudentAndCourseHomewok = studentCourseHomeworkDao.findByStudentAndCourseHomewok(courseHomeworkId, studentId);
-		if (Objects.isNull(byStudentAndCourseHomewok)) {
-			throw new BizException("作业记录不存在");
-		}
-		if (byStudentAndCourseHomewok.getIsReplied() == YesOrNoEnum.YES) {
-			return true;
-		}
-		CourseHomework byTeacherAndCourseHomewok = courseHomeworkDao.findByTeacherAndCourseHomewok(courseHomeworkId, teacherId);
-		if (Objects.nonNull(byTeacherAndCourseHomewok)) {
-			byStudentAndCourseHomewok.setIsReplied(YesOrNoEnum.YES);
-			studentCourseHomeworkDao.update(byStudentAndCourseHomewok);
-		}
-		return true;
-	}
-
-	@Override
-	public PageInfo<StudentCourseHomework> queryPage(QueryInfo queryInfo) {
-		SysUser user = sysUserFeignService.queryUserInfo();
-		CourseHomeworkQueryInfo courseHomeworkQueryInfo = (CourseHomeworkQueryInfo) queryInfo;
-		courseHomeworkQueryInfo.setUserId(Long.valueOf(user.getId()));
-		return super.queryPage(queryInfo);
-	}
-
-	@Override
-	public List<StudentCourseHomework> findStudentCourseHomeworkByCourse(Long courseSchedule, String userName) {
-		if (Objects.isNull(courseSchedule)) {
-			throw new BizException("请指定课程");
-		}
-		return studentCourseHomeworkDao.findByCourseSchedule(courseSchedule, userName);
-	}
-
-	@Override
-	public void homeworkRemind() {
-		List<StudentCourseHomework> list = studentCourseHomeworkDao.queryNotDoneHomeworkList();
-		StringBuffer sb;
-		for (StudentCourseHomework sch : list) {
-			sb = new StringBuffer("courseScheduleID=").append(sch.getCourseScheduleId()).append("&studentCourseHomeworkId=").append(sch.getId());
-			Map<Integer, String> receivers = new HashMap<Integer, String>(1);
-			receivers.put(sch.getUserId(), sch.getUserId() + "");
-			sysMessageService.batchSendMessage(MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_JOB_MESSAGE, receivers, null, 0, "3?" + sb,"STUDENT", sch.getCourseHomework()
-					.getMusicGroup().getName(), sch.getCourseHomework().getClassGroup().getName());
-		}
-	}
-
-	@Override
-	public PageInfo<StudentCourseHomework> findStudentCourseHomeworks(QueryInfo queryInfo) {
-		PageInfo<StudentCourseHomework> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
-		Map<String, Object> params = new HashMap<>();
-		MapUtil.populateMap(params, queryInfo);
-
-		List<StudentCourseHomework> dataList = null;
-		int count = studentCourseHomeworkDao.countStudentCourseHomeworks(params);
-		if (count > 0) {
-			pageInfo.setTotal(count);
-			params.put("offset", pageInfo.getOffset());
-			dataList = studentCourseHomeworkDao.findStudentCourseHomeworks(params);
-		}
-		if (count == 0) {
-			dataList = new ArrayList<>();
-		}
-		pageInfo.setRows(dataList);
-		return pageInfo;
-	}
+    @Autowired
+    private StudentCourseHomeworkDao studentCourseHomeworkDao;
+    @Autowired
+    private CourseHomeworkService courseHomeworkService;
+    @Autowired
+    private CourseHomeworkDao courseHomeworkDao;
+    @Autowired
+    private CourseScheduleDao courseScheduleDao;
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+
+    @Autowired
+    private SysMessageService sysMessageService;
+    @Autowired
+    private CourseScheduleReviewDao courseScheduleReviewDao;
+    @Autowired
+    private TeacherDao teacherDao;
+
+    @Override
+    public BaseDAO<Long, StudentCourseHomework> getDAO() {
+        return studentCourseHomeworkDao;
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public long insert(StudentCourseHomework bean) {
+        SysUser user = sysUserFeignService.queryUserInfo();
+        bean.setUserId(user.getId());
+        bean.setStatus(YesOrNoEnum.YES);
+        long insert = super.insert(bean);
+
+        CourseSchedule courseSchedule = courseScheduleDao.get(bean.getCourseScheduleId());
+
+        CourseHomework courseHomework = new CourseHomework();
+        courseHomework.setId(bean.getCourseHomeworkId());
+        courseHomework.setGroupType(courseSchedule.getGroupType());
+        courseHomework.setCompletedNum(studentCourseHomeworkDao.countCompletedStudentNum(bean.getCourseHomeworkId()));
+
+        courseHomeworkService.update(courseHomework);
+        return insert;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int update(StudentCourseHomework bean) {
+        if (Objects.isNull(bean) || Objects.isNull(bean.getId())) {
+            throw new BizException("作业不存在");
+        }
+        super.update(bean);
+        bean = studentCourseHomeworkDao.get(bean.getId());
+        CourseSchedule courseSchedule = courseScheduleDao.get(bean.getCourseScheduleId());
+
+        CourseHomework courseHomework = new CourseHomework();
+        courseHomework.setId(bean.getCourseHomeworkId());
+        courseHomework.setGroupType(courseSchedule.getGroupType());
+        courseHomework.setCompletedNum(studentCourseHomeworkDao.countCompletedStudentNum(bean.getCourseHomeworkId()));
+
+        CourseHomework temp = courseHomeworkService.get(courseHomework.getId());
+        if (temp.getExpectNum().equals(courseHomework.getCompletedNum())) {
+            CourseScheduleReview review = courseScheduleReviewDao.findByCourseScheduleAndStudent(bean.getCourseScheduleId(), bean.getUserId());
+            if (Objects.nonNull(review)) {
+                review.setHandHomework(YesOrNoEnum.YES.getCode());
+            }
+            courseScheduleReviewDao.update(review);
+        }
+
+        Map<Integer, String> userMap = new HashMap<>();
+        userMap.put(courseSchedule.getActualTeacherId(), courseSchedule.getActualTeacherId().toString());
+        SysUser user = teacherDao.getUser(bean.getUserId());
+        String notifyUrl = "3?courseScheduleID=" + courseSchedule.getId() + "&userId=" + bean.getUserId() + "&studentCourseHomeworkId=" + bean.getId();
+        sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.HOMEWORK_SUBMIT_PUSH,
+                userMap, null, 0, notifyUrl, "TEACHER", courseSchedule.getName(), DateUtil.dateToString(courseSchedule.getClassDate(), "yyyy年MM月dd日"), user.getUsername());
+
+        return courseHomeworkService.update(courseHomework);
+    }
+
+    @Override
+    public CourseHomeworkStudentDetailDto findCourseHomeworkStudentDetail(Long courseScheduleID, Long userId) {
+        if (Objects.isNull(courseScheduleID)) {
+            throw new BizException("作业不存在");
+        }
+        return studentCourseHomeworkDao.findCourseHomeworkStudentDetail(courseScheduleID, userId);
+    }
+
+    @Override
+    public boolean updateReplyStatus(Integer teacherId, Long courseHomeworkId, Integer studentId) {
+        StudentCourseHomework byStudentAndCourseHomewok = studentCourseHomeworkDao.findByStudentAndCourseHomewok(courseHomeworkId, studentId);
+        if (Objects.isNull(byStudentAndCourseHomewok)) {
+            throw new BizException("作业记录不存在");
+        }
+        if (byStudentAndCourseHomewok.getIsReplied() == YesOrNoEnum.YES) {
+            return true;
+        }
+        CourseHomework byTeacherAndCourseHomewok = courseHomeworkDao.findByTeacherAndCourseHomewok(courseHomeworkId, teacherId);
+        if (Objects.nonNull(byTeacherAndCourseHomewok)) {
+            byStudentAndCourseHomewok.setIsReplied(YesOrNoEnum.YES);
+            studentCourseHomeworkDao.update(byStudentAndCourseHomewok);
+        }
+        return true;
+    }
+
+    @Override
+    public PageInfo<StudentCourseHomework> queryPage(QueryInfo queryInfo) {
+        SysUser user = sysUserFeignService.queryUserInfo();
+        CourseHomeworkQueryInfo courseHomeworkQueryInfo = (CourseHomeworkQueryInfo) queryInfo;
+        courseHomeworkQueryInfo.setUserId(Long.valueOf(user.getId()));
+        return super.queryPage(queryInfo);
+    }
+
+    @Override
+    public List<StudentCourseHomework> findStudentCourseHomeworkByCourse(Long courseSchedule, String userName) {
+        if (Objects.isNull(courseSchedule)) {
+            throw new BizException("请指定课程");
+        }
+        return studentCourseHomeworkDao.findByCourseSchedule(courseSchedule, userName);
+    }
+
+    @Override
+    public void homeworkRemind() {
+        List<StudentCourseHomework> list = studentCourseHomeworkDao.queryNotDoneHomeworkList();
+        StringBuffer sb;
+        for (StudentCourseHomework sch : list) {
+            sb = new StringBuffer("courseScheduleID=").append(sch.getCourseScheduleId()).append("&studentCourseHomeworkId=").append(sch.getId());
+            Map<Integer, String> receivers = new HashMap<Integer, String>(1);
+            receivers.put(sch.getUserId(), sch.getUserId() + "");
+            sysMessageService.batchSendMessage(MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_JOB_MESSAGE, receivers, null, 0, "3?" + sb, "STUDENT", sch.getCourseHomework()
+                    .getMusicGroup().getName(), sch.getCourseHomework().getClassGroup().getName());
+        }
+    }
+
+    @Override
+    public PageInfo<StudentCourseHomework> findStudentCourseHomeworks(QueryInfo queryInfo) {
+        PageInfo<StudentCourseHomework> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
+        Map<String, Object> params = new HashMap<>();
+        MapUtil.populateMap(params, queryInfo);
+
+        List<StudentCourseHomework> dataList = null;
+        int count = studentCourseHomeworkDao.countStudentCourseHomeworks(params);
+        if (count > 0) {
+            pageInfo.setTotal(count);
+            params.put("offset", pageInfo.getOffset());
+            dataList = studentCourseHomeworkDao.findStudentCourseHomeworks(params);
+        }
+        if (count == 0) {
+            dataList = new ArrayList<>();
+        }
+        pageInfo.setRows(dataList);
+        return pageInfo;
+    }
 }