|
@@ -302,7 +302,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
|
BigDecimal signInDeductCost = getSignInDeduce(expectSalary, signInStatus, teachMode,tenantId);
|
|
|
if(signInDeductCost.compareTo(BigDecimal.ZERO) > 0){
|
|
|
deductCost = deductCost.add(signInDeductCost);
|
|
|
- deductReasons.add("签到状态异常扣除课酬" + signInDeductCost);
|
|
|
+ deductReasons.add(signInStatus.getName() + "扣除课酬" + signInDeductCost);
|
|
|
}
|
|
|
}
|
|
|
if(teacherAttendance.getSignInStatus() == null || teacherAttendance.getSignOutStatus() == YesOrNoEnum.NO){
|
|
@@ -310,7 +310,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
|
BigDecimal signOutDeductCost = getSignInDeduce(expectSalary, signOutStatus, teachMode,tenantId);
|
|
|
if(signOutDeductCost.compareTo(BigDecimal.ZERO) > 0){
|
|
|
deductCost = deductCost.add(signOutDeductCost);
|
|
|
- deductReasons.add("签退状态异常扣除课酬" + signOutDeductCost);
|
|
|
+ deductReasons.add(signOutStatus.getName() + "扣除课酬" + signOutDeductCost);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -435,7 +435,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
|
BigDecimal signInDeductCost = getSignInDeduce(expectSalary, signInStatus, teachMode,tenantId);
|
|
|
if(signInDeductCost.compareTo(BigDecimal.ZERO) > 0){
|
|
|
deductCost = deductCost.add(signInDeductCost);
|
|
|
- deductReasons.add("签到状态异常扣除课酬" + signInDeductCost);
|
|
|
+ deductReasons.add(signInStatus.getName() + "扣除课酬" + signInDeductCost);
|
|
|
}
|
|
|
}
|
|
|
if(teacherAttendance.getSignOutStatus() == null || teacherAttendance.getSignOutStatus() == YesOrNoEnum.NO){
|
|
@@ -443,7 +443,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
|
BigDecimal signOutDeductCost = getSignInDeduce(expectSalary, signOutStatus, teachMode,tenantId);
|
|
|
if(signOutDeductCost.compareTo(BigDecimal.ZERO) > 0){
|
|
|
deductCost = deductCost.add(signOutDeductCost);
|
|
|
- deductReasons.add("签退状态异常扣除课酬" + signOutDeductCost);
|
|
|
+ deductReasons.add(signOutStatus.getName() + "扣除课酬" + signOutDeductCost);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -790,7 +790,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
|
BigDecimal signInDeductCost = getSignInDeduce(teacherSalary, signInStatus, teachMode,tenantId);
|
|
|
if(signInDeductCost.compareTo(BigDecimal.ZERO) > 0){
|
|
|
deductCost = deductCost.add(signInDeductCost);
|
|
|
- deductReasons.add("签到状态异常扣除课酬" + signInDeductCost);
|
|
|
+ deductReasons.add(signInStatus.getName() + "扣除课酬" + signInDeductCost);
|
|
|
}
|
|
|
}
|
|
|
if(teacherAttendance.getSignOutStatus() == null || teacherAttendance.getSignOutStatus() == YesOrNoEnum.NO){
|
|
@@ -798,7 +798,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
|
BigDecimal signOutDeductCost = getSignInDeduce(teacherSalary, signOutStatus, teachMode,tenantId);
|
|
|
if(signOutDeductCost.compareTo(BigDecimal.ZERO) > 0){
|
|
|
deductCost = deductCost.add(signOutDeductCost);
|
|
|
- deductReasons.add("签退状态异常扣除课酬" + signOutDeductCost);
|
|
|
+ deductReasons.add(signOutStatus.getName() + "扣除课酬" + signOutDeductCost);
|
|
|
}
|
|
|
}
|
|
|
|