调研时<应发工资>的公式没有绩效工资

绩效工资=学期绩效工资+学期绩效工资1+..+学期绩效工资5
应发工资=基本工资+工作量工资+日常考核工资+绩效工资+奖励工资+职务津贴+班主任津贴+补贴项-扣除项+保险（个人部分）+公积金(个人部分）.. 大于800 保险（个人部分） 不加

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

@@ -16,11 +16,12 @@
  */
 package org.springblade.school.service.impl;
 
-import cn.hutool.core.date.DateTime;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
 import org.springblade.client.entity.SchoolConfigItem;
 import org.springblade.client.entity.SchoolTeacher;
@@ -34,25 +35,19 @@ import org.springblade.school.entity.Salary;
 import org.springblade.school.entity.SalaryAccessory;
 import org.springblade.school.entity.SalaryItem;
 import org.springblade.school.excel.*;
+import org.springblade.school.mapper.SalaryItemMapper;
 import org.springblade.school.mapper.SalaryMapper;
 import org.springblade.school.service.ISalaryAccessoryService;
-import org.springblade.school.vo.SalaryItemVO;
-import org.springblade.school.mapper.SalaryItemMapper;
 import org.springblade.school.service.ISalaryItemService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.school.vo.SalaryItemVO;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.time.YearMonth;
 import java.util.ArrayList;
-import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 
@@ -2440,6 +2435,14 @@ 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()));//周末工作量工资
+			//4.绩效工资=学期绩效工资+学期绩效工资1+..+学期绩效工资5
+			item.setCustomizeFour(item.getTermPerformanceSalary()
+				.add(item.getCustomNine())
+				.add(item.getCustomize())
+				.add(item.getCustomizeOne())
+				.add(item.getCustomizeTwo())
+				.add(item.getCustomizeThree())
+ 			);
 			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()).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()));//奖励工资
@@ -2454,9 +2457,9 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 			//应发工资  保险（个人部分）提取 享受公办待遇不减个人保险
 			if (StringUtils.isNotBlank(item.getEnjoyOfficeTreatment()) && item.getEnjoyOfficeTreatment().equals("是")){
 				item.setSalary(item.getBasicsSalary().add(item.getWorkloadSalary()).add(item.getDailyAssessmentSalary()).add(item.getAwardSalary()).add(item.getDutyAllowances()).add(item.getClassTeacherSubsidy())
-					.add(item.getSubsidy()).subtract(item.getDeductions()).add(item.getReservedFundsPersonage()).add(item.getPauseNoPayTwo()));
+					.add(item.getSubsidy()).subtract(item.getDeductions()).add(item.getReservedFundsPersonage()).add(item.getPauseNoPayTwo()).add(item.getCustomizeFour()));
 			}else {
-				item.setSalary(item.getBasicsSalary().add(item.getWorkloadSalary()).add(item.getDailyAssessmentSalary()).add(item.getAwardSalary()).add(item.getDutyAllowances()).add(item.getClassTeacherSubsidy()).add(item.getSubsidy()).subtract(item.getDeductions()).add(item.getInsurancePersonage()).add(item.getReservedFundsPersonage()).add(item.getPauseNoPayTwo()));
+				item.setSalary(item.getBasicsSalary().add(item.getWorkloadSalary()).add(item.getDailyAssessmentSalary()).add(item.getAwardSalary()).add(item.getDutyAllowances()).add(item.getClassTeacherSubsidy()).add(item.getSubsidy()).subtract(item.getDeductions()).add(item.getInsurancePersonage()).add(item.getReservedFundsPersonage()).add(item.getPauseNoPayTwo()).add(item.getCustomizeFour()));
 			}
 			//实发工资
 			item.setfSalary(item.getSalary().subtract(item.getPersonageTaxes()).subtract(item.getInsurancePersonage()).subtract(item.getReservedFundsPersonage()));

blade-service/blade-user/src/main/java/org/springblade/system/user/UserApplication.java

@@ -28,7 +28,7 @@ import org.springframework.cloud.client.SpringCloudApplication;
  */
 @EnableBladeFeign
 @SpringCloudApplication
-public class UserApplication {
+public class  UserApplication {
 
 	public static void main(String[] args) {
 		BladeApplication.run(AppConstant.APPLICATION_USER_NAME, UserApplication.class, args);