lazhaoqian 3 年之前
父節點
當前提交
0401c39422

+ 5 - 2
blade-service/blade-client/src/main/java/org/springblade/client/school/service/impl/SchoolTeacherServiceImpl.java

@@ -294,14 +294,17 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 				schoolTeacher.setVirtualDailyAssessmentCriteria(configMessage.getVirtualDailyAssessmentCriteria());//虚拟日常考核工资标准
 				schoolTeacher.setTermPerformanceSalaryName(configMessage.getTermPerformanceSalaryName());//学期绩效工资标准
 			}
+			if (schoolTeacher.getInSection().equals("高中部") && schoolTeacher.getClassType().equals("文化课")){
+				schoolTeacher.setSalaryWithdrawalStandard(schoolTeacher.getSalaryWithdrawalStandard().add(new BigDecimal(700)));
+			}
 		}else {
 			SchoolConfigItem configMessage = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(),
 				schoolTeacher.getInSection(), schoolTeacher.getSalaryWithdrawalStandardName(),
 				"工资拨付标准", schoolTeacher.getRankType(),null);
 			if (configMessage != null){
-				if (schoolTeacher.getClassType().equals("非文化课")){
+				if (schoolTeacher.getInSection().equals("高中部") && schoolTeacher.getClassType().equals("非文化课")){
 					schoolTeacher.setSalaryWithdrawalStandard(configMessage.getSalary());
-				}else if (schoolTeacher.getClassType().equals("文化课")){
+				}else if (schoolTeacher.getInSection().equals("高中部") && schoolTeacher.getClassType().equals("文化课")){
 					schoolTeacher.setSalaryWithdrawalStandard(configMessage.getSalary().add(new BigDecimal(700)));
 				}
 				schoolTeacher.setWorkloadSalaryName(configMessage.getWorkloadSalaryName());//工作量工资标准