Merge remote-tracking branch 'origin/master'

# Conflicts:
#	mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentCourseHomeworkReplyServiceImpl.java
#	mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentCourseHomeworkServiceImpl.java

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

@@ -32,133 +32,130 @@ import java.util.*;
 
 @Service
 public class StudentCourseHomeworkReplyServiceImpl extends BaseServiceImpl<Long, StudentCourseHomeworkReply> implements StudentCourseHomeworkReplyService {
-	
-	@Autowired
-	private StudentCourseHomeworkReplyDao studentCourseHomeworkReplyDao;
-	@Autowired
-	private StudentCourseHomeworkService studentCourseHomeworkService;
-	@Autowired
-	private CourseScheduleDao courseScheduleDao;
-	@Autowired
-	private TeacherDao teacherDao;
-	@Autowired
-	private SysConfigDao sysConfigDao;
-	@Autowired
-	private SysMessageService sysMessageService;
 
-	@Override
-	public BaseDAO<Long, StudentCourseHomeworkReply> getDAO() {
-		return studentCourseHomeworkReplyDao;
-	}
+    @Autowired
+    private StudentCourseHomeworkReplyDao studentCourseHomeworkReplyDao;
+    @Autowired
+    private StudentCourseHomeworkService studentCourseHomeworkService;
+    @Autowired
+    private CourseScheduleDao courseScheduleDao;
+    @Autowired
+    private TeacherDao teacherDao;
+    @Autowired
+    private SysConfigDao sysConfigDao;
+    @Autowired
+    private SysMessageService sysMessageService;
 
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public long insert(StudentCourseHomeworkReply bean) {
-		StudentCourseHomework studentCourseHomework = studentCourseHomeworkService.get(bean.getStudentCourseHomeworkId());
-		if(Objects.isNull(studentCourseHomework)){
-			throw new BizException("请指定需要回复的作业");
-		}
-		CourseSchedule courseSchedule = courseScheduleDao.get(studentCourseHomework.getCourseScheduleId());
-		Map<Integer, String> userMap = new HashMap<>();
-		userMap.put(courseSchedule.getActualTeacherId(), courseSchedule.getActualTeacherId().toString());
-		SysUser user = teacherDao.getUser(studentCourseHomework.getUserId());
+    @Override
+    public BaseDAO<Long, StudentCourseHomeworkReply> getDAO() {
+        return studentCourseHomeworkReplyDao;
+    }
 
-		String notifyUrl = "9?courseScheduleID=" + studentCourseHomework.getId() +
-				"&userId=" + studentCourseHomework.getUserId() + "&studentCourseHomeworkId=" + studentCourseHomework.getId() + "&extra=0";
-		String courseDate = DateUtil.dateToString(courseSchedule.getClassDate(), "yyyy年MM月dd日");
-		String extra = "";
-		if (bean.getMsgType() != ImSendTypeEnum.TXT){
-			extra = "dayaedu?courseScheduleID=" + studentCourseHomework.getId() + "&userId=" + studentCourseHomework.getUserId() + "&studentCourseHomeworkId=" + studentCourseHomework.getId() + "&extra=0";
-			sysMessageService.batchSendImMessage(MessageTypeEnum.IM_HOMEWORK_STUDENT_REPLY_PUSH,studentCourseHomework.getUserId().toString(),extra,
-					new String[]{courseSchedule.getActualTeacherId().toString()},
-					null,courseDate,courseSchedule.getName(),SysConfigService.NEW_MSG_PUSH);
-		}else {
-			sysMessageService.batchSendImMessage(MessageTypeEnum.IM_HOMEWORK_STUDENT_REPLY_PUSH,studentCourseHomework.getUserId().toString(),extra,
-					new String[]{courseSchedule.getActualTeacherId().toString()},
-					null,courseDate,courseSchedule.getName(),bean.getContent());
-		}
-		sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.HOMEWORK_STUDENT_REPLY_PUSH,
-				userMap, null, 0, notifyUrl, "TEACHER", courseDate,courseSchedule.getName(), user.getUsername());
-		return super.insert(bean);
-	}
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public long insert(StudentCourseHomeworkReply bean) {
+        StudentCourseHomework studentCourseHomework = studentCourseHomeworkService.get(bean.getStudentCourseHomeworkId());
+        if(Objects.isNull(studentCourseHomework)){
+            throw new BizException("请指定需要回复的作业");
+        }
+        CourseSchedule courseSchedule = courseScheduleDao.get(studentCourseHomework.getCourseScheduleId());
+        Map<Integer, String> userMap = new HashMap<>();
+        userMap.put(courseSchedule.getActualTeacherId(), courseSchedule.getActualTeacherId().toString());
+        SysUser user = teacherDao.getUser(studentCourseHomework.getUserId());
 
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public void insertTeacherReply(StudentCourseHomeworkReply bean) {
-		StudentCourseHomework studentCourseHomework = studentCourseHomeworkService.get(bean.getStudentCourseHomeworkId());
-		if(Objects.isNull(studentCourseHomework)){
-			throw new BizException("请指定需要回复的作业");
-		}
-		if(Objects.nonNull(studentCourseHomework.getAttachments())){
-			studentCourseHomeworkService.updateReplyStatus(bean.getUserId(),
-					studentCourseHomework.getCourseHomeworkId(),
-					studentCourseHomework.getUserId());
-		}
+        String notifyUrl = "9?courseScheduleID=" + studentCourseHomework.getId() + "&userId=" + studentCourseHomework.getUserId() + "&studentCourseHomeworkId=" + studentCourseHomework.getId() + "&extra=0";
+        String extra = "dayaedu?courseScheduleID=" + courseSchedule.getId() + "&userId=" + studentCourseHomework.getUserId() + "&studentCourseHomeworkId=" + studentCourseHomework.getId() + "&extra=0";
+        String courseDate = DateUtil.dateToString(courseSchedule.getClassDate(), "yyyy年MM月dd日");
+        if (bean.getMsgType() != ImSendTypeEnum.TXT){
+            sysMessageService.batchSendImMessage(MessageTypeEnum.IM_HOMEWORK_STUDENT_REPLY_PUSH,studentCourseHomework.getUserId().toString(),extra,
+                    new String[]{courseSchedule.getActualTeacherId().toString()},
+                    null,courseDate,courseSchedule.getName(),SysConfigService.NEW_MSG_PUSH);
+        }else {
+            sysMessageService.batchSendImMessage(MessageTypeEnum.IM_HOMEWORK_STUDENT_REPLY_PUSH,studentCourseHomework.getUserId().toString(),extra,
+                    new String[]{courseSchedule.getActualTeacherId().toString()},
+                    null,courseDate,courseSchedule.getName(),bean.getContent());
+        }
+        sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.HOMEWORK_STUDENT_REPLY_PUSH,
+                userMap, null, 0, notifyUrl, "TEACHER", courseDate,courseSchedule.getName(), user.getUsername());
+        return super.insert(bean);
+    }
 
