学校修改

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

@@ -427,9 +427,9 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 				}
 			}
 		}
-		if (schoolTeacher.getSalaryWithdrawalStandard() != null && StringUtils.isNotBlank(schoolTeacher.getStaffType()) && schoolTeacher.getStaffType().equals("非教师")) {
+		/*if (schoolTeacher.getSalaryWithdrawalStandard() != null && StringUtils.isNotBlank(schoolTeacher.getStaffType()) && schoolTeacher.getStaffType().equals("非教师")) {
 			schoolTeacher.setSalaryWithdrawalStandard(schoolTeacher.getSalaryWithdrawalStandard().multiply(new BigDecimal(0.8)));
-		}
+		}*/
 		//获取职级拨付标准 按校龄取值 查询不到不赋值
 		SchoolConfigItem teacherSubsidy = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(),
 			schoolTeacher.getInSection(), schoolTeacher.getSalaryWithdrawalStandardName(), "职级拨付标准",
@@ -537,10 +537,10 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 			schoolTeacher.setCapitalIncrease(capitalIncreaseName.getSalary());
 		}
 		//履约奖标准
-		/*if (StringUtils.isBlank(schoolTeacher.getEnjoyOfficeTreatment()) || !schoolTeacher.getEnjoyOfficeTreatment().equals("是")) {*/
-		SchoolConfigItem performanceAward = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), schoolTeacher.getSalaryWithdrawalStandardName(), "履约奖标准", schoolTeacher.getSchoolAge().toString(), null, null);
-		if (performanceAward == null) {
-			SchoolConfigItem performanceAwardName = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), schoolTeacher.getSalaryWithdrawalStandardName(), "履约奖标准", null, null, null);
+		if (StringUtils.isBlank(schoolTeacher.getEnjoyOfficeTreatment()) || !schoolTeacher.getEnjoyOfficeTreatment().equals("是")) {
+			SchoolConfigItem performanceAward = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), schoolTeacher.getSalaryWithdrawalStandardName(), "履约奖标准", schoolTeacher.getSchoolAge().toString(), null, null);
+			if (performanceAward == null) {
+				SchoolConfigItem performanceAwardName = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), schoolTeacher.getSalaryWithdrawalStandardName(), "履约奖标准", null, null, null);
 			if (performanceAwardName != null) {
 				schoolTeacher.setPerformanceAward(performanceAwardName.getSalary());
 				schoolTeacher.setPerformanceAwardName(schoolTeacher.getSchoolAge());
@@ -548,11 +548,14 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 				schoolTeacher.setPerformanceAward(BigDecimal.ZERO);
 				schoolTeacher.setPerformanceAwardName(schoolTeacher.getSchoolAge());
 			}
-		} else {
-			schoolTeacher.setPerformanceAward(performanceAward.getSalary());
-			schoolTeacher.setPerformanceAwardName(schoolTeacher.getSchoolAge());
+			} else {
+				schoolTeacher.setPerformanceAward(performanceAward.getSalary());
+				schoolTeacher.setPerformanceAwardName(schoolTeacher.getSchoolAge());
+			}
+		}else {
+			schoolTeacher.setPerformanceAward(BigDecimal.ZERO);
+			schoolTeacher.setPerformanceAwardName(BigDecimal.ZERO);
 		}
-		/*}*/
 		if (schoolTeacher.getInSection().equals("高中部")) {
 			//日常考核工资标准
 			SchoolConfigItem assessment = schoolConfigItemMapper.getConfig(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "日常考核等级", schoolTeacher.getDailyGrade(), null, schoolTeacher.getClassType());