学校修改

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

@@ -446,12 +446,12 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 		//领导干部补贴标准
 		SchoolConfigItem assessLeadingCadreSubsidyName = schoolConfigItemMapper.getConfig(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "领导干部补贴标准", null,schoolTeacher.getCompileCategory(),null);
 		if (assessLeadingCadreSubsidyName != null){
-			schoolTeacher.setAssessLeadingCadreSubsidyName(assessLeadingCadreSubsidyName.getSalary());
+			schoolTeacher.setLeadingCadreSubsidyName(assessLeadingCadreSubsidyName.getSalary());
 		}
 		//领导干部考核补贴标准
 		SchoolConfigItem assessLeadingCadreSubsidy = schoolConfigItemMapper.getConfig(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "领导干部考核补贴标准", null,schoolTeacher.getCompileCategory(),null);
 		if (assessLeadingCadreSubsidy != null){
-			schoolTeacher.setAssessLeadingCadreSubsidy(assessLeadingCadreSubsidy.getSalary());
+			schoolTeacher.setAssessLeadingCadreSubsidyName(assessLeadingCadreSubsidy.getSalary());
 		}
 		//学历工资
 		SchoolConfigItem code = schoolConfigItemMapper.getConfig(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "学历标准", schoolTeacher.getCode(), null,null);
@@ -476,16 +476,18 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 			schoolTeacher.setCapitalIncrease(capitalIncreaseName.getSalary());
 		}
 		//履约奖标准
-		SchoolConfigItem performanceAward = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "履约奖标准", schoolTeacher.getSchoolAge().toString(), null,null);
-		if (performanceAward == null){
-			SchoolConfigItem performanceAwardName = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "履约奖标准", null, null,null);
-			if (performanceAwardName != null){
-				schoolTeacher.setPerformanceAward(performanceAwardName.getSalary());
+		if (StringUtils.isNotBlank(schoolTeacher.getSalaryWithdrawalStandardName()) && !schoolTeacher.getSalaryWithdrawalStandardName().contains("公办")) {
+			SchoolConfigItem performanceAward = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "履约奖标准", schoolTeacher.getSchoolAge().toString(), null,null);
+			if (performanceAward == null){
+				SchoolConfigItem performanceAwardName = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "履约奖标准", null, null,null);
+				if (performanceAwardName != null){
+					schoolTeacher.setPerformanceAward(performanceAwardName.getSalary());
+					schoolTeacher.setPerformanceAwardName(schoolTeacher.getSchoolAge());
+				}
+			}else {
+				schoolTeacher.setPerformanceAward(performanceAward.getSalary());
 				schoolTeacher.setPerformanceAwardName(schoolTeacher.getSchoolAge());
 			}
-		}else {
-			schoolTeacher.setPerformanceAward(performanceAward.getSalary());
-			schoolTeacher.setPerformanceAwardName(schoolTeacher.getSchoolAge());
 		}
 		if (schoolTeacher.getInSection().equals("高中部")){
 			//日常考核工资标准