zouxuan 5 éve
szülő
commit
54bee9ca86

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

@@ -350,7 +350,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 							//如果签退时间大于课程结束时间
 							//如果当前课程没有签退记录,那么正常更新
 							TeacherAttendance personalAttendance = teacherAttendanceDao.getTeacherPersonalAttendance(courseSchedules.get(i).getId().intValue());
-							if(personalAttendance != null && personalAttendance.getSignOutTime() != null){
+							if(personalAttendance != null && personalAttendance.getSignOutStatus() == YesOrNoEnum.NO){
 								continue;
 							}
 							if(date.after(endDateTime)){

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

@@ -68,7 +68,7 @@ public class TeacherSalaryComplaintsServiceImpl extends BaseServiceImpl<Long, Te
 		map.put(salaryComplaints.getTeacherId(), salaryComplaints.getTeacherId().toString());
 		if (map != null && map.size() > 0) {
 			sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
-			String url = new StringBuffer(sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL)).append("/#/appealResult?id").append(salaryComplaints.getId()).toString();
+			String url = new StringBuffer(sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL)).append("/#/appealResult?id=").append(salaryComplaints.getId()).toString();
 			sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.COURSE_SALARY_COMPLAINTS_RESULT, map, null, 0, url,
 					"TEACHER", DateUtil.format(salaryComplaints.getCreateTime(),DateUtil.DEFAULT_PATTERN),complaints.getStatusEnum().getMsg());
 		}