|
@@ -210,12 +210,12 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-// if(StringUtils.isEmpty(studentAttendanceInfos.getRemark())&&!isInScore){
|
|
|
-// //当前为异常签到,请填写原因!
|
|
|
-// result.put("status",2);
|
|
|
-// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
|
|
-// return result;
|
|
|
-// }
|
|
|
+ if(StringUtils.isEmpty(studentAttendanceInfos.getRemark())&&!isInScore){
|
|
|
+ //当前为异常签到,请填写原因!
|
|
|
+ result.put("status",2);
|
|
|
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
|
|
+ return result;
|
|
|
+ }
|
|
|
|
|
|
TeacherAttendance teacherAttendance = teacherAttendanceDao.findByTeacherAttendanceInfo(sysUser.getId().longValue(), courseSchedule.getId());
|
|
|
|
|
@@ -232,8 +232,7 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
|
|
|
teacherAttendance.setSignOutTime(courseSchedule.getEndClassTime());
|
|
|
teacherAttendance.setSignOutStatus(isInScore?YesOrNoEnum.YES:YesOrNoEnum.NO);
|
|
|
teacherAttendance.setCurrentClassTimes(classTimes + 1);
|
|
|
-// teacherAttendance.setRemark(studentAttendanceInfos.getRemark());
|
|
|
- teacherAttendance.setRemark(teacherAttendanceMemo);
|
|
|
+ teacherAttendance.setRemark(studentAttendanceInfos.getRemark());
|
|
|
if (Objects.nonNull(teacherAttendance.getId())) {
|
|
|
teacherAttendanceDao.update(teacherAttendance);
|
|
|
} else {
|