学校修改

blade-service/blade-school/src/main/java/org/springblade/school/excel/WageExcel.java

@@ -140,6 +140,18 @@ public class WageExcel implements Serializable {
 	@ExcelProperty(value = "虚拟工作量工资标准")
 	private BigDecimal virtualWorkloadSalary;
 	/**
+	 * 双休日工作量工资标准
+	 */
+	@ExcelProperty(value = "双休日工作量工资标准")
+	@ColumnWidth(45)
+	private BigDecimal doubleCease;
+	/**
+	 * 虚拟双休日工作量工资标准
+	 */
+	@ExcelProperty(value = "虚拟双休日工作量工资标准")
+	@ColumnWidth(45)
+	private BigDecimal virtualDoubleCease;
+	/**
 	 * 月份工作量
 	 */
 	@ExcelProperty(value = "月份工作量")
@@ -220,6 +232,12 @@ public class WageExcel implements Serializable {
 	@ExcelProperty(value = "日常考核标准")
 	private BigDecimal dailyAssessmentCriteria;
 	/**
+	 * 虚拟日常考核标准
+	 */
+	@ExcelProperty(value = "虚拟日常考核标准")
+	@ColumnWidth(45)
+	private BigDecimal virtualDailyAssessmentCriteria;
+	/**
 	 * 日常考核工资
 	 */
 	@ExcelProperty(value = "日常考核工资")

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

@@ -1950,8 +1950,8 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 	 */
 	public void countSalary(SalaryItem salaryItem){
 		//1. 基础工资 = +M153(校龄工资)+N153(增资)+O153(学历工资)+Q153(职级工资)+L153(履约奖)+R153(工资基数)
-		//2. 工作量工资 = 月份工作量工资+代课工作量工资+双休日工作量工资+工作量工资1+…+工作量工资5
-		//3.日常考核工资
+		//2. 工作量工资 = 月份工作量工资+代课工作量工资+双休日工作量工资+工作量工资1+…+工作量工资5 --虚拟工作量工资标准-虚拟双休日工作量工资标准
+		//3.日常考核工资 =日常考核工资-虚拟日常考核标准
 		//4.绩效工资=学期绩效工资+学期绩效工资1+..+学期绩效工资5
 		//5.奖励工资=奖励1+…+奖励10
 		//6.职务津贴=领导干部补贴+领导干部考核补贴+备课组长+备课组长考核补贴+教研组长+教研组长考核补贴
@@ -1967,7 +1967,7 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 			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()).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.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()).subtract(item.getVirtualDoubleCease()));//工作量工资
 			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()));//职务津贴
 			item.setClassTeacherSubsidy(item.getClassTeacherFee().add(item.getClasses()).subtract(item.getAdjustTheBalance()).subtract(item.getPayrollCredit()).subtract(item.getPaid()).add(item.getCustomizeEight()));//班主任津贴
@@ -1975,6 +1975,8 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 			item.setSubsidy(item.getWx().add(item.getMaternityLeaveSalary()).add(item.getOvertimeAtWeekend()).add(item.getYearUpPerformance()).add(item.getYearDownPerformance()).add(item.getCadreAllowanceReservation()).add(item.getVacationOvertimePay()).add(item.getNewPostTrain()).add(item.getWinningPrize()).add(item.getClassMinister()).add(item.getMonthViceClassFee()).add(item.getSafetyFees()).add(item.getReserveReplacement()));
 			//扣除项
 			item.setDeductions(item.getAttendance().add(item.getInspectorFines()).add(item.getTelephoneBill()).add(item.getLearningPower()).add(item.getDormitoryManagementFee()).add(item.getChildbirthAllowance()).add(item.getRibbon()).add(item.getRibbonOne()).add(item.getRibbonTwo()).add(item.getRibbonThree()).add(item.getRibbonFour()).add(item.getRibbonFive()).add(item.getRibbonSix()).add(item.getRibbonSeven()).add(item.getRibbonEight()).add(item.getRibbonNine()));
+			//日常考核工资
+			item.setDailyAssessmentSalary(item.getDailyAssessmentSalary().subtract(item.getVirtualDailyAssessmentCriteria()));
 			//应发工资  保险（个人部分）提取 字段值大于440 应付工资字段就不加保险（个人部分）否则就加上
 			if (item.getInsurancePersonage().compareTo(new BigDecimal(700)) > 0){
 				item.setSalary(item.getBasicsSalary().add(item.getWorkloadSalary()).add(item.getDailyAssessmentSalary()).add(item.getAwardSalary()).add(item.getDutyAllowances()).add(item.getClassTeacherSubsidy())