feat: 添加员工工资明细中的请假、缺勤、迟到、早退次数及手动扣工资字段

yuan

14 小时以前 d476e7d1595e131f2bb7bb1a62c00fa3e82fb0a7

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

@@ -13,6 +13,7 @@
import com.ruoyi.project.system.mapper.SysDeptMapper;
import com.ruoyi.project.system.mapper.SysUserMapper;
import com.ruoyi.staff.controller.TaxCalculator;
import com.ruoyi.staff.dto.SalaryStat;
import com.ruoyi.staff.mapper.SchemeApplicableStaffMapper;
import com.ruoyi.staff.mapper.SchemeInsuranceDetailMapper;
import com.ruoyi.staff.mapper.StaffOnJobMapper;
@@ -50,6 +51,7 @@
    private final SysDeptMapper sysDeptMapper;
    private final StaffOnJobMapper staffOnJobMapper;
    private final SalesLedgerProductionAccountingService salesLedgerProductionAccountingService;
    private final SalaryStatServiceImpl salaryStatService;


    @Override
@@ -213,7 +215,12 @@
                .add(socialPersonal)
                .add(socialSupplementAmount)
                .add(otherDeduct);
        BigDecimal netSalary = grossSalary.subtract(deductSalary);
        // 应扣工资（手动填写），从实发工资中扣除
        BigDecimal manualDeduct = normalizeMoney(getBigDecimal(map, "manualDeduct"));
        BigDecimal netSalary = grossSalary.subtract(deductSalary).subtract(manualDeduct);

        // 请假次数、缺勤次数、迟到次数、早退次数，请假原因自动带入备注（备注已填写时保留原备注）
        SalaryStat salaryStat = salaryStatService.stat(staffId, staffOnJobDto.getStaffName(), date);

        if (!hasText(map, "staffName")) {
            map.put("staffName", staffOnJobDto.getStaffName());
@@ -232,7 +239,15 @@
        map.put("grossSalary", grossSalary);
        map.put("salaryTax", salaryTax);
        map.put("deductSalary", deductSalary);
        map.put("leaveCount", salaryStat.getLeaveCount());
        map.put("absenceCount", salaryStat.getAbsenceCount());
        map.put("lateCount", salaryStat.getLateCount());
        map.put("earlyCount", salaryStat.getEarlyCount());
        map.put("manualDeduct", manualDeduct);
        map.put("netSalary", netSalary);
        if (!hasText(map, "remark") && StringUtils.isNotEmpty(salaryStat.getLeaveReason())) {
            map.put("remark", salaryStat.getLeaveReason());
        }
    }

    /**