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): 特种作业证持证人改为关联员工档案,不再手填姓名
---
sql/mysql/safety_certificate_employee_20261029.sql | 42 ++++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/cert/SafetyCertificateSaveReqVO.java | 18 -
yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/api/employee/dto/HrmEmployeeSimpleDTO.java | 57 ++++++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyCertificateDO.java | 12 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/SafetyErrorCodeConstants.java | 1
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/cert/SafetyCertificatePageReqVO.java | 5
yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/api/employee/HrmEmployeeApi.java | 42 ++++++
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/api/employee/HrmEmployeeApiImpl.java | 82 +++++++++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyCertificateController.java | 13 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyCertificateService.java | 74 ++++++++-
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyLedgerExportService.java | 6
yudao-module-mes/pom.xml | 6
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/cert/SafetyCertificateRespVO.java | 5
13 files changed, 329 insertions(+), 34 deletions(-)
diff --git a/sql/mysql/safety_certificate_employee_20261029.sql b/sql/mysql/safety_certificate_employee_20261029.sql
new file mode 100644
index 0000000..7b030c0
--- /dev/null
+++ b/sql/mysql/safety_certificate_employee_20261029.sql
@@ -0,0 +1,42 @@
+-- ============================================================
+-- 瀹夊叏鐢熶骇 - 鐗圭浣滀笟璇佹寔璇佷汉鏀逛负鍏宠仈鍛樺伐妗f
+-- 鐢熸垚鏃堕棿锛�2026-10-29
+-- 鑳屾櫙锛氬師璁捐鎶婃寔璇佷汉鍋氭垚绾枃鏈鍚嶏紙employee_name / employee_no / dept_name锛夛紝
+-- 鏃犳硶涓庝汉鍔涜祫婧愮殑鍛樺伐妗f銆佺郴缁熺敤鎴锋墦閫氥��
+-- 鍋氭硶锛氭柊澧� employee_id 鍏宠仈 hrm_employee.id锛屽鍚�/宸ュ彿/閮ㄩ棬鏀逛负鍛樺伐妗f甯﹀嚭锛�
+-- 鏃ф枃鏈瓧娈典繚鐣欎负蹇収锛屼究浜庡憳宸ユ。妗堝彉鏇村悗浠嶅彲杩芥函寮�璇佹椂鐨勪汉浜嬩俊鎭��
+-- 璇存槑锛氬箓绛夛紝鍙噸澶嶆墽琛�
+-- ============================================================
+
+-- ---------- 1. 鏂板 employee_id 瀛楁 ----------
+SET @exist_col = (SELECT COUNT(*) FROM information_schema.columns
+ WHERE table_schema = DATABASE() AND table_name = 'safety_certificate' AND column_name = 'employee_id');
+SET @sql = IF(@exist_col = 0,
+ 'ALTER TABLE `safety_certificate` ADD COLUMN `employee_id` bigint NULL COMMENT ''鎸佽瘉浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛�'' AFTER `id`',
+ 'SELECT 1');
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+-- ---------- 2. 绱㈠紩 ----------
+SET @exist_idx = (SELECT COUNT(*) FROM information_schema.statistics
+ WHERE table_schema = DATABASE() AND table_name = 'safety_certificate' AND index_name = 'idx_employee_id');
+SET @sql2 = IF(@exist_idx = 0,
+ 'CREATE INDEX `idx_employee_id` ON `safety_certificate` (`employee_id`)',
+ 'SELECT 1');
+PREPARE stmt2 FROM @sql2;
+EXECUTE stmt2;
+DEALLOCATE PREPARE stmt2;
+
+-- ---------- 3. 鍘熶笁鍒楁敼涓哄揩鐓ц涔夛紙淇濈暀锛屼笉鍐嶄綔涓哄敮涓�鏉ユ簮锛� ----------
+ALTER TABLE `safety_certificate`
+ MODIFY COLUMN `employee_name` varchar(50) NULL COMMENT '鎸佽瘉浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛�',
+ MODIFY COLUMN `employee_no` varchar(50) NULL COMMENT '宸ュ彿锛堝揩鐓э紝鐢卞憳宸ユ。妗堝甫鍑猴級',
+ MODIFY COLUMN `dept_name` varchar(100) NULL COMMENT '鎵�灞為儴闂紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛�';
+
+-- ---------- 4. 鏍¢獙 ----------
+SELECT COLUMN_NAME, COLUMN_TYPE, IS_NULLABLE, COLUMN_COMMENT
+ FROM information_schema.columns
+ WHERE table_schema = DATABASE() AND table_name = 'safety_certificate'
+ AND COLUMN_NAME IN ('employee_id', 'employee_name', 'employee_no', 'dept_name')
+ ORDER BY ORDINAL_POSITION;
diff --git a/yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/api/employee/HrmEmployeeApi.java b/yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/api/employee/HrmEmployeeApi.java
new file mode 100644
index 0000000..0f28474
--- /dev/null
+++ b/yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/api/employee/HrmEmployeeApi.java
@@ -0,0 +1,42 @@
+package cn.iocoder.yudao.module.hrm.api.employee;
+
+import cn.iocoder.yudao.module.hrm.api.employee.dto.HrmEmployeeSimpleDTO;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 鍛樺伐妗f API 鎺ュ彛
+ *
+ * <p>鎻愪緵缁欏叾浠栨ā鍧楄法妯″潡鏌ヨ鍛樺伐绮剧畝淇℃伅锛�
+ * 渚嬪瀹夊叏鐢熶骇妯″潡鐨勭壒绉嶄綔涓氳瘉闇�瑕佸叧鑱旀寔璇佷汉銆�</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+public interface HrmEmployeeApi {
+
+ /**
+ * 鑾峰彇鍛樺伐绮剧畝淇℃伅
+ *
+ * @param id 鍛樺伐缂栧彿
+ * @return 鍛樺伐淇℃伅锛屼笉瀛樺湪杩斿洖 null
+ */
+ HrmEmployeeSimpleDTO getEmployee(Long id);
+
+ /**
+ * 鎵归噺鑾峰彇鍛樺伐绮剧畝淇℃伅
+ *
+ * @param ids 鍛樺伐缂栧彿闆嗗悎
+ * @return 鍛樺伐淇℃伅鍒楄〃
+ */
+ List<HrmEmployeeSimpleDTO> getEmployeeList(Collection<Long> ids);
+
+ /**
+ * 鏍¢獙鍛樺伐鏄惁瀛樺湪锛堜笖鏈垹闄わ級
+ *
+ * @param id 鍛樺伐缂栧彿
+ * @return 鏄惁瀛樺湪
+ */
+ boolean validateEmployeeExists(Long id);
+
+}
diff --git a/yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/api/employee/dto/HrmEmployeeSimpleDTO.java b/yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/api/employee/dto/HrmEmployeeSimpleDTO.java
new file mode 100644
index 0000000..f934b8c
--- /dev/null
+++ b/yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/api/employee/dto/HrmEmployeeSimpleDTO.java
@@ -0,0 +1,57 @@
+package cn.iocoder.yudao.module.hrm.api.employee.dto;
+
+import lombok.Data;
+
+/**
+ * 鍛樺伐绮剧畝淇℃伅 DTO
+ *
+ * <p>渚涘叾浠栨ā鍧楋紙濡傚畨鍏ㄧ敓浜фā鍧楃殑鐗圭浣滀笟璇侊級鍏宠仈鍛樺伐妗f鏃朵娇鐢ㄣ��</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Data
+public class HrmEmployeeSimpleDTO {
+
+ /**
+ * 鍛樺伐缂栧彿
+ */
+ private Long id;
+
+ /**
+ * 鍏宠仈鐨勭郴缁熺敤鎴风紪鍙�
+ *
+ * 鍏宠仈 AdminUserDO#getId()
+ */
+ private Long userId;
+
+ /**
+ * 鍛樺伐缂栧彿锛堝伐鍙凤級
+ */
+ private String employeeNo;
+
+ /**
+ * 鍛樺伐濮撳悕
+ */
+ private String name;
+
+ /**
+ * 閮ㄩ棬缂栧彿
+ */
+ private Long deptId;
+
+ /**
+ * 閮ㄩ棬鍚嶇О
+ */
+ private String deptName;
+
+ /**
+ * 鎵嬫満鍙风爜
+ */
+ private String phone;
+
+ /**
+ * 鍛樺伐鐘舵�侊細1-鍦ㄨ亴锛�2-璇曠敤锛�3-绂昏亴
+ */
+ private Integer employeeStatus;
+
+}
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/api/employee/HrmEmployeeApiImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/api/employee/HrmEmployeeApiImpl.java
new file mode 100644
index 0000000..26a84e4
--- /dev/null
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/api/employee/HrmEmployeeApiImpl.java
@@ -0,0 +1,82 @@
+package cn.iocoder.yudao.module.hrm.api.employee;
+
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.hrm.api.employee.dto.HrmEmployeeSimpleDTO;
+import cn.iocoder.yudao.module.hrm.dal.dataobject.employee.HrmEmployeeDO;
+import cn.iocoder.yudao.module.hrm.dal.mysql.employee.HrmEmployeeMapper;
+import cn.iocoder.yudao.module.system.api.dept.DeptApi;
+import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * 鍛樺伐妗f API 瀹炵幇绫�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Service
+public class HrmEmployeeApiImpl implements HrmEmployeeApi {
+
+ @Resource
+ private HrmEmployeeMapper employeeMapper;
+ @Resource
+ private DeptApi deptApi;
+
+ @Override
+ public HrmEmployeeSimpleDTO getEmployee(Long id) {
+ if (id == null) {
+ return null;
+ }
+ HrmEmployeeDO employee = employeeMapper.selectById(id);
+ if (employee == null) {
+ return null;
+ }
+ return build(employee, getDeptName(employee.getDeptId()));
+ }
+
+ @Override
+ public List<HrmEmployeeSimpleDTO> getEmployeeList(Collection<Long> ids) {
+ if (ids == null || ids.isEmpty()) {
+ return List.of();
+ }
+ List<HrmEmployeeDO> employees = employeeMapper.selectBatchIds(ids);
+ if (employees.isEmpty()) {
+ return List.of();
+ }
+ // 鎵归噺鏌ラ儴闂紝閬垮厤 N+1
+ List<Long> deptIds = employees.stream().map(HrmEmployeeDO::getDeptId)
+ .filter(Objects::nonNull).distinct().toList();
+ Map<Long, DeptRespDTO> deptMap = deptIds.isEmpty() ? Map.of() : deptApi.getDeptMap(deptIds);
+ return employees.stream()
+ .map(e -> {
+ DeptRespDTO dept = deptMap.get(e.getDeptId());
+ return build(e, dept == null ? null : dept.getName());
+ })
+ .toList();
+ }
+
+ @Override
+ public boolean validateEmployeeExists(Long id) {
+ return id != null && employeeMapper.selectById(id) != null;
+ }
+
+ private String getDeptName(Long deptId) {
+ if (deptId == null) {
+ return null;
+ }
+ DeptRespDTO dept = deptApi.getDept(deptId);
+ return dept == null ? null : dept.getName();
+ }
+
+ private static HrmEmployeeSimpleDTO build(HrmEmployeeDO employee, String deptName) {
+ HrmEmployeeSimpleDTO dto = BeanUtils.toBean(employee, HrmEmployeeSimpleDTO.class);
+ dto.setDeptName(deptName);
+ return dto;
+ }
+
+}
diff --git a/yudao-module-mes/pom.xml b/yudao-module-mes/pom.xml
index b6466c2..c803320 100644
--- a/yudao-module-mes/pom.xml
+++ b/yudao-module-mes/pom.xml
@@ -29,6 +29,12 @@
<artifactId>yudao-module-infra</artifactId>
<version>${revision}</version>
</dependency>
+ <!-- hrm-api锛氱壒绉嶄綔涓氳瘉鎸佽瘉浜哄叧鑱斿憳宸ユ。妗� -->
+ <dependency>
+ <groupId>cn.iocoder.boot</groupId>
+ <artifactId>yudao-module-hrm-api</artifactId>
+ <version>${revision}</version>
+ </dependency>
<!-- MES 鍒堕�犳墽琛� API -->
<dependency>
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);
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/cert/SafetyCertificatePageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/cert/SafetyCertificatePageReqVO.java
index 9c3d225..6281635 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/cert/SafetyCertificatePageReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/cert/SafetyCertificatePageReqVO.java
@@ -18,7 +18,10 @@
@EqualsAndHashCode(callSuper = true)
public class SafetyCertificatePageReqVO extends PageParam {
- @Schema(description = "鎸佽瘉浜哄鍚�")
+ @Schema(description = "鎸佽瘉浜猴紙鍛樺伐缂栧彿锛�")
+ private Long employeeId;
+
+ @Schema(description = "鎸佽瘉浜哄鍚嶏紙妯$硦鍖归厤锛�")
private String employeeName;
@Schema(description = "宸ュ彿")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/cert/SafetyCertificateRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/cert/SafetyCertificateRespVO.java
index 212e322..5f3d8f8 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/cert/SafetyCertificateRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/cert/SafetyCertificateRespVO.java
@@ -16,9 +16,14 @@
public class SafetyCertificateRespVO {
private Long id;
+ @Schema(description = "鎸佽瘉浜猴紙鍛樺伐缂栧彿锛�")
+ private Long employeeId;
+ @Schema(description = "鎸佽瘉浜哄叧鑱旂殑绯荤粺鐢ㄦ埛缂栧彿")
+ private Long userId;
private String employeeName;
private String employeeNo;
private String deptName;
+ private String phone;
private String certType;
@Schema(description = "璇佷欢绫诲瀷鍚嶇О")
private String certTypeName;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/cert/SafetyCertificateSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/cert/SafetyCertificateSaveReqVO.java
index d7bf210..b6881a7 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/cert/SafetyCertificateSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/cert/SafetyCertificateSaveReqVO.java
@@ -10,6 +10,9 @@
/**
* 瀹夊叏鐢熶骇 - 鐗圭浣滀笟璇佹柊澧�/淇敼 Request VO
*
+ * <p>鎸佽瘉浜洪�氳繃 employeeId 鍏宠仈鍛樺伐妗f锛屽鍚嶄笌閮ㄩ棬鐢卞悗绔粠妗f甯﹀嚭锛�
+ * 鍓嶇鍙渶閫変汉锛屼笉鎵嬪伐濉啓锛岄伩鍏嶄笌浜哄姏璧勬簮鏁版嵁涓嶄竴鑷淬��</p>
+ *
* @author 瓒呯骇绠$悊鍛�
*/
@Schema(description = "绠$悊鍚庡彴 - 鐗圭浣滀笟璇佹柊澧�/淇敼 Request VO")
@@ -18,18 +21,9 @@
private Long id;
- @Schema(description = "鎸佽瘉浜哄鍚�", requiredMode = Schema.RequiredMode.REQUIRED, example = "寮犱笁")
- @NotBlank(message = "鎸佽瘉浜哄鍚嶄笉鑳戒负绌�")
- @Size(max = 50)
- private String employeeName;
-
- @Schema(description = "宸ュ彿", example = "EMP001")
- @Size(max = 50)
- private String employeeNo;
-
- @Schema(description = "鎵�灞為儴闂�", example = "鐢垫皵杞﹂棿")
- @Size(max = 100)
- private String deptName;
+ @Schema(description = "鎸佽瘉浜猴紙鍛樺伐缂栧彿锛�", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+ @NotNull(message = "璇烽�夋嫨鎸佽瘉浜�")
+ private Long employeeId;
@Schema(description = "璇佷欢绫诲瀷", requiredMode = Schema.RequiredMode.REQUIRED, example = "HIGH_VOLTAGE_OPERATION")
@NotBlank(message = "璇佷欢绫诲瀷涓嶈兘涓虹┖")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyCertificateDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyCertificateDO.java
index 8f45faa..8eb951c 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyCertificateDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyCertificateDO.java
@@ -22,11 +22,17 @@
@TableId
private Long id;
- /** 鎸佽瘉浜哄鍚� */
+ /**
+ * 鎸佽瘉浜猴紙鍛樺伐缂栧彿锛�
+ *
+ * 鍏宠仈 HrmEmployeeDO#getId()锛屽鍚�/宸ュ彿/閮ㄩ棬鍧囩敱姝ゅ叧鑱斿甫鍑�
+ */
+ private Long employeeId;
+ /** 鎸佽瘉浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛岀敤浜庡憳宸ユ。妗堝彉鏇村悗杩芥函寮�璇佹椂淇℃伅锛� */
private String employeeName;
- /** 宸ュ彿 */
+ /** 宸ュ彿锛堝揩鐓э級 */
private String employeeNo;
- /** 鎵�灞為儴闂� */
+ /** 鎵�灞為儴闂紙蹇収锛� */
private String deptName;
/** 璇佷欢绫诲瀷锛岃 SafetyCertificateTypeEnum */
private String certType;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/SafetyErrorCodeConstants.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/SafetyErrorCodeConstants.java
index 9de95d8..c9cd2ab 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/SafetyErrorCodeConstants.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/SafetyErrorCodeConstants.java
@@ -22,6 +22,7 @@
ErrorCode SAFETY_CERT_NOT_EXISTS = new ErrorCode(1_040_962_000, "鐗圭浣滀笟璇佷笉瀛樺湪");
ErrorCode SAFETY_CERT_NO_DUPLICATE = new ErrorCode(1_040_962_001, "璇佷欢缂栧彿宸插瓨鍦�");
ErrorCode SAFETY_CERT_EXPIRE_BEFORE_ISSUE = new ErrorCode(1_040_962_002, "鏈夋晥鏈熶笉鑳芥棭浜庡彂璇佹棩鏈�");
+ ErrorCode SAFETY_CERT_EMPLOYEE_NOT_EXISTS = new ErrorCode(1_040_962_003, "鎸佽瘉浜轰笉瀛樺湪锛岃浠庡憳宸ユ。妗堜腑閫夋嫨");
// ========== 宸℃鐐逛綅 / 宸℃璁板綍 1_040_963_xxx ==========
ErrorCode SAFETY_POINT_NOT_EXISTS = new ErrorCode(1_040_963_000, "宸℃鐐逛綅涓嶅瓨鍦�");
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyCertificateService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyCertificateService.java
index 84f7a7f..575cddb 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyCertificateService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyCertificateService.java
@@ -1,8 +1,11 @@
package cn.iocoder.yudao.module.mes.service.safety;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.hrm.api.employee.HrmEmployeeApi;
+import cn.iocoder.yudao.module.hrm.api.employee.dto.HrmEmployeeSimpleDTO;
import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.cert.SafetyCertificatePageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.cert.SafetyCertificateRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.cert.SafetyCertificateSaveReqVO;
@@ -17,7 +20,9 @@
import java.time.LocalDate;
import java.time.temporal.ChronoUnit;
import java.util.List;
+import java.util.Map;
import java.util.Objects;
+import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.mes.enums.SafetyErrorCodeConstants.*;
@@ -27,6 +32,10 @@
*
* <p>鏍稿績鑳藉姏锛氳瘉涔﹀埌鏈熻嚜鍔ㄩ璀︺�傜姸鎬佺敱 {@link #resolveStatus} 鏍规嵁鏈夋晥鏈熷疄鏃舵帹瀵硷紝
* 涓嶄緷璧栨墜宸ョ淮鎶わ紝閬垮厤杩囨湡鏈強鏃舵洿鏂扮姸鎬併��</p>
+ *
+ * <p>鎸佽瘉浜洪�氳繃 employeeId 鍏宠仈浜哄姏璧勬簮鐨勫憳宸ユ。妗堬細
+ * 鏂板/淇敼鏃朵粠妗f甯﹀嚭濮撳悕銆佸伐鍙枫�侀儴闂ㄥ苟钀戒负蹇収锛涙煡璇㈡椂瀹炴椂鍥炲~鏈�鏂版。妗堜俊鎭紝
+ * 鍛樺伐璋冨矖鍚庤瘉浠跺垪琛ㄤ篃浼氳窡鐫�鏄剧ず鏂伴儴闂ㄣ��</p>
*
* @author 瓒呯骇绠$悊鍛�
*/
@@ -39,11 +48,13 @@
@Resource
private SafetyCertificateMapper certificateMapper;
+ @Resource
+ private HrmEmployeeApi hrmEmployeeApi;
public Long createCertificate(SafetyCertificateSaveReqVO reqVO) {
reqVO.setId(null);
validateCertificateForCreate(reqVO);
- SafetyCertificateDO cert = buildCertificate(reqVO);
+ SafetyCertificateDO cert = buildCertificate(reqVO, null);
certificateMapper.insert(cert);
return cert.getId();
}
@@ -51,7 +62,7 @@
public void updateCertificate(SafetyCertificateSaveReqVO reqVO) {
SafetyCertificateDO old = validateCertificateExists(reqVO.getId());
validateCertificateForUpdate(reqVO, old);
- SafetyCertificateDO cert = buildCertificate(reqVO);
+ SafetyCertificateDO cert = buildCertificate(reqVO, old);
certificateMapper.updateById(cert);
}
@@ -79,15 +90,47 @@
}
/**
- * 鍒嗛〉缁撴灉鐨勫睍绀哄瓧娈佃ˉ鍏紙绫诲瀷鍚嶇О銆佺姸鎬佸悕绉般�佸墿浣欏ぉ鏁帮級
+ * 鎵归噺琛ュ叏鎸佽瘉浜虹殑鏈�鏂板憳宸ユ。妗堜俊鎭紙濮撳悕銆佸伐鍙枫�侀儴闂ㄣ�佹墜鏈恒�佸叧鑱旂敤鎴凤級
+ *
+ * <p>鏌ヨ鏃剁敤妗f瀹炴椂鍊艰鐩栧揩鐓у�硷紝淇濊瘉鍛樺伐璋冨矖鍚庡彴璐﹀悓姝ワ紱
+ * 鍛樺伐妗f宸茶鍒犻櫎鏃跺洖閫�鍒板揩鐓у�硷紝淇濊瘉鍘嗗彶璇佷欢浠嶅彲灞曠ず銆�</p>
*/
- public static void fillDisplayFields(SafetyCertificateDO cert, SafetyCertificateRespVO respVO) {
+ public void fillEmployeeInfo(List<SafetyCertificateDO> certs) {
+ List<Long> employeeIds = certs.stream()
+ .map(SafetyCertificateDO::getEmployeeId)
+ .filter(Objects::nonNull).distinct().toList();
+ Map<Long, HrmEmployeeSimpleDTO> employeeMap = employeeIds.isEmpty() ? Map.of()
+ : hrmEmployeeApi.getEmployeeList(employeeIds).stream()
+ .collect(Collectors.toMap(HrmEmployeeSimpleDTO::getId, e -> e, (a, b) -> a));
+ certs.forEach(cert -> {
+ HrmEmployeeSimpleDTO employee = employeeMap.get(cert.getEmployeeId());
+ if (employee != null) {
+ cert.setEmployeeName(employee.getName());
+ cert.setEmployeeNo(employee.getEmployeeNo());
+ cert.setDeptName(employee.getDeptName());
+ }
+ });
+ }
+
+ /**
+ * 鍗曚釜璇佷欢鐨勫睍绀哄瓧娈佃ˉ鍏紙绫诲瀷鍚嶇О銆佺姸鎬佸悕绉般�佸墿浣欏ぉ鏁般�佹寔璇佷汉妗f锛�
+ */
+ public void fillDisplayFields(SafetyCertificateDO cert, SafetyCertificateRespVO respVO) {
respVO.setCertTypeName(SafetyCertificateTypeEnum.getNameByType(cert.getCertType()));
String status = resolveStatus(cert.getExpireDate(), cert.getWarnDays(), cert.getStatus());
respVO.setStatus(status);
respVO.setStatusName(SafetyCertificateStatusEnum.getNameByStatus(status));
if (cert.getExpireDate() != null) {
respVO.setRemainingDays(ChronoUnit.DAYS.between(LocalDate.now(), cert.getExpireDate()));
+ }
+ HrmEmployeeSimpleDTO employee = cert.getEmployeeId() == null ? null
+ : hrmEmployeeApi.getEmployee(cert.getEmployeeId());
+ if (employee != null) {
+ respVO.setEmployeeName(employee.getName());
+ respVO.setEmployeeNo(employee.getEmployeeNo());
+ respVO.setDeptName(employee.getDeptName());
+ respVO.setPhone(employee.getPhone());
+ respVO.setUserId(employee.getUserId());
}
}
@@ -116,12 +159,24 @@
return SafetyCertificateStatusEnum.VALID.getStatus();
}
- private SafetyCertificateDO buildCertificate(SafetyCertificateSaveReqVO reqVO) {
+ /**
+ * 鏋勫缓 DO锛氭寔璇佷汉濮撳悕/宸ュ彿/閮ㄩ棬浠庡憳宸ユ。妗堝甫鍑哄苟钀戒负蹇収
+ */
+ private SafetyCertificateDO buildCertificate(SafetyCertificateSaveReqVO reqVO, SafetyCertificateDO old) {
+ HrmEmployeeSimpleDTO employee = hrmEmployeeApi.getEmployee(reqVO.getEmployeeId());
+ if (employee == null) {
+ throw exception(SAFETY_CERT_EMPLOYEE_NOT_EXISTS);
+ }
SafetyCertificateDO cert = BeanUtils.toBean(reqVO, SafetyCertificateDO.class);
- cert.setEmployeeName(StrUtil.trim(reqVO.getEmployeeName()));
+ cert.setEmployeeId(employee.getId());
+ cert.setEmployeeName(employee.getName());
+ cert.setEmployeeNo(employee.getEmployeeNo());
+ cert.setDeptName(employee.getDeptName());
cert.setCertNo(StrUtil.trim(reqVO.getCertNo()));
cert.setWarnDays(reqVO.getWarnDays() == null ? DEFAULT_WARN_DAYS : reqVO.getWarnDays());
- cert.setStatus(resolveStatus(reqVO.getExpireDate(), cert.getWarnDays(), reqVO.getStatus()));
+ // 宸叉敞閿�鐘舵�佷笉鍏佽閫氳繃缂栬緫鏀瑰洖
+ String currentStatus = old == null ? reqVO.getStatus() : old.getStatus();
+ cert.setStatus(resolveStatus(reqVO.getExpireDate(), cert.getWarnDays(), currentStatus));
cert.setRemark(reqVO.getRemark() == null ? "" : reqVO.getRemark().trim());
return cert;
}
@@ -138,11 +193,6 @@
SafetyCertificateDO byCertNo = certificateMapper.selectByCertNo(StrUtil.trim(reqVO.getCertNo()));
if (byCertNo != null && !byCertNo.getId().equals(old.getId())) {
throw exception(SAFETY_CERT_NO_DUPLICATE);
- }
- // 淇濈暀鍘熺姸鎬佷腑鐨勩�屽凡娉ㄩ攢銆嶏紝涓嶅厑璁搁�氳繃缂栬緫闅忔剰鏀瑰洖
- if (SafetyCertificateStatusEnum.REVOKED.getStatus().equals(old.getStatus())
- && !SafetyCertificateStatusEnum.REVOKED.getStatus().equals(reqVO.getStatus())) {
- reqVO.setStatus(SafetyCertificateStatusEnum.REVOKED.getStatus());
}
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyLedgerExportService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyLedgerExportService.java
index 88e9553..ba65069 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyLedgerExportService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyLedgerExportService.java
@@ -105,8 +105,10 @@
var pageReqVO = new cn.iocoder.yudao.module.mes.controller.admin.safety.vo.cert.SafetyCertificatePageReqVO();
pageReqVO.setPageNo(1);
pageReqVO.setPageSize(50_000);
- List<List<Object>> rows = certificateService.getCertificatePage(pageReqVO)
- .getList().stream()
+ var certs = certificateService.getCertificatePage(pageReqVO).getList();
+ // 瀵煎嚭鏃剁敤鍛樺伐妗f鐨勬渶鏂板鍚�/宸ュ彿/閮ㄩ棬
+ certificateService.fillEmployeeInfo(certs);
+ List<List<Object>> rows = certs.stream()
.map(c -> Arrays.<Object>asList(
str(c.getEmployeeName()), str(c.getEmployeeNo()), str(c.getDeptName()),
SafetyCertificateTypeEnum.getNameByType(c.getCertType()), str(c.getCertNo()),
--
Gitblit v1.9.3