|
|
@@ -689,15 +689,22 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
|
|
|
throw new BizException("考勤信息不存在");
|
|
|
}
|
|
|
if(teacherAttendance.getComplaintsStatus() == ComplaintsStatusEnum.WAIT){
|
|
|
+ StringBuffer remark = new StringBuffer("同意异常考勤申述");
|
|
|
CourseSchedule courseSchedule = courseScheduleDao.get(teacherAttendance.getCourseScheduleId());
|
|
|
String classDate = DateUtil.format(courseSchedule.getClassDate(), DateUtil.DEFAULT_PATTERN);
|
|
|
if(signInStatus != null && teacherAttendance.getSignInStatus() != YesOrNoEnum.YES){
|
|
|
+ if(teacherAttendance.getSignInTime() != null){
|
|
|
+ remark.append(" 原签到时间: ").append(DateUtil.format(teacherAttendance.getSignInTime(),DateUtil.EXPANDED_DATE_TIME_FORMAT));
|
|
|
+ }
|
|
|
String startTime = DateUtil.format(courseSchedule.getStartClassTime(), DateUtil.EXPANDED_TIME_FORMAT);
|
|
|
Date date = DateUtil.stringToDate(classDate + ' ' + startTime, DateUtil.EXPANDED_DATE_TIME_FORMAT);
|
|
|
teacherAttendance.setSignInTime(DateUtil.addMinutes(date,-1));
|
|
|
teacherAttendance.setSignInStatus(YesOrNoEnum.YES);
|
|
|
}
|
|
|
if(signOutStatus != null && teacherAttendance.getSignOutStatus() != YesOrNoEnum.YES){
|
|
|
+ if(teacherAttendance.getSignOutTime() != null){
|
|
|
+ remark.append(" 原签退时间: ").append(DateUtil.format(teacherAttendance.getSignOutTime(),DateUtil.EXPANDED_DATE_TIME_FORMAT));
|
|
|
+ }
|
|
|
String endTime = DateUtil.format(courseSchedule.getEndClassTime(), DateUtil.EXPANDED_TIME_FORMAT);
|
|
|
Date date = DateUtil.stringToDate(classDate + ' ' + endTime, DateUtil.EXPANDED_DATE_TIME_FORMAT);
|
|
|
teacherAttendance.setSignOutTime(date);
|
|
|
@@ -706,7 +713,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
|
|
|
teacherAttendance.setDisposeContent(content);
|
|
|
teacherAttendance.setOperator(user.getId());
|
|
|
teacherAttendance.setComplaintsStatus(ComplaintsStatusEnum.PASS);
|
|
|
- teacherAttendance.setRemark("同意异常考勤申述");
|
|
|
+ teacherAttendance.setRemark(remark.toString());
|
|
|
teacherAttendanceDao.update(teacherAttendance);
|
|
|
String format = DateUtil.format(courseSchedule.getClassDate(), DateUtil.DEFAULT_PATTERN);
|
|
|
Map<Integer, String> receivers = new HashMap<>(1);
|
zouxuan