|
@@ -232,7 +232,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
|
}else if(YesOrNoEnum.NO.equals(teacherAttendance.getSignInStatus())){
|
|
}else if(YesOrNoEnum.NO.equals(teacherAttendance.getSignInStatus())){
|
|
|
//异常签到
|
|
//异常签到
|
|
|
int signCourseTimeBetweenSeconds = DateUtil.secondsBetween(teacherAttendance.getSignInTime(), courseScheduleTeacherSalary.getCourseSchedule().getStartClassTime());
|
|
int signCourseTimeBetweenSeconds = DateUtil.secondsBetween(teacherAttendance.getSignInTime(), courseScheduleTeacherSalary.getCourseSchedule().getStartClassTime());
|
|
|
- int signCourseTimeBetween = signCourseTimeBetweenSeconds/60;
|
|
|
|
|
|
|
+ float signCourseTimeBetween = (float)signCourseTimeBetweenSeconds/(float)60;
|
|
|
if(signCourseTimeBetween<=1&&signCourseTimeBetween>-3){
|
|
if(signCourseTimeBetween<=1&&signCourseTimeBetween>-3){
|
|
|
//课程开始前1分钟至开始后3分钟进入教室
|
|
//课程开始前1分钟至开始后3分钟进入教室
|
|
|
deductCost = deductCost.add(courseScheduleTeacherSalary.getExpectSalary().divide(new BigDecimal(2)));
|
|
deductCost = deductCost.add(courseScheduleTeacherSalary.getExpectSalary().divide(new BigDecimal(2)));
|
|
@@ -537,7 +537,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
|
}else if(YesOrNoEnum.NO.equals(teacherAttendance.getSignInStatus())){
|
|
}else if(YesOrNoEnum.NO.equals(teacherAttendance.getSignInStatus())){
|
|
|
//异常签到
|
|
//异常签到
|
|
|
int signCourseTimeBetweenSeconds = DateUtil.secondsBetween(teacherAttendance.getSignInTime(), courseSchedule.getStartClassTime());
|
|
int signCourseTimeBetweenSeconds = DateUtil.secondsBetween(teacherAttendance.getSignInTime(), courseSchedule.getStartClassTime());
|
|
|
- int signCourseTimeBetween = signCourseTimeBetweenSeconds/60;
|
|
|
|
|
|
|
+ float signCourseTimeBetween = (float)signCourseTimeBetweenSeconds/(float)60;
|
|
|
if(signCourseTimeBetween<=1&&signCourseTimeBetween>-3){
|
|
if(signCourseTimeBetween<=1&&signCourseTimeBetween>-3){
|
|
|
//课程开始前1分钟至开始后3分钟进入教室
|
|
//课程开始前1分钟至开始后3分钟进入教室
|
|
|
deductCost = deductCost.add(teacherSalary.divide(new BigDecimal(2)));
|
|
deductCost = deductCost.add(teacherSalary.divide(new BigDecimal(2)));
|