修改了统计

yxh

2 天以前 a485c380200759905753498875dd260cce9cddf7

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java

@@ -11,6 +11,8 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.FunddetailReqVo;
import com.ruoyi.project.domain.ServiceFunddetail;
import com.ruoyi.project.domain.SpStatBonus;
import com.ruoyi.project.domain.SpStatBonusDept;
import com.ruoyi.project.domain.SpStatBonusReq;
import com.ruoyi.project.domain.vo.TaxMoneyByItemEO;
import com.ruoyi.project.domain.vo.TaxMoneySumEO;
@@ -22,6 +24,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.ZoneId;
import java.time.temporal.TemporalAdjusters;
@@ -87,6 +90,13 @@
    @PostMapping("/add")
    @NotRepeatCommit(key = "param:arg[1]", value = 30000)
    public AjaxResult add(@RequestBody ServiceFunddetail serviceFunddetail) {
        // 2026-10-15：附件文件名规范二次校验（与前端 opo-web/src/utils/fileNameCheck.js 同口径，
        // 目的是防止绕过前端直接调接口保存不合规附件名）。新增场景没有历史附件，用严格模式。
        String nameError = com.ruoyi.project.common.AttachmentNameValidator
                .checkJsonList(serviceFunddetail.getInvoicefiles(), serviceFunddetail.getAnnexfiles());
        if (nameError != null) {
            return AjaxResult.error("附件文件名不符合要求，无法保存：" + nameError);
        }
        boolean save = serviceFunddetailService.save(serviceFunddetail);
        return AjaxResult.success(serviceFunddetail);
    }
@@ -101,6 +111,24 @@
    @NotRepeatCommit(key = "param:arg[1]", value = 30000)
    public AjaxResult edit(@RequestBody ServiceFunddetail serviceFunddetail) {
        log.info("修改的数据信息：{}", serviceFunddetail);
        // 2026-10-15：附件文件名规范二次校验。修改场景按业务口径"只校验本次变更的附件"：
        // 保存前该明细已存在的历史附件名不参与校验，否则老单据（历史不合规名占比很高）改个金额都存不进去。
        java.util.Set<String> existingNames = new java.util.HashSet<>();
        if (serviceFunddetail.getId() != null) {
            ServiceFunddetail oldDetail = serviceFunddetailService.getById(serviceFunddetail.getId());
            if (oldDetail != null) {
                existingNames.addAll(com.ruoyi.project.common.AttachmentNameValidator
                        .collectNames(oldDetail.getInvoicefiles()));
                existingNames.addAll(com.ruoyi.project.common.AttachmentNameValidator
                        .collectNames(oldDetail.getAnnexfiles()));
            }
        }
        String nameError = com.ruoyi.project.common.AttachmentNameValidator
                .checkJsonListForUpdate(existingNames, serviceFunddetail.getInvoicefiles(),
                        serviceFunddetail.getAnnexfiles());
        if (nameError != null) {
            return AjaxResult.error("附件文件名不符合要求，无法保存：" + nameError);
        }
        return toAjax(serviceFunddetailService.updateById(serviceFunddetail));
    }

@@ -195,4 +223,71 @@
        startPage();
        return getDataTable(serviceFunddetailService.getListBySpStatBonus(spStatBonusReq));
    }

    /**
     * 导出绩效奖金统计
     */
    @ApiOperation("导出绩效奖金统计")
    @Log(title = "绩效统计", businessType = BusinessType.EXPORT)
    @GetMapping("/exportBonus")
    public AjaxResult exportBonus(SpStatBonusReq spStatBonusReq) {
        List<SpStatBonus> list = serviceFunddetailService.getListBySpStatBonus(spStatBonusReq);
        // 金额 0.00 不显示
        for (SpStatBonus row : list) {
            row.setAmount(blankZero(row.getAmount()));
            row.setMamount(blankZero(row.getMamount()));
            row.setSamount(blankZero(row.getSamount()));
            row.setYamount(blankZero(row.getYamount()));
        }
        ExcelUtil<SpStatBonus> util = new ExcelUtil<SpStatBonus>(SpStatBonus.class);
        return util.exportExcel(list, "绩效统计数据");
    }

    /**
     * 导出绩效统计（按业务组）
     */
    @ApiOperation("导出绩效统计（按业务组）")
    @Log(title = "绩效统计", businessType = BusinessType.EXPORT)
    @GetMapping("/exportBonusDept")
    public AjaxResult exportBonusDept(SpStatBonusReq spStatBonusReq) {
        List<SpStatBonus> list = serviceFunddetailService.getListBySpStatBonus(spStatBonusReq);
        Map<String, SpStatBonusDept> grouped = new LinkedHashMap<String, SpStatBonusDept>();
        for (SpStatBonus row : list) {
            String key = row.getDeptId() != null ? String.valueOf(row.getDeptId()) : row.getDeptName();
            if (key == null) {
                key = "";
            }
            SpStatBonusDept dept = grouped.get(key);
            if (dept == null) {
                dept = new SpStatBonusDept();
                dept.setDeptname(row.getDeptName() == null ? "未分组" : row.getDeptName());
                dept.setAmount(BigDecimal.ZERO);
                dept.setMamount(BigDecimal.ZERO);
                dept.setSamount(BigDecimal.ZERO);
                dept.setYamount(BigDecimal.ZERO);
                grouped.put(key, dept);
            }
            dept.setAmount(dept.getAmount().add(nz(row.getAmount())));
            dept.setMamount(dept.getMamount().add(nz(row.getMamount())));
            dept.setSamount(dept.getSamount().add(nz(row.getSamount())));
            dept.setYamount(dept.getYamount().add(nz(row.getYamount())));
        }
        List<SpStatBonusDept> result = new ArrayList<SpStatBonusDept>(grouped.values());
        for (SpStatBonusDept dept : result) {
            dept.setAmount(blankZero(dept.getAmount()));
            dept.setMamount(blankZero(dept.getMamount()));
            dept.setSamount(blankZero(dept.getSamount()));
            dept.setYamount(blankZero(dept.getYamount()));
        }
        ExcelUtil<SpStatBonusDept> util = new ExcelUtil<SpStatBonusDept>(SpStatBonusDept.class);
        return util.exportExcel(result, "绩效统计（按业务组）");
    }

    private BigDecimal nz(BigDecimal value) {
        return value == null ? BigDecimal.ZERO : value;
    }

    private BigDecimal blankZero(BigDecimal value) {
        return (value == null || value.compareTo(BigDecimal.ZERO) == 0) ? null : value;
    }
}