فهرست منبع

1、课酬确认相关

Joburgess 5 سال پیش
والد
کامیت
3971f9e008

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

@@ -116,8 +116,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,

+ 1 - 1
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);