|
@@ -2165,7 +2165,10 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
|
|
|
|
//如果上课日期在试用期内按80%结算
|
|
|
if(trail){
|
|
|
- teacherSalary.getDeductReasons().add(new TeacherSalaryDeductReasonDto(DeductReasonEnum.TRAIL, oldSalary.subtract(oldSalary.multiply(new BigDecimal("0.8")))));
|
|
|
+ long trailReasonNum = teacherSalary.getDeductReasons().stream().filter(p -> DeductReasonEnum.TRAIL.equals(p.getDeductReason())).count();
|
|
|
+ if(trailReasonNum<=0){
|
|
|
+ teacherSalary.getDeductReasons().add(new TeacherSalaryDeductReasonDto(DeductReasonEnum.TRAIL, oldSalary.subtract(oldSalary.multiply(new BigDecimal("0.8")))));
|
|
|
+ }
|
|
|
}else{
|
|
|
teacherSalary.setDeductReasons(teacherSalary.getDeductReasons().stream().filter(p->!DeductReasonEnum.TRAIL.equals(p.getDeductReason())).collect(Collectors.toList()));
|
|
|
}
|