-		CourseSchedule courseSchedule = courseScheduleDao.get(studentCourseHomework.getCourseScheduleId());
-		Map<Integer, String> userMap = new HashMap<>();
-		userMap.put(studentCourseHomework.getUserId(),studentCourseHomework.getUserId().toString());
-		SysUser user = teacherDao.get(courseSchedule.getActualTeacherId());
-		String notifyUrl = "3?courseScheduleID=" + courseSchedule.getId() + "&studentCourseHomeworkId=" + studentCourseHomework.getId() + "&extra=0";
-		String courseDate = DateUtil.dateToString(courseSchedule.getClassDate(), "yyyy年MM月dd日");
-		String extra = "";
-		if (bean.getMsgType() != ImSendTypeEnum.TXT){
-			extra = "dayaedu?courseScheduleID=" + courseSchedule.getId() + "&studentCourseHomeworkId=" + studentCourseHomework.getId() + "&extra=0&" + "userId=" + studentCourseHomework.getUserId();
-			sysMessageService.batchSendImMessage(MessageTypeEnum.IM_HOMEWORK_TEACHER_REPLY_PUSH,courseSchedule.getActualTeacherId().toString(),extra,
-					new String[]{studentCourseHomework.getUserId().toString()},
-					null, courseDate,courseSchedule.getName(),SysConfigService.NEW_MSG_PUSH);
-		}else {
-			sysMessageService.batchSendImMessage(MessageTypeEnum.IM_HOMEWORK_TEACHER_REPLY_PUSH,courseSchedule.getActualTeacherId().toString(),extra,
-					new String[]{studentCourseHomework.getUserId().toString()},
-					null, courseDate,courseSchedule.getName(),bean.getContent());
-		}
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void insertTeacherReply(StudentCourseHomeworkReply bean) {
+        StudentCourseHomework studentCourseHomework = studentCourseHomeworkService.get(bean.getStudentCourseHomeworkId());
+        if(Objects.isNull(studentCourseHomework)){
+            throw new BizException("请指定需要回复的作业");
+        }
+        if(Objects.nonNull(studentCourseHomework.getAttachments())){
+            studentCourseHomeworkService.updateReplyStatus(bean.getUserId(),
+                    studentCourseHomework.getCourseHomeworkId(),
+                    studentCourseHomework.getUserId());
+        }
 
-		sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.HOMEWORK_TEACHER_REPLY_PUSH,
-				userMap, null, 0, notifyUrl, "STUDENT", user.getRealName(), courseSchedule.getName());
-		super.insert(bean);
-	}
+        CourseSchedule courseSchedule = courseScheduleDao.get(studentCourseHomework.getCourseScheduleId());
+        Map<Integer, String> userMap = new HashMap<>();
+        userMap.put(studentCourseHomework.getUserId(),studentCourseHomework.getUserId().toString());
+        SysUser user = teacherDao.get(courseSchedule.getActualTeacherId());
+        String notifyUrl = "?courseScheduleID=" + courseSchedule.getId() + "&studentCourseHomeworkId=" + studentCourseHomework.getId() + "&extra=0";
+        String courseDate = DateUtil.dateToString(courseSchedule.getClassDate(), "yyyy年MM月dd日");
+        String extra = "dayaedu" + notifyUrl + "&userId=" + studentCourseHomework.getUserId();
+        if (bean.getMsgType() != ImSendTypeEnum.TXT){
+            sysMessageService.batchSendImMessage(MessageTypeEnum.IM_HOMEWORK_TEACHER_REPLY_PUSH,courseSchedule.getActualTeacherId().toString(),extra,
+                    new String[]{studentCourseHomework.getUserId().toString()},
+                    null, courseDate,courseSchedule.getName(),SysConfigService.NEW_MSG_PUSH);
+        }else {
+            sysMessageService.batchSendImMessage(MessageTypeEnum.IM_HOMEWORK_TEACHER_REPLY_PUSH,courseSchedule.getActualTeacherId().toString(),extra,
+                    new String[]{studentCourseHomework.getUserId().toString()},
+                    null, courseDate,courseSchedule.getName(),bean.getContent());
+        }
 
