|
@@ -746,19 +746,21 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
|
deductCost = deductCost.add(teacherSalary);
|
|
|
}else{
|
|
|
TeacherAttendance teacherAttendance = courseTeacherAttendances.get(0);
|
|
|
- int signCourseTimeBetween = DateUtil.minutesBetween(teacherAttendance.getSignInTime(), courseSchedule.getStartClassTime());
|
|
|
if(Objects.isNull(teacherAttendance.getSignInStatus())){
|
|
|
//未签到扣除全部课酬
|
|
|
deductCost = deductCost.add(teacherSalary);
|
|
|
- }else if(YesOrNoEnum.NO.equals(teacherAttendance.getSignInStatus())&&signCourseTimeBetween>=0&&signCourseTimeBetween<20){
|
|
|
- //未提前20分钟打卡扣除50元
|
|
|
- deductCost = deductCost.add(new BigDecimal(50));
|
|
|
- }else if(YesOrNoEnum.NO.equals(teacherAttendance.getSignInStatus())&&signCourseTimeBetween<0&&signCourseTimeBetween>-30){
|
|
|
- //迟到30分钟内扣除一半课酬
|
|
|
- deductCost = deductCost.add(teacherSalary.divide(new BigDecimal(2)));
|
|
|
- }else if(YesOrNoEnum.NO.equals(teacherAttendance.getSignInStatus())&&signCourseTimeBetween<=-30){
|
|
|
- //迟到30分钟及以上扣除全部课酬
|
|
|
- deductCost = deductCost.add(teacherSalary);
|
|
|
+ }else if(YesOrNoEnum.NO.equals(teacherAttendance.getSignInStatus())){
|
|
|
+ int signCourseTimeBetween = DateUtil.minutesBetween(teacherAttendance.getSignInTime(), courseSchedule.getStartClassTime());
|
|
|
+ if(signCourseTimeBetween>=0&&signCourseTimeBetween<20){
|
|
|
+ //未提前20分钟打卡扣除50元
|
|
|
+ deductCost = deductCost.add(new BigDecimal(50));
|
|
|
+ }else if(signCourseTimeBetween<0&&signCourseTimeBetween>-30){
|
|
|
+ //迟到30分钟内扣除一半课酬
|
|
|
+ deductCost = deductCost.add(teacherSalary.divide(new BigDecimal(2)));
|
|
|
+ }else if(signCourseTimeBetween<=-30){
|
|
|
+ //迟到30分钟及以上扣除全部课酬
|
|
|
+ deductCost = deductCost.add(teacherSalary);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
if(!isCallName){
|