feat: 添加加班时长和加班工资字段到员工工资明细

yuan

3 小时以前 ef1052e7bf9bf1765d61776bc49ce69a23c6cdee

 src/main/java/com/ruoyi/staff/service/impl/SchemeApplicableStaffServiceImpl.java

@@ -174,6 +174,8 @@
                : calculateLatestDeptSocialSupplementAmount(staffOnJobDto);
        BigDecimal pieceSalary = normalizeMoney(getBigDecimal(map, "pieceSalary"));
        BigDecimal hourlySalary = normalizeMoney(getBigDecimal(map, "hourlySalary"));
        // 加班工资：手工填写，不按倍率自动计算
        BigDecimal overtimePay = normalizeMoney(getBigDecimal(map, "overtimePay"));
        BigDecimal socialPersonal = BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP);
        BigDecimal fundPersonal = BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP);

@@ -204,7 +206,7 @@
            }
        }

        BigDecimal grossSalary = basicSalary.add(pieceSalary).add(hourlySalary).add(otherIncome);
        BigDecimal grossSalary = basicSalary.add(pieceSalary).add(hourlySalary).add(overtimePay).add(otherIncome);
        BigDecimal salaryTax = TaxCalculator.calculateMonthlyTax(
                grossSalary,
                socialPersonal.add(socialSupplementAmount),
@@ -215,7 +217,7 @@
                .add(socialPersonal)
                .add(socialSupplementAmount)
                .add(otherDeduct);
        // 扣工资（手动填写），从实发工资中扣除
        // 应扣工资（手动填写），从实发工资中扣除
        BigDecimal manualDeduct = normalizeMoney(getBigDecimal(map, "manualDeduct"));
        BigDecimal netSalary = grossSalary.subtract(deductSalary).subtract(manualDeduct);

@@ -231,6 +233,8 @@
        map.put("basicSalary", basicSalary);
        map.put("pieceSalary", pieceSalary);
        map.put("hourlySalary", hourlySalary);
        map.put("overtimeHours", salaryStat.getOvertimeHours());
        map.put("overtimePay", overtimePay);
        map.put("otherIncome", otherIncome);
        map.put("socialPersonal", socialPersonal);
        map.put("fundPersonal", fundPersonal);