-	@Override
-	public PageInfo queryPage(QueryInfo queryInfo) {
-		StudentCourseHomeworkReplyQueryInfo studentCourseHomeworkReplyQueryInfo= (StudentCourseHomeworkReplyQueryInfo) queryInfo;
-		studentCourseHomeworkReplyQueryInfo.setParentID(null);
-		PageInfo studentCourseHomeworkReplyPageInfo = super.queryPage(studentCourseHomeworkReplyQueryInfo);
-		for(Object temp:studentCourseHomeworkReplyPageInfo.getRows()){
-			studentCourseHomeworkReplyQueryInfo.setParentID(((StudentCourseHomeworkCommentDto)temp).getReplyId());
-			getTree((StudentCourseHomeworkCommentDto) temp,studentCourseHomeworkReplyQueryInfo);
-		}
-		return studentCourseHomeworkReplyPageInfo;
-	}
+        sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.HOMEWORK_TEACHER_REPLY_PUSH,
+                userMap, null, 0, 3+notifyUrl, "STUDENT", user.getRealName(), courseSchedule.getName());
+        super.insert(bean);
+    }
 
-	@Override
-	public int delete(Long id) {
-		StudentCourseHomeworkReply studentCourseHomeworkReply = super.get(id);
-		List<Long> ids=new ArrayList<>();
-		ids.add(id);
-		List<StudentCourseHomeworkReply> allReplyByStudentCourseHomeworkID = studentCourseHomeworkReplyDao.findAllReplyByStudentCourseHomeworkID(studentCourseHomeworkReply.getStudentCourseHomeworkId());
-		findAllChildID(id,allReplyByStudentCourseHomeworkID,ids);
-		return studentCourseHomeworkReplyDao.batchDeleteReplys(ids);
-	}
+    @Override
+    public PageInfo queryPage(QueryInfo queryInfo) {
+        StudentCourseHomeworkReplyQueryInfo studentCourseHomeworkReplyQueryInfo= (StudentCourseHomeworkReplyQueryInfo) queryInfo;
+        studentCourseHomeworkReplyQueryInfo.setParentID(null);
+        PageInfo studentCourseHomeworkReplyPageInfo = super.queryPage(studentCourseHomeworkReplyQueryInfo);
+        for(Object temp:studentCourseHomeworkReplyPageInfo.getRows()){
+            studentCourseHomeworkReplyQueryInfo.setParentID(((StudentCourseHomeworkCommentDto)temp).getReplyId());
+            getTree((StudentCourseHomeworkCommentDto) temp,studentCourseHomeworkReplyQueryInfo);
+        }
+        return studentCourseHomeworkReplyPageInfo;
+    }
 
