|
@@ -1104,6 +1104,9 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
if (musicGroup.getSettlementType().equals(SalarySettlementTypeEnum.GRADIENT_SALARY)) {
|
|
|
salary = TeachTypeEnum.BISHOP.equals(classGroupTeacher.getTeacherRole()) ? teacherDefaultMusicGroupSalaryHigh.getMainTeacher90MinSalary() : teacherDefaultMusicGroupSalaryHigh.getAssistantTeacher90MinSalary();
|
|
|
}
|
|
|
+ if(Objects.isNull(salary)){
|
|
|
+ throw new BizException("请设置老师课酬");
|
|
|
+ }
|
|
|
salary = salary.multiply(new BigDecimal(studentNum));
|
|
|
}
|
|
|
if(Objects.isNull(salary)){
|
|
@@ -1267,6 +1270,9 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
if (musicGroup.getSettlementType().equals(SalarySettlementTypeEnum.GRADIENT_SALARY)) {
|
|
|
salary = TeachTypeEnum.BISHOP.equals(classGroupTeacher.getTeacherRole()) ? teacherDefaultMusicGroupSalaryHigh.getMainTeacher90MinSalary() : teacherDefaultMusicGroupSalaryHigh.getAssistantTeacher90MinSalary();
|
|
|
}
|
|
|
+ if(Objects.isNull(salary)){
|
|
|
+ throw new BizException("请设置老师课酬");
|
|
|
+ }
|
|
|
salary = salary.multiply(new BigDecimal(studentNum));
|
|
|
}
|
|
|
if(Objects.isNull(salary)){
|
|
@@ -3927,6 +3933,9 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
if (musicGroup.getSettlementType().equals(SalarySettlementTypeEnum.GRADIENT_SALARY)) {
|
|
|
salary = TeachTypeEnum.BISHOP.equals(classGroupTeacher.getTeacherRole()) ? teacherDefaultMusicGroupSalaryHigh.getMainTeacher90MinSalary() : teacherDefaultMusicGroupSalaryHigh.getAssistantTeacher90MinSalary();
|
|
|
}
|
|
|
+ if(Objects.isNull(salary)){
|
|
|
+ throw new BizException("请设置老师课酬");
|
|
|
+ }
|
|
|
salary = salary.multiply(new BigDecimal(aLong));
|
|
|
}
|
|
|
if(Objects.isNull(salary)){
|