|
@@ -1569,6 +1569,10 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
|
}
|
|
|
|
|
|
teacherSalary = teacherSalary.add(subsidy);
|
|
|
+ teacherSalary = teacherSalary.add(subsidy);
|
|
|
+ if(BigDecimal.ZERO.compareTo(teacherSalary)>0){
|
|
|
+ teacherSalary = new BigDecimal(0);
|
|
|
+ }
|
|
|
|
|
|
BigDecimal expectTeacherSalary = teacherSalary;
|
|
|
|
|
@@ -1647,6 +1651,9 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
|
subsidy = school.getSubsidy();
|
|
|
}
|
|
|
teacherSalary = teacherSalary.add(subsidy);
|
|
|
+ if(BigDecimal.ZERO.compareTo(teacherSalary)>0){
|
|
|
+ teacherSalary = new BigDecimal(0);
|
|
|
+ }
|
|
|
|
|
|
BigDecimal expectTeacherSalary = teacherSalary;
|
|
|
|
|
@@ -1790,6 +1797,9 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
|
}
|
|
|
courseScheduleTeacherSalary.setSubsidy(subsidy);
|
|
|
expectSalary = expectSalary.add(subsidy);
|
|
|
+ if(BigDecimal.ZERO.compareTo(expectSalary)>0){
|
|
|
+ expectSalary = new BigDecimal(0);
|
|
|
+ }
|
|
|
|
|
|
BigDecimal expectTeacherSalary = expectSalary;
|
|
|
|
|
@@ -1889,6 +1899,9 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
|
}
|
|
|
courseScheduleTeacherSalary.setSubsidy(subsidy);
|
|
|
expectSalary = expectSalary.add(subsidy);
|
|
|
+ if(BigDecimal.ZERO.compareTo(expectSalary)>0){
|
|
|
+ expectSalary = new BigDecimal(0);
|
|
|
+ }
|
|
|
|
|
|
BigDecimal expectTeacherSalary = expectSalary;
|
|
|
|