提交数据

src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java

@@ -2191,6 +2191,9 @@ public class SalaryManagementController {
 			gsmx.setCurrentSpecialDeduction(cuspde == null ? 0 : Double.valueOf(cuspde.getGrjltotal()));//本期专项扣除 【个人的社保公积金缴纳扣除】
 			gsmx.setCumSre(wages_payable+(sygs == null ? 0 : sygs.getCumSre()));//累计收入额 【本期收入+累计收入额(上月)】
 			double cumjcfy = 0;
+			if(sygs.getCumJcfy() > 0) {
+				cumjcfy = sygs.getCumJcfy() + 5000;
+			}else {
 				int xcy = 0;
 				YgglMainEmp xzrz = YgglMainEmp.builder().build().selectOne(new QueryWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getEmpNum, gsus).eq(YgglMainEmp::getOrgCode, orgcode));
 				if(xzrz != null) {
@@ -2211,6 +2214,7 @@ public class SalaryManagementController {
 						cumjcfy = xcy*5000;
 					}
 				}
+			}
 			gsmx.setCumJcfy(cumjcfy);//累计减除费用 【5000*在职月份数】
 			
 			gsmx.setCumZxkc((cuspde == null ? 0 : Double.valueOf(cuspde.getGrjltotal())) + (sygs == null ? 0 : sygs.getCumZxkc()));//累计专项扣除 【本期专项扣除+累计专项扣除(上月)】