From b5e1bceabb36fe1d1e5e88397280d12e7044c6dd Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期五, 06 十一月 2026 15:32:31 +0800
Subject: [PATCH] 完善设备采集、安全管理及采购业务
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyCertificateController.java | 16 +++++-----------
1 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyCertificateController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyCertificateController.java
index 96c5d35..5ad6c65 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyCertificateController.java
+++ b/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);
}
}
--
Gitblit v1.9.3