|
@@ -256,7 +256,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
|
int signOutCourseTimeBetweenSeconds = DateUtil.secondsBetween(teacherAttendance.getSignOutTime(), courseScheduleTeacherSalary.getCourseSchedule().getEndClassTime());
|
|
|
int signOutCourseTimeBetween = signOutCourseTimeBetweenSeconds/60;
|
|
|
|
|
|
- if(signCourseTimeBetween<20&&signOutCourseTimeBetween>3){
|
|
|
+ if(signCourseTimeBetween>=20&&signOutCourseTimeBetween>3){
|
|
|
//课程开始前20分钟至开始后3分钟退出教室
|
|
|
deductCost = deductCost.add(courseScheduleTeacherSalary.getExpectSalary());
|
|
|
deductReasons.add("课程开始前20分钟至开始后3分钟退出教室扣除全部课酬");
|
|
@@ -375,7 +375,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
|
int signOutCourseTimeBetweenSeconds = DateUtil.secondsBetween(teacherAttendance.getSignOutTime(), courseScheduleTeacherSalary.getCourseSchedule().getEndClassTime());
|
|
|
int signOutCourseTimeBetween = signOutCourseTimeBetweenSeconds/60;
|
|
|
|
|
|
- if(signCourseTimeBetween<=20&&signCourseTimeBetween>-3){
|
|
|
+ if(signCourseTimeBetween>=20&&signOutCourseTimeBetween>3){
|
|
|
//课程开始前20分钟至开始后3分钟退出教室
|
|
|
deductCost = deductCost.add(courseScheduleTeacherSalary.getExpectSalary());
|
|
|
deductReasons.add("课程开始前20分钟至开始后3分钟退出教室扣除全部课酬");
|
|
@@ -623,7 +623,8 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
|
//迟到30分钟及以上扣除全部课酬
|
|
|
deductCost = deductCost.add(teacherSalary);
|
|
|
deductReasons.add("迟到30分钟及以上扣除全部课酬");
|
|
|
- }else if(!signInInRange){
|
|
|
+ }
|
|
|
+ if(!signInInRange){
|
|
|
//签到经纬度异常扣除50
|
|
|
deductCost = deductCost.add(new BigDecimal(50));
|
|
|
deductReasons.add("签到经纬度异常扣除50");
|