学校修改

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

@@ -426,7 +426,7 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 		//教研组长补贴标准
 		SchoolConfigItem assessTeachingResearch = schoolConfigItemMapper.getConfig(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "教研组长补贴标准", null,schoolTeacher.getCompileCategory(),null);
 		if (assessTeachingResearch != null){
-			schoolTeacher.setAssessTeachingResearch(assessTeachingResearch.getSalary());
+			schoolTeacher.setTeachingResearchName(assessTeachingResearch.getSalary());
 		}
 		//教研组长考核补贴标准
 		SchoolConfigItem assessTeachingResearchName = schoolConfigItemMapper.getConfig(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "教研组长考核补贴标准", null,schoolTeacher.getCompileCategory(),null);
@@ -436,12 +436,12 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 		//备课组长补贴标准
 		SchoolConfigItem assessPrepareLessonsName = schoolConfigItemMapper.getConfig(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "备课组长补贴标准", null,schoolTeacher.getCompileCategory(),null);
 		if (assessPrepareLessonsName != null){
-			schoolTeacher.setAssessPrepareLessonsName(assessPrepareLessonsName.getSalary());
+			schoolTeacher.setPrepareLessonsName(assessPrepareLessonsName.getSalary());
 		}
 		//备课组长考核补贴标准
 		SchoolConfigItem assessPrepareLessons = schoolConfigItemMapper.getConfig(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "备课组长考核补贴标准", null,schoolTeacher.getCompileCategory(),null);
 		if (assessPrepareLessons != null){
-			schoolTeacher.setAssessPrepareLessons(assessPrepareLessons.getSalary());
+			schoolTeacher.setAssessPrepareLessonsName(assessPrepareLessons.getSalary());
 		}
 		//领导干部补贴标准
 		SchoolConfigItem assessLeadingCadreSubsidyName = schoolConfigItemMapper.getConfig(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "领导干部补贴标准", null,schoolTeacher.getCompileCategory(),null);

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

@@ -1966,7 +1966,7 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 			item.setDoubleMoney(item.getDoubleHour().multiply(item.getDoublePrice()));//双休日工作量工资
 			item.setCustomTwo(item.getCustom().multiply(item.getCustomOne()));//代课工作量工资
 			item.setOvertimeAtWeekend(item.getCustomizeNine().multiply(item.getRibbon()));//周末工作量工资
-			item.setBasicsSalary(item.getSchoolAgeSalary().add(item.getCapitalIncrease()).add(item.getEducationSalary()).add(item.getRankSalary()).add(item.getSalaryBase()));//基础工资
+			item.setBasicsSalary(item.getSchoolAgeSalary().add(item.getCapitalIncrease()).add(item.getEducationSalary()).add(item.getRankSalary()).add(item.getSalaryBase()).add(item.getPerformanceAward()));//基础工资
 			item.setWorkloadSalary(item.getMomthWorkloadSalary().add(item.getDoubleMoney()).add(item.getCustomTwo()).add(item.getCustomThree()).add(item.getCustomFour()).add(item.getCustomFive()).add(item.getCustomSix()).add(item.getCustomSeven()).subtract(item.getVirtualWorkloadSalary()));//工作量工资
 			item.setAwardSalary(item.getCustomAward().add(item.getCustomAwardOne()).add(item.getCustomAwardTwo()).add(item.getCustomAwardThree()).add(item.getCustomAwardFour()).add(item.getCustomAwardFive()).add(item.getCustomAwardSix()).add(item.getCustomAwardSeven()).add(item.getCustomAwardEight()).add(item.getCustomAwardNine()));//奖励工资
 			item.setDutyAllowances(item.getLeadingCadreSubsidy().add(item.getCustomizeFive()).add(item.getPrepareLessons()).add(item.getCustomizeSix()).add(item.getTeachingResearch()).add(item.getCustomizeSeven()));//职务津贴