完善设备采集、安全管理及采购业务

xiaoyi

3 天以前 b5e1bceabb36fe1d1e5e88397280d12e7044c6dd

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyCertificateController.java

@@ -74,12 +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++) {
            certificateService.fillDisplayFields(page.getList().get(i), result.getList().get(i));
        }
        certificateService.fillDisplayFieldsBatch(page.getList(), result.getList());
        return success(result);
    }

@@ -92,13 +90,9 @@
        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);
                    certificateService.fillDisplayFields(cert, resp);
                    return resp;
                }).toList();
        return success(list);
        var resps = BeanUtils.toBean(certs, SafetyCertificateRespVO.class);
        certificateService.fillDisplayFieldsBatch(certs, resps);
        return success(resps);
    }

}