Преглед на файлове

Merge branch 'master_teacherSalary_2020-12-11'

Joburgess преди 4 години
родител
ревизия
7e3a13ab04
променени са 1 файла, в които са добавени 0 реда и са изтрити 3 реда
  1. 0 3
      mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleTeacherSalaryServiceImpl.java

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

@@ -887,9 +887,6 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
         BigDecimal totalSalary = BigDecimal.ZERO;
         for (CourseTeacherSalaryStatisticsDto teacherMonthSalary : teacherMonthSalarys) {
             totalSalary = totalSalary.add(teacherMonthSalary.getTotalActualSalary());
-            if(Objects.nonNull(teacherMonthSalary.getTotalReduceSalary())){
-                teacherMonthSalary.setTotalActualSalary(teacherMonthSalary.getTotalActualSalary().add(teacherMonthSalary.getTotalReduceSalary()));
-            }
         }
         Map<String, Object> result=new HashMap<>();
         result.put("monthSalarys", teacherMonthSalarys);