修改

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

@@ -112,7 +112,10 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 			.add(teacherMessage.getVirtualDoubleCease()).add(teacherMessage.getVirtualDailyAssessmentCriteria()).subtract(teacherMessage.getTermPerformanceSalaryName()));
 		teacherMessage.setSalaryBaseName(teacherMessage.getSalaryBase());
 		//日常考核工资
-		teacherMessage.setDailyAssessmentCriteria(teacherMessage.getDailyAssessmentCriteriaName().subtract(teacherMessage.getVirtualDailyAssessmentCriteria()));
+		teacherMessage.setDailyAssessmentCriteria(teacherMessage.getDailyAssessmentCriteria().subtract(teacherMessage.getVirtualDailyAssessmentCriteria()));
+		if (teacherMessage.getDailyAssessmentCriteria().compareTo(BigDecimal.ZERO) < 0){
+			teacherMessage.setDailyAssessmentCriteria(new BigDecimal(BigInteger.ZERO));
+		}
 		baseMapper.updateById(teacherMessage);
 		if (CollectionUtils.isNotEmpty(configMessage.getCauseList())){
 			configMessage.getCauseList().stream().forEach(item ->{
@@ -197,7 +200,10 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 				.add(teacherMessage.getVirtualDoubleCease()).add(teacherMessage.getVirtualDailyAssessmentCriteria()).subtract(teacherMessage.getTermPerformanceSalaryName()));
 			teacherMessage.setSalaryBaseName(teacherMessage.getSalaryBase());
 			//日常考核工资
-			teacherMessage.setDailyAssessmentCriteria(teacherMessage.getDailyAssessmentCriteriaName().subtract(teacherMessage.getVirtualDailyAssessmentCriteria()));
+			teacherMessage.setDailyAssessmentCriteria(teacherMessage.getDailyAssessmentCriteria().subtract(teacherMessage.getVirtualDailyAssessmentCriteria()));
+			if (teacherMessage.getDailyAssessmentCriteria().compareTo(BigDecimal.ZERO) < 0){
+				teacherMessage.setDailyAssessmentCriteria(new BigDecimal(BigInteger.ZERO));
+			}
 			baseMapper.updateById(teacherMessage);
 		}
 		if (StringUtils.isNotBlank(errMsg)){
@@ -231,7 +237,10 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 					.add(teacherMessage.getVirtualDoubleCease()).add(teacherMessage.getVirtualDailyAssessmentCriteria()).subtract(teacherMessage.getTermPerformanceSalaryName()));
 				teacherMessage.setSalaryBaseName(teacherMessage.getSalaryBase());
 				//日常考核工资
-				teacherMessage.setDailyAssessmentCriteria(teacherMessage.getDailyAssessmentCriteriaName().subtract(teacherMessage.getVirtualDailyAssessmentCriteria()));
+				teacherMessage.setDailyAssessmentCriteria(teacherMessage.getDailyAssessmentCriteria().subtract(teacherMessage.getVirtualDailyAssessmentCriteria()));
+				if (teacherMessage.getDailyAssessmentCriteria().compareTo(BigDecimal.ZERO) < 0){
+					teacherMessage.setDailyAssessmentCriteria(new BigDecimal(BigInteger.ZERO));
+				}
 				baseMapper.updateById(teacherMessage);
 			});
 		}
@@ -254,7 +263,10 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 			.add(teacherMessage.getVirtualDoubleCease()).add(teacherMessage.getVirtualDailyAssessmentCriteria()).subtract(teacherMessage.getTermPerformanceSalaryName()));
 		teacherMessage.setSalaryBaseName(teacherMessage.getSalaryBase());
 		//日常考核工资
-		teacherMessage.setDailyAssessmentCriteria(teacherMessage.getDailyAssessmentCriteriaName().subtract(teacherMessage.getVirtualDailyAssessmentCriteria()));
+		teacherMessage.setDailyAssessmentCriteria(teacherMessage.getDailyAssessmentCriteria().subtract(teacherMessage.getVirtualDailyAssessmentCriteria()));
+		if (teacherMessage.getDailyAssessmentCriteria().compareTo(BigDecimal.ZERO) < 0){
+			teacherMessage.setDailyAssessmentCriteria(new BigDecimal(BigInteger.ZERO));
+		}
 		baseMapper.updateById(teacherMessage);
 		return R.data(configMessage);
 	}
@@ -275,7 +287,10 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 				.add(teacherMessage.getVirtualDoubleCease()).add(teacherMessage.getVirtualDailyAssessmentCriteria()).subtract(teacherMessage.getTermPerformanceSalaryName()));
 			teacherMessage.setSalaryBaseName(teacherMessage.getSalaryBase());
 			//日常考核工资
-			teacherMessage.setDailyAssessmentCriteria(teacherMessage.getDailyAssessmentCriteriaName().subtract(teacherMessage.getVirtualDailyAssessmentCriteria()));
+			teacherMessage.setDailyAssessmentCriteria(teacherMessage.getDailyAssessmentCriteria().subtract(teacherMessage.getVirtualDailyAssessmentCriteria()));
+			if (teacherMessage.getDailyAssessmentCriteria().compareTo(BigDecimal.ZERO) < 0){
+				teacherMessage.setDailyAssessmentCriteria(new BigDecimal(BigInteger.ZERO));
+			}
 			baseMapper.updateById(teacherMessage);
 		});
 		return R.data("计算完成");
@@ -474,7 +489,7 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 			//日常考核工资标准
 			SchoolConfigItem assessment = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "日常考核工资标准", schoolTeacher.getDailyGrade(), null,schoolTeacher.getClassType());
 			if (assessment != null){
-				schoolTeacher.setDailyAssessmentCriteriaName(assessment.getSalary());
+				schoolTeacher.setDailyAssessmentCriteria(assessment.getSalary());
 			}
 			//学期绩效工资标准
 			SchoolConfigItem performance = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "学期绩效工资标准", schoolTeacher.getPerformanceGrade(), null,schoolTeacher.getClassType());
@@ -486,7 +501,7 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 			//日常考核工资标准
 			SchoolConfigItem assessment = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "日常考核工资标准", schoolTeacher.getDailyGrade(), null,null);
 			if (assessment != null){
-				schoolTeacher.setDailyAssessmentCriteriaName(assessment.getSalary());
+				schoolTeacher.setDailyAssessmentCriteria(assessment.getSalary());
 			}
 			//学期绩效工资标准
 			SchoolConfigItem performance = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "学期绩效工资标准", schoolTeacher.getPerformanceGrade(), null,null);