huminmin
13 小时以前 0bd6994efea85e468c06b58cd0395cd4066d31cd
根据单个员工计算工资
已修改2个文件
6 ■■■■■ 文件已修改
src/main/java/com/ruoyi/staff/service/impl/SchemeApplicableStaffServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/staff/service/impl/SchemeApplicableStaffServiceImpl.java
@@ -172,6 +172,7 @@
        boolean hasHourlySalaryInput = hasValue(map, "hourlySalary");
        boolean hasSocialPersonalInput = hasValue(map, "socialPersonal");
        boolean hasFundPersonalInput = hasValue(map, "fundPersonal");
        boolean hasSocialSupplementAmountInput = hasValue(map, "socialSupplementAmount");
        BigDecimal basicSalary = getBigDecimal(map, "basicSalary");
        BigDecimal dayDays = getBigDecimal(map, "dayDays");
@@ -182,6 +183,7 @@
        BigDecimal otherDeduct = getBigDecimal(map, "otherDeduct");
        BigDecimal socialPersonalInput = getBigDecimal(map, "socialPersonal");
        BigDecimal fundPersonalInput = getBigDecimal(map, "fundPersonal");
        BigDecimal socialSupplementAmountInput = getBigDecimal(map, "socialSupplementAmount");
        BigDecimal socialPersonal = BigDecimal.ZERO;
        BigDecimal fundPersonal = BigDecimal.ZERO;
        BigDecimal salaryTax = BigDecimal.ZERO;
@@ -348,6 +350,9 @@
                currentDetailList,
                currentMonthSocialPersonal
        );
        if (hasSocialSupplementAmountInput) {
            socialSupplementAmount = defaultIfNull(socialSupplementAmountInput);
        }
        BigDecimal totalSocialPersonal = currentMonthSocialPersonal.add(socialSupplementAmount);
        map.put("socialSupplementAmount", socialSupplementAmount);
        // 个税金额(社保版)
src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
@@ -155,6 +155,7 @@
        result.put("otherDeduct", calculateSalaryCalculateDto.getOtherDeduct());
        result.put("socialPersonal", calculateSalaryCalculateDto.getSocialPersonal());
        result.put("fundPersonal", calculateSalaryCalculateDto.getFundPersonal());
        result.put("socialSupplementAmount", calculateSalaryCalculateDto.getSocialSupplementAmount());
        result.put("salaryTax", calculateSalaryCalculateDto.getSalaryTax());
        result.put("grossSalary", calculateSalaryCalculateDto.getGrossSalary());
        result.put("deductSalary", calculateSalaryCalculateDto.getDeductSalary());