fix 修复bug

xiaoyi

4 天以前 05ab6e3f69a5e73624b2573db043f5923e8f7d8b

 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,10 +74,10 @@
    @PreAuthorize("@ss.hasPermission('safety:cert:query')")
    public CommonResult<PageResult<SafetyCertificateRespVO>> page(@Valid SafetyCertificatePageReqVO reqVO) {
        var page = certificateService.getCertificatePage(reqVO);
        // 批量补全持证人最新档案（姓名/工号/部门），一次性查好避免 N+1
        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.fillDisplayFieldsBatch(page.getList(), result.getList());
        return success(result);
    }

@@ -87,13 +87,12 @@
    @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()
                .map(cert -> {
                    var resp = BeanUtils.toBean(cert, SafetyCertificateRespVO.class);
                    SafetyCertificateService.fillDisplayFields(cert, resp);
                    return resp;
                }).toList();
        return success(list);
        List<cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyCertificateDO> certs =
                certificateService.getExpiringCertificates(days);
        certificateService.fillEmployeeInfo(certs);
        var resps = BeanUtils.toBean(certs, SafetyCertificateRespVO.class);
        certificateService.fillDisplayFieldsBatch(certs, resps);
        return success(resps);
    }

}