-	private void findAllChildID(Long parentID,List<StudentCourseHomeworkReply> datas,List<Long> results){
-		for(StudentCourseHomeworkReply data:datas){
-			if(parentID.equals(data.getParentId())){
-				results.add(data.getId());
-				findAllChildID(data.getId(),datas,results);
-			}
-		}
-	}
+    @Override
+    public int delete(Long id) {
+        StudentCourseHomeworkReply studentCourseHomeworkReply = super.get(id);
+        List<Long> ids=new ArrayList<>();
+        ids.add(id);
+        List<StudentCourseHomeworkReply> allReplyByStudentCourseHomeworkID = studentCourseHomeworkReplyDao.findAllReplyByStudentCourseHomeworkID(studentCourseHomeworkReply.getStudentCourseHomeworkId());
+        findAllChildID(id,allReplyByStudentCourseHomeworkID,ids);
+        return studentCourseHomeworkReplyDao.batchDeleteReplys(ids);
+    }
 
-	private StudentCourseHomeworkCommentDto getTree(StudentCourseHomeworkCommentDto studentCourseHomeworkCommentDto, StudentCourseHomeworkReplyQueryInfo queryInfo){
-		PageInfo pageInfo = super.queryPage(queryInfo);
-		if(pageInfo != null && pageInfo.getRows().size() > 0) {
-			studentCourseHomeworkCommentDto.setReplys(pageInfo.getRows());
-			for (Object  object: pageInfo.getRows()) {
-				queryInfo.setParentID(((StudentCourseHomeworkCommentDto)object).getReplyId());
-				getTree((StudentCourseHomeworkCommentDto) object,queryInfo);
-			}
-		}
-		return studentCourseHomeworkCommentDto;
-	}
+    private void findAllChildID(Long parentID,List<StudentCourseHomeworkReply> datas,List<Long> results){
+        for(StudentCourseHomeworkReply data:datas){
+            if(parentID.equals(data.getParentId())){
+                results.add(data.getId());
+                findAllChildID(data.getId(),datas,results);
+            }
+        }
+    }
+
+    private StudentCourseHomeworkCommentDto getTree(StudentCourseHomeworkCommentDto studentCourseHomeworkCommentDto, StudentCourseHomeworkReplyQueryInfo queryInfo){
+        PageInfo pageInfo = super.queryPage(queryInfo);
+        if(pageInfo != null && pageInfo.getRows().size() > 0) {
+            studentCourseHomeworkCommentDto.setReplys(pageInfo.getRows());
+            for (Object  object: pageInfo.getRows()) {
+                queryInfo.setParentID(((StudentCourseHomeworkCommentDto)object).getReplyId());
+                getTree((StudentCourseHomeworkCommentDto) object,queryInfo);
+            }
+        }
+        return studentCourseHomeworkCommentDto;
+    }
 
 }

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

@@ -11,6 +11,7 @@ import com.ym.mec.biz.dal.entity.CourseHomework;
 import com.ym.mec.biz.dal.entity.CourseSchedule;
 import com.ym.mec.biz.dal.entity.CourseScheduleReview;
 import com.ym.mec.biz.dal.entity.StudentCourseHomework;
+import com.ym.mec.biz.dal.enums.ImSendTypeEnum;
 import com.ym.mec.biz.dal.enums.MessageTypeEnum;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.biz.dal.page.CourseHomeworkQueryInfo;
@@ -116,8 +117,9 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
             userMap.put(courseSchedule.getActualTeacherId(), courseSchedule.getActualTeacherId().toString());
             SysUser user = teacherDao.getUser(bean.getUserId());
             String notifyUrl = "9?courseScheduleID=" + bean.getId() + "&userId=" + bean.getUserId() + "&studentCourseHomeworkId=" + bean.getId() + "&extra=0";
+            String extra = "dayaedu?courseScheduleID=" + courseSchedule.getId() + "&userId=" + bean.getUserId() + "&studentCourseHomeworkId=" + bean.getId() + "&extra=0";
             String courseDate = DateUtil.dateToString(courseSchedule.getClassDate(), "yyyy年MM月dd日");
-            sysMessageService.batchSendImMessage(MessageTypeEnum.IM_HOMEWORK_SUBMIT_PUSH,bean.getUserId().toString(),null,
+            sysMessageService.batchSendImMessage(MessageTypeEnum.IM_HOMEWORK_SUBMIT_PUSH,bean.getUserId().toString(),extra,
                     new String[]{courseSchedule.getActualTeacherId().toString()},
                     null,courseDate,courseSchedule.getName());
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.HOMEWORK_SUBMIT_PUSH,

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

@@ -290,7 +290,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 			}else if(DateUtil.minutesBetween(date,add1Minutes) > 0){
 				//正常签到范围(开始之前)
 				isSign = true;
-			}else if(DateUtil.minutesBetween(add1Minutes,date) >= 0){
+			}else {
 				//异常签到范围(开始之后)
 				isSign = true;
 				teacherAttendance.setSignInStatus(YesOrNoEnum.NO);