|
@@ -251,10 +251,10 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
|
}else if(YesOrNoEnum.NO.equals(teacherAttendance.getSignOutStatus())){
|
|
|
//异常签退
|
|
|
int signCourseTimeBetweenSeconds = DateUtil.secondsBetween(teacherAttendance.getSignOutTime(), courseScheduleTeacherSalary.getCourseSchedule().getStartClassTime());
|
|
|
- int signCourseTimeBetween = signCourseTimeBetweenSeconds/60;
|
|
|
+ float signCourseTimeBetween = (float)signCourseTimeBetweenSeconds/(float)60;
|
|
|
|
|
|
int signOutCourseTimeBetweenSeconds = DateUtil.secondsBetween(teacherAttendance.getSignOutTime(), courseScheduleTeacherSalary.getCourseSchedule().getEndClassTime());
|
|
|
- int signOutCourseTimeBetween = signOutCourseTimeBetweenSeconds/60;
|
|
|
+ float signOutCourseTimeBetween = (float)signOutCourseTimeBetweenSeconds/(float)60;
|
|
|
|
|
|
if(signCourseTimeBetween<=20&&signOutCourseTimeBetween>3){
|
|
|
//课程开始前20分钟至开始后3分钟退出教室
|
|
@@ -345,7 +345,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
|
}else if(YesOrNoEnum.NO.equals(teacherAttendance.getSignInStatus())){
|
|
|
//异常签到
|
|
|
int signCourseTimeBetweenSeconds = DateUtil.secondsBetween(teacherAttendance.getSignInTime(), courseScheduleTeacherSalary.getCourseSchedule().getStartClassTime());
|
|
|
- int signCourseTimeBetween = signCourseTimeBetweenSeconds/60;
|
|
|
+ float signCourseTimeBetween = (float)signCourseTimeBetweenSeconds/(float)60;
|
|
|
if(signCourseTimeBetween<=1&&signCourseTimeBetween>-3){
|
|
|
//课程开始前1分钟至开始后3分钟进入教室
|
|
|
deductCost = deductCost.add(new BigDecimal(50));
|
|
@@ -370,10 +370,10 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
|
}else if(YesOrNoEnum.NO.equals(teacherAttendance.getSignOutStatus())){
|
|
|
//异常签退
|
|
|
int signCourseTimeBetweenSeconds = DateUtil.secondsBetween(teacherAttendance.getSignOutTime(), courseScheduleTeacherSalary.getCourseSchedule().getStartClassTime());
|
|
|
- int signCourseTimeBetween = signCourseTimeBetweenSeconds/60;
|
|
|
+ float signCourseTimeBetween = (float)signCourseTimeBetweenSeconds/(float)60;
|
|
|
|
|
|
int signOutCourseTimeBetweenSeconds = DateUtil.secondsBetween(teacherAttendance.getSignOutTime(), courseScheduleTeacherSalary.getCourseSchedule().getEndClassTime());
|
|
|
- int signOutCourseTimeBetween = signOutCourseTimeBetweenSeconds/60;
|
|
|
+ float signOutCourseTimeBetween = (float)signOutCourseTimeBetweenSeconds/(float)60;
|
|
|
|
|
|
if(signCourseTimeBetween<=20&&signOutCourseTimeBetween>3){
|
|
|
//课程开始前20分钟至开始后3分钟退出教室
|
|
@@ -610,7 +610,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
|
deductReasons.add("未签到扣除全部课酬");
|
|
|
}else if(YesOrNoEnum.NO.equals(teacherAttendance.getSignInStatus())){
|
|
|
int signCourseTimeBetweenSeconds = DateUtil.secondsBetween(teacherAttendance.getSignInTime(), courseSchedule.getStartClassTime());
|
|
|
- int signCourseTimeBetween = signCourseTimeBetweenSeconds/60;
|
|
|
+ float signCourseTimeBetween = (float)signCourseTimeBetweenSeconds/(float)60;
|
|
|
if(signCourseTimeBetween>=0&&signCourseTimeBetween<20){
|
|
|
//未提前20分钟打卡扣除50元
|
|
|
deductCost = deductCost.add(new BigDecimal(50));
|
|
@@ -637,7 +637,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
|
deductReasons.add("未签退扣除全部课酬");
|
|
|
}else if(YesOrNoEnum.NO.equals(teacherAttendance.getSignOutStatus())){
|
|
|
int signOutCourseTimeBetweenSeconds = DateUtil.secondsBetween(teacherAttendance.getSignOutTime(), courseSchedule.getEndClassTime());
|
|
|
- int signOutCourseTimeBetween = signOutCourseTimeBetweenSeconds/60;
|
|
|
+ float signOutCourseTimeBetween = (float)signOutCourseTimeBetweenSeconds/(float) 60;
|
|
|
if(signOutCourseTimeBetween<=3&&signOutCourseTimeBetween>0){
|
|
|
//早退
|
|
|
deductCost = deductCost.add(teacherSalary);
|