|
@@ -385,7 +385,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
|
//未签到扣除全部课酬
|
|
|
deductCost = deductCost.add(expectSalary);
|
|
|
deductReasons.add("未签到扣除全部课酬");
|
|
|
- }else if(YesOrNoEnum.NO.equals(courseTeacherAttendances.get(0).getSignInStatus())){
|
|
|
+ }else if(YesOrNoEnum.NO.equals(courseTeacherAttendances.get(0).getSignInStatus())&&TeachModeEnum.ONLINE.equals(courseScheduleTeacherSalary.getCourseSchedule().getTeachMode())){
|
|
|
//异常签到
|
|
|
int signCourseTimeBetweenSeconds = DateUtil.secondsBetween(courseTeacherAttendances.get(0).getSignInTime(), courseScheduleTeacherSalary.getCourseSchedule().getStartClassTime());
|
|
|
float signCourseTimeBetween = (float)signCourseTimeBetweenSeconds/(float)60;
|
|
@@ -398,18 +398,16 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
|
deductCost = deductCost.add(expectSalary);
|
|
|
deductReasons.add("课程开始后3分钟进入教室扣除全部课酬");
|
|
|
}
|
|
|
-
|
|
|
- if(TeachModeEnum.OFFLINE.equals(courseScheduleTeacherSalary.getCourseSchedule().getTeachMode())){
|
|
|
- deductCost = deductCost.add(expectSalary);
|
|
|
- deductReasons.add("点名时经纬度不在范围内扣除全部课酬");
|
|
|
- }
|
|
|
+ }else if(YesOrNoEnum.NO.equals(courseTeacherAttendances.get(0).getSignInStatus())&&TeachModeEnum.OFFLINE.equals(courseScheduleTeacherSalary.getCourseSchedule().getTeachMode())){
|
|
|
+ deductCost = deductCost.add(expectSalary);
|
|
|
+ deductReasons.add("点名时经纬度不在范围内扣除全部课酬");
|
|
|
}
|
|
|
|
|
|
if(CollectionUtils.isEmpty(courseTeacherAttendances)||Objects.isNull(courseTeacherAttendances.get(0).getSignOutStatus())){
|
|
|
//未签退扣除全部课酬
|
|
|
deductCost = deductCost.add(expectSalary);
|
|
|
deductReasons.add("未签退扣除全部课酬");
|
|
|
- }else if(YesOrNoEnum.NO.equals(courseTeacherAttendances.get(0).getSignOutStatus())){
|
|
|
+ }else if(YesOrNoEnum.NO.equals(courseTeacherAttendances.get(0).getSignOutStatus())&&TeachModeEnum.ONLINE.equals(courseScheduleTeacherSalary.getCourseSchedule().getTeachMode())){
|
|
|
//异常签退
|
|
|
int signOutCourseTimeBetweenSeconds = DateUtil.secondsBetween(courseTeacherAttendances.get(0).getSignOutTime(), courseScheduleTeacherSalary.getCourseSchedule().getEndClassTime());
|
|
|
float signOutCourseTimeBetween = (float)signOutCourseTimeBetweenSeconds/(float)60;
|
|
@@ -423,11 +421,9 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
|
deductCost = deductCost.add(expectSalary.divide(new BigDecimal(2)));
|
|
|
deductReasons.add("课程结束前3分钟后至课程结束前退出教室扣除一半课酬");
|
|
|
}
|
|
|
-
|
|
|
- if(TeachModeEnum.OFFLINE.equals(courseScheduleTeacherSalary.getCourseSchedule().getTeachMode())){
|
|
|
- deductCost = deductCost.add(expectSalary);
|
|
|
- deductReasons.add("点名时经纬度不在范围内扣除全部课酬");
|
|
|
- }
|
|
|
+ }else if(YesOrNoEnum.NO.equals(courseTeacherAttendances.get(0).getSignInStatus())&&TeachModeEnum.OFFLINE.equals(courseScheduleTeacherSalary.getCourseSchedule().getTeachMode())){
|
|
|
+ deductCost = deductCost.add(expectSalary);
|
|
|
+ deductReasons.add("点名时经纬度不在范围内扣除全部课酬");
|
|
|
}
|
|
|
|
|
|
if(BigDecimal.ZERO.compareTo(deductCost)<0){
|