薪资代码

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/salary/service/impl/SalaryManagementServiceImpl.java

@@ -652,8 +652,10 @@ public class SalaryManagementServiceImpl extends ServiceImpl<SalaryManagementMap
                     StringBuffer sb = new StringBuffer("本次执行（月度工资单）：");//记录执行信息
 
                     String name = o.getName();//用户主键
-//                    if(name.equals("陈贤国")){
+//                    if(name.equals("鲍莉莉")){
 //                        System.out.println("11111111");
+//                    }else{
+//                        continue;
 //                    }
                     String userId = o.getUserId();//用户主键
                     String orgName = o.getOrgName();//组织
@@ -805,13 +807,13 @@ public class SalaryManagementServiceImpl extends ServiceImpl<SalaryManagementMap
 
                             BigDecimal getTotalPayable = new BigDecimal(hisGetTotalPayable);//应发
 
-                            BigDecimal totalDeduction = detail.getTotalDeduction();//应扣
+                            BigDecimal totalDeduction = detail.getTotalDeduction().add(new BigDecimal("5000"));//应扣
 
 
                             BigDecimal personalTax = detail.getPersonalTax() == null ? BigDecimal.ZERO : detail.getPersonalTax();
 
                             //历史累计应纳税额 = 应发 - 应扣 + 个税（应扣中已包含个税，需再次加上）
-                            totalPriceAndTax = getTotalPayable.subtract(totalDeduction).add(personalTax);
+                            totalPriceAndTax = totalPriceAndTax.add(getTotalPayable.subtract(totalDeduction).add(personalTax));
 
                             cumulativeTax = cumulativeTax.add(personalTax);//个税
 
@@ -1001,7 +1003,7 @@ public class SalaryManagementServiceImpl extends ServiceImpl<SalaryManagementMap
                     return Result.error("参数异常yearWith");
                 }
 
-                String newYear = String.valueOf(DateUtils.getYear());
+                String newYear = yearWith;//String.valueOf(DateUtils.getYear());
 
                 //年休工资单
                 List<SalaryManagementHoliday> holidayListMFY = new ArrayList<>();//马非羊
@@ -1034,7 +1036,10 @@ public class SalaryManagementServiceImpl extends ServiceImpl<SalaryManagementMap
                     String orgName = o.getOrgName();//组织
                     BigDecimal workingHours = o.getWorkingHours() == null ? new BigDecimal("22") : o.getWorkingHours();//每日工时
                     BigDecimal surplus = o.getSurplus() == null ? BigDecimal.ZERO : o.getSurplus();//剩余天数
-
+                    String name = o.getName();//用户主键
+//                    if(name.equals("屠嘉琪")){
+//                        System.out.println("11111111");
+//                    }
                     SalaryManagementHoliday salaryManagementHoliday = new SalaryManagementHoliday();
 
                     salaryManagementHoliday.setUserId(userId);
@@ -1053,7 +1058,7 @@ public class SalaryManagementServiceImpl extends ServiceImpl<SalaryManagementMap
 
                     //应发薪资 = 基本薪资/（单休26，双休22）*剩余年休
                     BigDecimal wages = new BigDecimal("0");
-                    wages = salaryBaseBig.divide(workingHours, 2, BigDecimal.ROUND_HALF_UP).multiply(surplus).setScale(2, BigDecimal.ROUND_HALF_UP);;
+                    wages = salaryBaseBig.divide(workingHours, 12, BigDecimal.ROUND_HALF_UP).multiply(surplus).setScale(2, BigDecimal.ROUND_HALF_UP);;
                     String wagesText = AesEncryptUtil.encrypt(wages.toString()).trim();
                     salaryManagementHoliday.setWages(wagesText);//应发薪资
                     salaryManagementHoliday.setPayTaxes(wagesText);//应纳税所得额
@@ -1100,7 +1105,7 @@ public class SalaryManagementServiceImpl extends ServiceImpl<SalaryManagementMap
 
                                 BigDecimal getTotalPayable = new BigDecimal(hisGetTotalPayable);//应发
 
-                                BigDecimal totalDeduction = detail.getTotalDeduction();//应扣
+                                BigDecimal totalDeduction = detail.getTotalDeduction().add(new BigDecimal("5000"));//应扣;//应扣
 
                                 //历史累计应纳税额 = 应发 - 应扣 + 个税（应扣中已包含个税，需再次加上）
                                 cumulative =  cumulative.add(getTotalPayable.subtract(totalDeduction).add(personalTax));
@@ -1355,7 +1360,7 @@ public class SalaryManagementServiceImpl extends ServiceImpl<SalaryManagementMap
 
                                 BigDecimal getTotalPayable = new BigDecimal(hisGetTotalPayable);//应发
 
-                                BigDecimal totalDeduction = detail.getTotalDeduction();//应扣
+                                BigDecimal totalDeduction = detail.getTotalDeduction().add(new BigDecimal("5000"));//应扣;//应扣
 
                                 //历史累计应纳税额 = 应发 - 应扣 + 个税（应扣中已包含个税，需再次加上）
                                 cumulative =  cumulative.add(getTotalPayable.subtract(totalDeduction).add(personalTax));