From 81c76ca9e4741b71747b16eec61d0a00bec9f1f3 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期四, 29 十月 2026 11:14:19 +0800
Subject: [PATCH] fix(safety): 特种作业证持证人改为关联员工档案，不再手填姓名
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyCertificateController.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 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 045c083..96c5d35 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
@@ -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);
--
Gitblit v1.9.3