|
@@ -1878,10 +1878,12 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
int unitMinutes = 30;
|
|
|
|
|
|
// 如果当前教师是在指定日期之后入职的,则按照3.0的方式结算
|
|
|
- Teacher teacher = teacherMap.get(teacherId);
|
|
|
- if (Objects.nonNull(teacher.getEntryDate())
|
|
|
- && (teacher.getEntryDate().after(entryDate) || teacher.getEntryDate().getTime() == entryDate.getTime())) {
|
|
|
- settlementType = SalarySettlementTypeEnum.GRADIENT_SALARY.getCode();
|
|
|
+ if (newCourseSchedule.getType() != CourseScheduleType.CLASSROOM) {
|
|
|
+ Teacher teacher = teacherMap.get(teacherId);
|
|
|
+ if (Objects.nonNull(teacher.getEntryDate())
|
|
|
+ && (teacher.getEntryDate().after(entryDate) || teacher.getEntryDate().getTime() == entryDate.getTime())) {
|
|
|
+ settlementType = SalarySettlementTypeEnum.GRADIENT_SALARY.getCode();
|
|
|
+ }
|
|
|
}
|
|
|
if (StringUtils.equals(settlementType, "TEACHER_DEFAULT")) {
|
|
|
if (newCourseSchedule.getType() == CourseScheduleType.CLASSROOM) {
|