|
|
@@ -302,11 +302,7 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
|
|
|
schoolTeacher.getInSection(), schoolTeacher.getSalaryWithdrawalStandardName(),
|
|
|
"工资拨付标准", schoolTeacher.getRankType(),null);
|
|
|
if (configMessage != null){
|
|
|
- if (schoolTeacher.getInSection().equals("高中部") && schoolTeacher.getClassType().equals("非文化课")){
|
|
|
- schoolTeacher.setSalaryWithdrawalStandard(configMessage.getSalary());
|
|
|
- }else if (schoolTeacher.getInSection().equals("高中部") && schoolTeacher.getClassType().equals("文化课")){
|
|
|
- schoolTeacher.setSalaryWithdrawalStandard(configMessage.getSalary().add(new BigDecimal(700)));
|
|
|
- }
|
|
|
+ schoolTeacher.setSalaryWithdrawalStandard(configMessage.getSalary());
|
|
|
schoolTeacher.setWorkloadSalaryName(configMessage.getWorkloadSalaryName());//工作量工资标准
|
|
|
schoolTeacher.setVirtualWorkloadSalary(configMessage.getVirtualWorkloadSalary());//虚拟工作量工资标准
|
|
|
schoolTeacher.setDoubleCease(configMessage.getDoubleCease());//双休日工作量工资标准
|
|
|
@@ -314,6 +310,9 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
|
|
|
schoolTeacher.setVirtualDoubleCease(configMessage.getVirtualDoubleCease());//虚拟双休日工作量工资标准
|
|
|
schoolTeacher.setVirtualDailyAssessmentCriteria(configMessage.getVirtualDailyAssessmentCriteria());//虚拟日常考核工资标准
|
|
|
schoolTeacher.setTermPerformanceSalaryName(configMessage.getTermPerformanceSalaryName());//学期绩效工资标准
|
|
|
+ if (schoolTeacher.getInSection().equals("高中部") && schoolTeacher.getClassType().equals("文化课")){
|
|
|
+ schoolTeacher.setSalaryWithdrawalStandard(schoolTeacher.getSalaryWithdrawalStandard().add(new BigDecimal(700)));
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
if (schoolTeacher.getSalaryWithdrawalStandard() != null && schoolTeacher.getStaffType().equals("非教师")){
|
lazhaoqian