|
@@ -2160,14 +2160,17 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
|
//教师
|
|
|
Teacher teacher = idTeacherMap.get(teacherSalary.getUserId());
|
|
|
|
|
|
- if(Objects.nonNull(teacherSalary.getActualSalary())){
|
|
|
- continue;
|
|
|
- }
|
|
|
-
|
|
|
if(Objects.isNull(teacherSalary.getSubsidy())){
|
|
|
teacherSalary.setSubsidy(zero);
|
|
|
}
|
|
|
|
|
|
+ teacherSalary.setExpectSalary(teacherSalary.getExpectSalary().setScale(BigDecimal.ZERO.intValue(), BigDecimal.ROUND_HALF_UP));
|
|
|
+ teacherSalary.setSubsidy(teacherSalary.getSubsidy().setScale(BigDecimal.ZERO.intValue(), BigDecimal.ROUND_HALF_UP));
|
|
|
+
|
|
|
+ if(Objects.nonNull(teacherSalary.getActualSalary())){
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+
|
|
|
switch (courseSchedule.getGroupType()){
|
|
|
case MUSIC:
|
|
|
calMusicCourseTeacherActualSalary(courseSchedule, teacherSalary, teacherAttendances, school, teacher, attendanceRange, false);
|
|
@@ -2278,6 +2281,9 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
|
teacherSalary.setSubsidy(zero);
|
|
|
}
|
|
|
|
|
|
+ teacherSalary.setExpectSalary(teacherSalary.getExpectSalary().setScale(BigDecimal.ZERO.intValue(), BigDecimal.ROUND_HALF_UP));
|
|
|
+ teacherSalary.setSubsidy(teacherSalary.getSubsidy().setScale(BigDecimal.ZERO.intValue(), BigDecimal.ROUND_HALF_UP));
|
|
|
+
|
|
|
BigDecimal oldSalary = null;
|
|
|
BigDecimal oldSubsidy = null;
|
|
|
if(Objects.nonNull(teacherSalary.getSettlementTime())){
|