Procházet zdrojové kódy

feat:教师端课酬区分大雅课酬与其它课酬

Joburgess před 4 roky
rodič
revize
35f83d6a79

+ 10 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/dto/TeacherIncomeDto.java

@@ -20,6 +20,8 @@ public class TeacherIncomeDto extends CourseSchedule {
 
     private TeacherAttendance teacherAttendance;
 
+    private Boolean belongToDaya;
+
     private List<TeacherSalaryDeductReasonDto> deductReasons;
 
     public TeacherAttendance getTeacherAttendance() {
@@ -63,4 +65,12 @@ public class TeacherIncomeDto extends CourseSchedule {
     public void setDeductReasons(List<TeacherSalaryDeductReasonDto> deductReasons) {
         this.deductReasons = deductReasons;
     }
+
+    public Boolean getBelongToDaya() {
+        return belongToDaya;
+    }
+
+    public void setBelongToDaya(Boolean belongToDaya) {
+        this.belongToDaya = belongToDaya;
+    }
 }

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

@@ -2117,6 +2117,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
                 teacherIncomeInfo.setActualSalary(teacherSalary.getActualSalary());
                 teacherIncomeInfo.setDeductReasons(teacherSalary.getDeductReasons());
                 teacherIncomeInfo.setTeacherAttendance(teacherAttendances.get(0));
+                teacherIncomeInfo.setBelongToDaya(teacherSalary.getBelongToDaya());
                 dataList.add(teacherIncomeInfo);
             }
         }