修改

blade-service/blade-client/src/main/java/org/springblade/client/scheduled/CorpsProfitTimer.java

@@ -85,7 +85,7 @@ public class CorpsProfitTimer
 
 
 	}
-	/*@Scheduled(cron="0 0/2 * * * ?")
+/*	@Scheduled(cron="0 0 2 1 * ?")
 	public void updateTeacherMessage(){
 		log.info("=================开始计算校龄================");
 		schoolTeacherService.updateTeacherMessage();

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

@@ -105,14 +105,15 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 			configMessage.setUpdateUser(SecureUtil.getUserId());
 			baseMapper.updateById(configMessage);
 		}
+		SchoolTeacher teacherMessage = baseMapper.selectById(configMessage.getId());
 		//计算工资基数标准 工资基数标准=工资拨付标准-职级拨付标准-工作量工资标准+虚拟工作量工资标准-双休日工作量工资标准-日常考核标准+虚拟双休日工作量工资标准+虚拟日常考核工资标准-绩效工资标准
-		configMessage.setSalaryBase(configMessage.getSalaryWithdrawalStandard().subtract(configMessage.getRankWithdrawalStandardName()).subtract(configMessage.getWorkloadSalaryName())
-			.add(configMessage.getVirtualWorkloadSalary()).subtract(configMessage.getDoubleCease()).subtract(configMessage.getDailyAssessmentCriteriaName())
-			.add(configMessage.getVirtualDoubleCease()).add(configMessage.getVirtualDailyAssessmentCriteria()).subtract(configMessage.getTermPerformanceSalaryName()));
-		configMessage.setSalaryBaseName(configMessage.getSalaryBase());
+		teacherMessage.setSalaryBase(teacherMessage.getSalaryWithdrawalStandard().subtract(teacherMessage.getRankWithdrawalStandardName()).subtract(teacherMessage.getWorkloadSalaryName())
+			.add(teacherMessage.getVirtualWorkloadSalary()).subtract(teacherMessage.getDoubleCease()).subtract(teacherMessage.getDailyAssessmentCriteriaName())
+			.add(teacherMessage.getVirtualDoubleCease()).add(teacherMessage.getVirtualDailyAssessmentCriteria()).subtract(teacherMessage.getTermPerformanceSalaryName()));
+		teacherMessage.setSalaryBaseName(teacherMessage.getSalaryBase());
 		//日常考核工资
-		configMessage.setDailyAssessmentCriteria(configMessage.getDailyAssessmentCriteriaName().subtract(configMessage.getVirtualDailyAssessmentCriteria()));
-		baseMapper.updateById(configMessage);
+		teacherMessage.setDailyAssessmentCriteria(teacherMessage.getDailyAssessmentCriteriaName().subtract(teacherMessage.getVirtualDailyAssessmentCriteria()));
+		baseMapper.updateById(teacherMessage);
 		if (CollectionUtils.isNotEmpty(configMessage.getCauseList())){
 			configMessage.getCauseList().stream().forEach(item ->{
 				if (item.getId() == null){
@@ -189,14 +190,15 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 				configMessage.setUpdateTime(new Date());
 				baseMapper.updateById(configMessage);
 			}
+			SchoolTeacher teacherMessage = baseMapper.selectById(configMessage.getId());
 			//计算工资基数标准 工资基数标准=工资拨付标准-职级拨付标准-工作量工资标准+虚拟工作量工资标准-双休日工作量工资标准-日常考核标准+虚拟双休日工作量工资标准+虚拟日常考核工资标准-绩效工资标准
-			configMessage.setSalaryBase(configMessage.getSalaryWithdrawalStandard().subtract(configMessage.getRankWithdrawalStandardName()).subtract(configMessage.getWorkloadSalaryName())
-				.add(configMessage.getVirtualWorkloadSalary()).subtract(configMessage.getDoubleCease()).subtract(configMessage.getDailyAssessmentCriteriaName())
-				.add(configMessage.getVirtualDoubleCease()).add(configMessage.getVirtualDailyAssessmentCriteria()).subtract(configMessage.getTermPerformanceSalaryName()));
-			configMessage.setSalaryBaseName(configMessage.getSalaryBase());
+			teacherMessage.setSalaryBase(teacherMessage.getSalaryWithdrawalStandard().subtract(teacherMessage.getRankWithdrawalStandardName()).subtract(teacherMessage.getWorkloadSalaryName())
+				.add(teacherMessage.getVirtualWorkloadSalary()).subtract(teacherMessage.getDoubleCease()).subtract(teacherMessage.getDailyAssessmentCriteriaName())
+				.add(teacherMessage.getVirtualDoubleCease()).add(teacherMessage.getVirtualDailyAssessmentCriteria()).subtract(teacherMessage.getTermPerformanceSalaryName()));
+			teacherMessage.setSalaryBaseName(teacherMessage.getSalaryBase());
 			//日常考核工资
-			configMessage.setDailyAssessmentCriteria(configMessage.getDailyAssessmentCriteriaName().subtract(configMessage.getVirtualDailyAssessmentCriteria()));
-			baseMapper.updateById(configMessage);
+			teacherMessage.setDailyAssessmentCriteria(teacherMessage.getDailyAssessmentCriteriaName().subtract(teacherMessage.getVirtualDailyAssessmentCriteria()));
+			baseMapper.updateById(teacherMessage);
 		}
 		if (StringUtils.isNotBlank(errMsg)){
 			return R.success("导入部分成功,未导入成功的有"+errMsg.toString());
@@ -209,6 +211,7 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 		//获取校龄开始时间不为空的计算校龄
 		LambdaQueryWrapper<SchoolTeacher> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(SchoolTeacher::getIsDeleted,0);
+		lambdaQueryWrapper.eq(SchoolTeacher::getStatus,0);
 		lambdaQueryWrapper.isNotNull(SchoolTeacher::getSchoolAgeSalaryDate);
 		List<SchoolTeacher> schoolTeacherList = baseMapper.selectList(lambdaQueryWrapper);
 		//有数据执行更新校龄操作
@@ -220,14 +223,16 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 				item.setSchoolAge(new BigDecimal(Math.floorDiv(result, 12)));
 				//更新完校龄重新计算标准
 				SchoolTeacher configMessage = this.getConfigMessage(item);
+				baseMapper.updateById(configMessage);
+				SchoolTeacher teacherMessage = baseMapper.selectById(configMessage.getId());
 				//计算工资基数标准 工资基数标准=工资拨付标准-职级拨付标准-工作量工资标准+虚拟工作量工资标准-双休日工作量工资标准-日常考核标准+虚拟双休日工作量工资标准+虚拟日常考核工资标准-绩效工资标准
-				configMessage.setSalaryBase(configMessage.getSalaryWithdrawalStandard().subtract(configMessage.getRankWithdrawalStandardName()).subtract(configMessage.getWorkloadSalaryName())
-					.add(configMessage.getVirtualWorkloadSalary()).subtract(configMessage.getDoubleCease()).subtract(configMessage.getDailyAssessmentCriteriaName())
-					.add(configMessage.getVirtualDoubleCease()).add(configMessage.getVirtualDailyAssessmentCriteria()).subtract(configMessage.getTermPerformanceSalaryName()));
-				configMessage.setSalaryBaseName(configMessage.getSalaryBase());
+				teacherMessage.setSalaryBase(teacherMessage.getSalaryWithdrawalStandard().subtract(teacherMessage.getRankWithdrawalStandardName()).subtract(teacherMessage.getWorkloadSalaryName())
+					.add(teacherMessage.getVirtualWorkloadSalary()).subtract(teacherMessage.getDoubleCease()).subtract(teacherMessage.getDailyAssessmentCriteriaName())
+					.add(teacherMessage.getVirtualDoubleCease()).add(teacherMessage.getVirtualDailyAssessmentCriteria()).subtract(teacherMessage.getTermPerformanceSalaryName()));
+				teacherMessage.setSalaryBaseName(teacherMessage.getSalaryBase());
 				//日常考核工资
-				configMessage.setDailyAssessmentCriteria(configMessage.getDailyAssessmentCriteriaName().subtract(configMessage.getVirtualDailyAssessmentCriteria()));
-				baseMapper.updateById(configMessage);
+				teacherMessage.setDailyAssessmentCriteria(teacherMessage.getDailyAssessmentCriteriaName().subtract(teacherMessage.getVirtualDailyAssessmentCriteria()));
+				baseMapper.updateById(teacherMessage);
 			});
 		}
 		return R.success("操作成功");
@@ -241,14 +246,16 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 			throw new RuntimeException("未找到职工信息");
 		}
 		SchoolTeacher configMessage = this.getConfigMessage(teacher);
+		baseMapper.updateById(configMessage);
+		SchoolTeacher teacherMessage = baseMapper.selectById(configMessage.getId());
 		//计算工资基数标准 工资基数标准=工资拨付标准-职级拨付标准-工作量工资标准+虚拟工作量工资标准-双休日工作量工资标准-日常考核标准+虚拟双休日工作量工资标准+虚拟日常考核工资标准-绩效工资标准
-		configMessage.setSalaryBase(configMessage.getSalaryWithdrawalStandard().subtract(configMessage.getRankWithdrawalStandardName()).subtract(configMessage.getWorkloadSalaryName())
-		.add(configMessage.getVirtualWorkloadSalary()).subtract(configMessage.getDoubleCease()).subtract(configMessage.getDailyAssessmentCriteriaName())
-		.add(configMessage.getVirtualDoubleCease()).add(configMessage.getVirtualDailyAssessmentCriteria()).subtract(configMessage.getTermPerformanceSalaryName()));
-		configMessage.setSalaryBaseName(configMessage.getSalaryBase());
+		teacherMessage.setSalaryBase(teacherMessage.getSalaryWithdrawalStandard().subtract(teacherMessage.getRankWithdrawalStandardName()).subtract(teacherMessage.getWorkloadSalaryName())
+			.add(teacherMessage.getVirtualWorkloadSalary()).subtract(teacherMessage.getDoubleCease()).subtract(teacherMessage.getDailyAssessmentCriteriaName())
+			.add(teacherMessage.getVirtualDoubleCease()).add(teacherMessage.getVirtualDailyAssessmentCriteria()).subtract(teacherMessage.getTermPerformanceSalaryName()));
+		teacherMessage.setSalaryBaseName(teacherMessage.getSalaryBase());
 		//日常考核工资
-		configMessage.setDailyAssessmentCriteria(configMessage.getDailyAssessmentCriteriaName().subtract(configMessage.getVirtualDailyAssessmentCriteria()));
-		baseMapper.updateById(configMessage);
+		teacherMessage.setDailyAssessmentCriteria(teacherMessage.getDailyAssessmentCriteriaName().subtract(teacherMessage.getVirtualDailyAssessmentCriteria()));
+		baseMapper.updateById(teacherMessage);
 		return R.data(configMessage);
 	}
 
@@ -260,14 +267,16 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 				throw new RuntimeException("未找到职工信息");
 			}
 			SchoolTeacher configMessage = this.getConfigMessage(teacher);
+			baseMapper.updateById(configMessage);
+			SchoolTeacher teacherMessage = baseMapper.selectById(configMessage.getId());
 			//计算工资基数标准 工资基数标准=工资拨付标准-职级拨付标准-工作量工资标准+虚拟工作量工资标准-双休日工作量工资标准-日常考核标准+虚拟双休日工作量工资标准+虚拟日常考核工资标准-绩效工资标准
-			configMessage.setSalaryBase(configMessage.getSalaryWithdrawalStandard().subtract(configMessage.getRankWithdrawalStandardName()).subtract(configMessage.getWorkloadSalaryName())
-				.add(configMessage.getVirtualWorkloadSalary()).subtract(configMessage.getDoubleCease()).subtract(configMessage.getDailyAssessmentCriteriaName())
-				.add(configMessage.getVirtualDoubleCease()).add(configMessage.getVirtualDailyAssessmentCriteria()).subtract(configMessage.getTermPerformanceSalaryName()));
-			configMessage.setSalaryBaseName(configMessage.getSalaryBase());
+			teacherMessage.setSalaryBase(teacherMessage.getSalaryWithdrawalStandard().subtract(teacherMessage.getRankWithdrawalStandardName()).subtract(teacherMessage.getWorkloadSalaryName())
+				.add(teacherMessage.getVirtualWorkloadSalary()).subtract(teacherMessage.getDoubleCease()).subtract(teacherMessage.getDailyAssessmentCriteriaName())
+				.add(teacherMessage.getVirtualDoubleCease()).add(teacherMessage.getVirtualDailyAssessmentCriteria()).subtract(teacherMessage.getTermPerformanceSalaryName()));
+			teacherMessage.setSalaryBaseName(teacherMessage.getSalaryBase());
 			//日常考核工资
-			configMessage.setDailyAssessmentCriteria(configMessage.getDailyAssessmentCriteriaName().subtract(configMessage.getVirtualDailyAssessmentCriteria()));
-			baseMapper.updateById(configMessage);
+			teacherMessage.setDailyAssessmentCriteria(teacherMessage.getDailyAssessmentCriteriaName().subtract(teacherMessage.getVirtualDailyAssessmentCriteria()));
+			baseMapper.updateById(teacherMessage);
 		});
 		return R.data("计算完成");
 	}