xiaoyi
2026-10-29 81c76ca9e4741b71747b16eec61d0a00bec9f1f3
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyCertificateController.java
@@ -65,7 +65,7 @@
    public CommonResult<SafetyCertificateRespVO> get(@RequestParam("id") Long id) {
        var cert = certificateService.getCertificate(id);
        var resp = BeanUtils.toBean(cert, SafetyCertificateRespVO.class);
        SafetyCertificateService.fillDisplayFields(cert, resp);
        certificateService.fillDisplayFields(cert, resp);
        return success(resp);
    }
@@ -74,9 +74,11 @@
    @PreAuthorize("@ss.hasPermission('safety:cert:query')")
    public CommonResult<PageResult<SafetyCertificateRespVO>> page(@Valid SafetyCertificatePageReqVO reqVO) {
        var page = certificateService.getCertificatePage(reqVO);
        // 批量补全持证人最新档案(姓名/工号/部门),避免逐条查询
        certificateService.fillEmployeeInfo(page.getList());
        var result = BeanUtils.toBean(page, SafetyCertificateRespVO.class);
        for (int i = 0; i < page.getList().size(); i++) {
            SafetyCertificateService.fillDisplayFields(page.getList().get(i), result.getList().get(i));
            certificateService.fillDisplayFields(page.getList().get(i), result.getList().get(i));
        }
        return success(result);
    }
@@ -87,10 +89,13 @@
    @PreAuthorize("@ss.hasPermission('safety:cert:query')")
    public CommonResult<List<SafetyCertificateRespVO>> expiringList(
            @RequestParam(value = "days", required = false) Integer days) {
        List<SafetyCertificateRespVO> list = certificateService.getExpiringCertificates(days).stream()
        List<cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyCertificateDO> certs =
                certificateService.getExpiringCertificates(days);
        certificateService.fillEmployeeInfo(certs);
        List<SafetyCertificateRespVO> list = certs.stream()
                .map(cert -> {
                    var resp = BeanUtils.toBean(cert, SafetyCertificateRespVO.class);
                    SafetyCertificateService.fillDisplayFields(cert, resp);
                    certificateService.fillDisplayFields(cert, resp);
                    return resp;
                }).toList();
        return success(list);