学校修改

blade-service-api/blade-school-api/src/main/java/org/springblade/school/entity/SalaryData.java

@@ -0,0 +1,51 @@
+package org.springblade.school.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 通济学校-首页教师工资总体数据
+ *
+ * @author BladeX
+ * @since 2022-01-11
+ */
+@Data
+public class SalaryData implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 工资总额
+	 */
+	private BigDecimal salaryRental;
+	/**
+	 *年工资额增长率
+	 */
+	private BigDecimal annualWageGrowth;
+	/**
+	 *人均工资
+	 */
+	private BigDecimal averageWage;
+	/**
+	 *年人均工资增长率
+	 */
+	private BigDecimal averageWageGrowthRate;
+	/**
+	 *保险总额
+	 */
+	private BigDecimal insuredSum;
+	/**
+	 *
+	 *保险总额同比
+	 */
+	private BigDecimal insuredSumYear;
+	/**
+	 *人均保险
+	 */
+	private BigDecimal insuredMean;
+	/**
+	 *人均保险同比
+	 */
+	private BigDecimal insuredMeanYear;
+}

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

@@ -169,7 +169,7 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 			salaryItem.setRankSalaryName(teacherMessage.getRankSalaryName());//职级等级
 			salaryItem.setSalaryWithdrawalStandard(teacherMessage.getSalaryWithdrawalStandard());//工资拨付标准
 			salaryItem.setRankWithdrawalStandard(teacherMessage.getRankWithdrawalStandardName());//职级拨付标准
-			salaryItem.setRankSalary(teacherMessage.getRankSalary());//职级工资
+			//salaryItem.setRankSalary(teacherMessage.getRankSalary());//职级工资
 			salaryItem.setPerformanceAwardName(teacherMessage.getPerformanceAwardName());//履约奖标准
 			salaryItem.setPerformanceAward(teacherMessage.getPerformanceAward());//履约奖
 			salaryItem.setSchoolAgeSalary(teacherMessage.getSchoolAgeSalary());//校龄工资
@@ -185,9 +185,9 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 			salaryItem.setVirtualDoubleCease(teacherMessage.getVirtualDoubleCease());//虚拟双休日工作量工资标准
 			salaryItem.setVirtualDailyAssessmentCriteria(teacherMessage.getVirtualDailyAssessmentCriteria());//虚拟日常考核标准
 			salaryItem.setDailyAssessmentCriteria(teacherMessage.getDailyAssessmentCriteriaName());//日常考核标准
-			salaryItem.setDailyAssessmentSalary(teacherMessage.getDailyAssessmentCriteria());//日常考核工资
+			//salaryItem.setDailyAssessmentSalary(teacherMessage.getDailyAssessmentCriteria());//日常考核工资
 			salaryItem.setTermPerformanceSalaryName(teacherMessage.getTermPerformanceSalaryName());//学期绩效标准
-			salaryItem.setTermPerformanceSalary(teacherMessage.getTermPerformanceSalary());//学期绩效工资
+			//salaryItem.setTermPerformanceSalary(teacherMessage.getTermPerformanceSalary());//学期绩效工资
 			salaryItem.setTeacherSubsidy(teacherMessage.getTeacherSubsidy());//班主任补贴标准
 			//salaryItem.setClassTeacherFee(teacherMessage.getTeacherSubsidy());//班主任费
 			salaryItem.setTeacherAssessSubsidy(teacherMessage.getTeacherAssessSubsidy());//班主任考核补贴标准
@@ -1523,7 +1523,7 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 				salary.setRankSalaryName(item.getRankSalaryName());//职级等级
 				salary.setSalaryWithdrawalStandard(item.getSalaryWithdrawalStandard());//工资拨付标准
 				salary.setRankWithdrawalStandard(item.getRankWithdrawalStandardName());//职级拨付标准
-				salary.setRankSalary(item.getRankSalary());//职级工资
+				//salary.setRankSalary(item.getRankSalary());//职级工资
 				salary.setPerformanceAwardName(item.getPerformanceAwardName());//履约奖标准
 				salary.setPerformanceAward(item.getPerformanceAward());//履约奖
 				salary.setSchoolAgeSalary(item.getSchoolAgeSalary());//校龄工资
@@ -1539,9 +1539,9 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 				salary.setVirtualDoubleCease(item.getVirtualDoubleCease());//虚拟双休日工作量工资标准
 				salary.setVirtualDailyAssessmentCriteria(item.getVirtualDailyAssessmentCriteria());//虚拟日常考核标准
 				salary.setDailyAssessmentCriteria(item.getDailyAssessmentCriteriaName());//日常考核标准
-				salary.setDailyAssessmentSalary(item.getDailyAssessmentCriteria());//日常考核工资
+				//salary.setDailyAssessmentSalary(item.getDailyAssessmentCriteria());//日常考核工资
 				salary.setTermPerformanceSalaryName(item.getTermPerformanceSalaryName());//学期绩效标准
-				salary.setTermPerformanceSalary(item.getTermPerformanceSalary());//学期绩效工资
+				//salary.setTermPerformanceSalary(item.getTermPerformanceSalary());//学期绩效工资
 				salary.setTeacherSubsidy(item.getTeacherSubsidy());//班主任补贴标准
 				//salary.setClassTeacherFee(item.getTeacherSubsidy());//班主任费
 				salary.setTeacherAssessSubsidy(item.getTeacherAssessSubsidy());//班主任考核补贴标准