Browse Source

feat:不结算课酬的老师课酬实际结算时为0

Joburgess 4 years ago
parent
commit
559d574b53

+ 3 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleTeacherSalaryServiceImpl.java

@@ -1586,6 +1586,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
                                                   List<TeacherAttendance> teacherAttendances, School school, Teacher teacher, double attendanceRange) {
 
         if(Objects.isNull(teacher)||(Objects.nonNull(teacher.getIsSettlementSalary())&&!teacher.getIsSettlementSalary())){
+            courseScheduleTeacherSalary.setSubsidy(BigDecimal.ZERO);
             courseScheduleTeacherSalary.setActualSalary(BigDecimal.ZERO);
             return;
         }
@@ -1822,6 +1823,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
         List<TeacherSalaryDeductReasonDto> deductReasons = new ArrayList<>();
         
         if(Objects.isNull(teacher)||(Objects.nonNull(teacher.getIsSettlementSalary())&&!teacher.getIsSettlementSalary())){
+            courseScheduleTeacherSalary.setSubsidy(BigDecimal.ZERO);
             courseScheduleTeacherSalary.setActualSalary(BigDecimal.ZERO);
             return;
         }
@@ -1929,6 +1931,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
         List<TeacherSalaryDeductReasonDto> deductReasons = new ArrayList<>();
 
         if(Objects.isNull(teacher)||(Objects.nonNull(teacher.getIsSettlementSalary())&&!teacher.getIsSettlementSalary())){
+            courseScheduleTeacherSalary.setSubsidy(BigDecimal.ZERO);
             courseScheduleTeacherSalary.setActualSalary(BigDecimal.ZERO);
             return;
         }