From 416558785276159b8730b2826e71995fc16b59a7 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期四, 29 十月 2026 11:47:44 +0800
Subject: [PATCH] refactor(safety): 人员与车间字段全面改为主数据关联
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyDrillSaveReqVO.java | 5
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyHazardService.java | 41 ++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyInspectionService.java | 63 ++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyAccidentDO.java | 8
sql/mysql/safety_master_data_link_20261029.sql | 102 +++++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialSaveReqVO.java | 5
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyCertificateService.java | 20 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyDrillDO.java | 4
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyTrainingController.java | 6
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyTrainingDO.java | 4
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitMonitorSaveReqVO.java | 7
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyAccidentSaveReqVO.java | 10
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitRespVO.java | 8
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyMaterialService.java | 28 ++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitApproveReqVO.java | 7
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/org/SafetyOrgSaveReqVO.java | 9
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyWorkPermitController.java | 7
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyOrgController.java | 8
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyOrgService.java | 34 ++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyWorkPermitService.java | 76 ++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitSaveReqVO.java | 17
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyHazardController.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyCertificateController.java | 16
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitMonitorRespVO.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyWorkPermitMonitorDO.java | 4
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/org/SafetyOrgRespVO.java | 3
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyWorkPermitDO.java | 16
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionRespVO.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionPointSaveReqVO.java | 10
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyTrainingRespVO.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyAccidentRespVO.java | 4
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardRespVO.java | 6
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/SafetyErrorCodeConstants.java | 5
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardRecheckReqVO.java | 7
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionPointRespVO.java | 4
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyInspectionController.java | 9
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyLedgerExportService.java | 32 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardSaveReqVO.java | 7
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyMaterialDO.java | 4
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyTrainingService.java | 56 ++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyRefResolver.java | 117 ++++++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyMaterialController.java | 10
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionSaveReqVO.java | 7
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardAssignReqVO.java | 7
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyInspectionPointDO.java | 8
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyDrillRespVO.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyTrainingSaveReqVO.java | 5
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyOrgDO.java | 4
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialRespVO.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyInspectionDO.java | 4
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyHazardDO.java | 12
51 files changed, 718 insertions(+), 120 deletions(-)
diff --git a/sql/mysql/safety_master_data_link_20261029.sql b/sql/mysql/safety_master_data_link_20261029.sql
new file mode 100644
index 0000000..fddba90
--- /dev/null
+++ b/sql/mysql/safety_master_data_link_20261029.sql
@@ -0,0 +1,102 @@
+-- ============================================================
+-- 瀹夊叏鐢熶骇 - 浜哄憳涓庤溅闂村瓧娈靛叏闈㈡敼涓轰富鏁版嵁鍏宠仈
+-- 鐢熸垚鏃堕棿锛�2026-10-29
+--
+-- 鑳屾櫙锛氭ā鍧楀垵鐗堟妸銆岃礋璐d汉 / 宸℃浜� / 涓婃姤浜� / 鏁存敼浜� / 澶嶆煡浜� / 鐢宠浜� /
+-- 瀹℃壒浜� / 鐩戞姢浜� / 淇濈浜� / 璁插笀 / 缁勭粐浜� / 杞﹂棿銆嶅叏閮ㄥ仛鎴愪簡绾枃鏈紝
+-- 涓庝汉鍔涜祫婧愬憳宸ユ。妗堛�丮ES 杞﹂棿涓绘暟鎹畬鍏ㄨ劚鑺傦紝浜哄悕闈犳墜鎵撱�佽溅闂撮潬鎵嬭緭銆�
+--
+-- 鍋氭硶锛堢粺涓�妯″紡锛屼笌 safety_certificate 涓�鑷达級锛�
+-- 1. 鏂板 xxx_id 鍏宠仈涓绘暟鎹細employee 鍏宠仈 hrm_employee.id锛寃orkshop 鍏宠仈 mes_md_workshop.id
+-- 2. 鍘熸枃鏈垪淇濈暀锛岄檷绾т负銆屽揩鐓с�嶏細淇濆瓨鏃朵粠涓绘暟鎹甫鍑猴紝鏌ヨ鏃剁敤涓绘暟鎹渶鏂板�艰鐩栵紱
+-- 涓绘暟鎹鍒犳垨鍘嗗彶鑴忔暟鎹椂鍥為��鍒板揩鐓э紝淇濊瘉鑰佽褰曚粛鍙锛堝嵆銆岀壒鍒殑鍙互鎵嬫墦銆嶏級
+-- 3. id 鍒椾竴寰� NULL 鍏佽锛岄伩鍏嶈縼绉诲崱浣忓巻鍙叉暟鎹�
+--
+-- 骞傜瓑锛氬叏閮ㄧ敤 information_schema 鍒ゆ柇鍚庡啀 ALTER锛屽彲閲嶅鎵ц
+-- ============================================================
+
+-- ---------- 閫氱敤锛氭柊澧炲垪鐨勮繃绋嬪紡鍐欐硶锛圡ySQL 鏃� ADD COLUMN IF NOT EXISTS锛� ----------
+DROP PROCEDURE IF EXISTS sp_safety_add_col;
+DELIMITER $$
+CREATE PROCEDURE sp_safety_add_col(IN p_table VARCHAR(64), IN p_col VARCHAR(64),
+ IN p_def VARCHAR(255), IN p_comment VARCHAR(255), IN p_after VARCHAR(64))
+BEGIN
+ IF NOT EXISTS (SELECT 1 FROM information_schema.columns
+ WHERE table_schema = DATABASE() AND table_name = p_table AND column_name = p_col) THEN
+ SET @s = CONCAT('ALTER TABLE `', p_table, '` ADD COLUMN `', p_col, '` ', p_def,
+ ' COMMENT ''', p_comment, ''' AFTER `', p_after, '`');
+ PREPARE st FROM @s; EXECUTE st; DEALLOCATE PREPARE st;
+ END IF;
+ IF NOT EXISTS (SELECT 1 FROM information_schema.statistics
+ WHERE table_schema = DATABASE() AND table_name = p_table AND index_name = CONCAT('idx_', p_col)) THEN
+ SET @s2 = CONCAT('CREATE INDEX `idx_', p_col, '` ON `', p_table, '` (`', p_col, '`)');
+ PREPARE st2 FROM @s2; EXECUTE st2; DEALLOCATE PREPARE st2;
+ END IF;
+END$$
+DELIMITER ;
+
+-- ---------- 1. 瀹夊叏缁勭粐鏋舵瀯锛氳礋璐d汉 ----------
+CALL sp_safety_add_col('safety_org', 'leader_id', 'bigint NULL', '璐熻矗浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛�', 'name');
+
+-- ---------- 2. 宸℃鐐逛綅锛氭墍灞炶溅闂� + 璐d换浜� ----------
+CALL sp_safety_add_col('safety_inspection_point', 'workshop_id', 'bigint NULL', '鎵�灞炶溅闂达紙鍏宠仈 mes_md_workshop.id锛�', 'point_type');
+CALL sp_safety_add_col('safety_inspection_point', 'owner_id', 'bigint NULL', '璐d换浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛�', 'inspect_cycle');
+
+-- ---------- 3. 宸℃璁板綍锛氬贰妫�浜� ----------
+CALL sp_safety_add_col('safety_inspection', 'inspector_id', 'bigint NULL', '宸℃浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛�', 'inspector');
+
+-- ---------- 4. 闅愭偅锛氫笂鎶ヤ汉 / 鏁存敼璐d换浜� / 澶嶆煡浜� ----------
+CALL sp_safety_add_col('safety_hazard', 'reporter_id', 'bigint NULL', '涓婃姤浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛�', 'reporter');
+CALL sp_safety_add_col('safety_hazard', 'assignee_id', 'bigint NULL', '鏁存敼璐d换浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛�', 'assignee');
+CALL sp_safety_add_col('safety_hazard', 'rechecker_id', 'bigint NULL', '澶嶆煡浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛�', 'rechecker');
+
+-- ---------- 5. 楂樺嵄浣滀笟绁細浣滀笟杞﹂棿 / 鐢宠浜� / 瀹℃壒浜� / 鐩戞姢浜� ----------
+CALL sp_safety_add_col('safety_work_permit', 'workshop_id', 'bigint NULL', '浣滀笟杞﹂棿锛堝叧鑱� mes_md_workshop.id锛�', 'permit_type');
+CALL sp_safety_add_col('safety_work_permit', 'applicant_id', 'bigint NULL', '鐢宠浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛�', 'applicant');
+CALL sp_safety_add_col('safety_work_permit', 'approver_id', 'bigint NULL', '瀹℃壒浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛�', 'approver');
+CALL sp_safety_add_col('safety_work_permit', 'guardian_id', 'bigint NULL', '鐩戞姢浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛�', 'guardian');
+
+-- ---------- 6. 浣滀笟鐩戞姢璁板綍锛氱洃鎶や汉 ----------
+CALL sp_safety_add_col('safety_work_permit_monitor', 'guardian_id', 'bigint NULL', '鐩戞姢浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛�', 'guardian');
+
+-- ---------- 7. 搴旀�ョ墿璧勶細淇濈浜� ----------
+CALL sp_safety_add_col('safety_material', 'manager_id', 'bigint NULL', '淇濈浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛�', 'manager');
+
+-- ---------- 8. 瀹夊叏鍩硅锛氳甯�/缁勭粐浜� ----------
+CALL sp_safety_add_col('safety_training', 'trainer_id', 'bigint NULL', '璁插笀/缁勭粐浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛�', 'trainer');
+
+-- ---------- 9. 娑堥槻婕旂粌锛氱粍缁囦汉 ----------
+CALL sp_safety_add_col('safety_drill', 'organizer_id', 'bigint NULL', '缁勭粐浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛�', 'organizer');
+
+-- ---------- 10. 浜嬫晠鐧昏锛氭墍灞炶溅闂� + 鐧昏浜� ----------
+CALL sp_safety_add_col('safety_accident', 'workshop_id', 'bigint NULL', '鎵�灞炶溅闂达紙鍏宠仈 mes_md_workshop.id锛�', 'accident_type');
+CALL sp_safety_add_col('safety_accident', 'reporter_id', 'bigint NULL', '鐧昏浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛�', 'reporter');
+
+-- ---------- 11. 鍘熸枃鏈垪娉ㄩ噴鏀逛负銆屽揩鐓с�嶈涔� ----------
+ALTER TABLE `safety_org` MODIFY COLUMN `leader_name` varchar(50) DEFAULT NULL COMMENT '璐熻矗浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛�';
+ALTER TABLE `safety_inspection_point` MODIFY COLUMN `workshop_name` varchar(100) DEFAULT NULL COMMENT '鎵�灞炶溅闂达紙蹇収锛岀敱杞﹂棿涓绘暟鎹甫鍑猴級',
+ MODIFY COLUMN `owner_name` varchar(50) DEFAULT NULL COMMENT '璐d换浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛�';
+ALTER TABLE `safety_inspection` MODIFY COLUMN `inspector` varchar(50) DEFAULT NULL COMMENT '宸℃浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛�';
+ALTER TABLE `safety_hazard` MODIFY COLUMN `reporter` varchar(50) DEFAULT NULL COMMENT '涓婃姤浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛�',
+ MODIFY COLUMN `assignee` varchar(50) DEFAULT NULL COMMENT '鏁存敼璐d换浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛�',
+ MODIFY COLUMN `rechecker` varchar(50) DEFAULT NULL COMMENT '澶嶆煡浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛�';
+ALTER TABLE `safety_work_permit` MODIFY COLUMN `workshop_name` varchar(100) DEFAULT NULL COMMENT '浣滀笟杞﹂棿锛堝揩鐓э紝鐢辫溅闂翠富鏁版嵁甯﹀嚭锛�',
+ MODIFY COLUMN `applicant` varchar(50) DEFAULT NULL COMMENT '鐢宠浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛�',
+ MODIFY COLUMN `approver` varchar(50) DEFAULT NULL COMMENT '瀹℃壒浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛�',
+ MODIFY COLUMN `guardian` varchar(50) DEFAULT NULL COMMENT '鐩戞姢浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛�';
+ALTER TABLE `safety_work_permit_monitor` MODIFY COLUMN `guardian` varchar(50) DEFAULT NULL COMMENT '鐩戞姢浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛�';
+ALTER TABLE `safety_material` MODIFY COLUMN `manager` varchar(50) DEFAULT NULL COMMENT '淇濈浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛�';
+ALTER TABLE `safety_training` MODIFY COLUMN `trainer` varchar(50) DEFAULT NULL COMMENT '璁插笀/缁勭粐浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛�';
+ALTER TABLE `safety_drill` MODIFY COLUMN `organizer` varchar(50) DEFAULT NULL COMMENT '缁勭粐浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛�';
+ALTER TABLE `safety_accident` MODIFY COLUMN `workshop_name` varchar(100) DEFAULT NULL COMMENT '鎵�灞炶溅闂达紙蹇収锛岀敱杞﹂棿涓绘暟鎹甫鍑猴級',
+ MODIFY COLUMN `reporter` varchar(50) DEFAULT NULL COMMENT '鐧昏浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛�';
+
+-- ---------- 12. 娓呯悊涓存椂杩囩▼ ----------
+DROP PROCEDURE IF EXISTS sp_safety_add_col;
+
+-- ---------- 13. 鏍¢獙 ----------
+SELECT TABLE_NAME, COLUMN_NAME, COLUMN_COMMENT
+ FROM information_schema.columns
+ WHERE table_schema = DATABASE() AND TABLE_NAME LIKE 'safety%'
+ AND (COLUMN_NAME LIKE '%\_id' OR COLUMN_NAME IN ('inspector','reporter','assignee','rechecker','applicant','approver','guardian','manager','trainer','organizer','workshop_name','leader_name'))
+ ORDER BY TABLE_NAME, ORDINAL_POSITION;
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);
}
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyHazardController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyHazardController.java
index d9f598e..a959252 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyHazardController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyHazardController.java
@@ -60,6 +60,7 @@
@PreAuthorize("@ss.hasPermission('safety:hazard:query')")
public CommonResult<SafetyHazardRespVO> get(@RequestParam("id") Long id) {
var hazard = hazardService.getHazard(id);
+ hazardService.fillPersonNames(java.util.List.of(hazard));
var resp = BeanUtils.toBean(hazard, SafetyHazardRespVO.class);
SafetyHazardService.fillHazardDisplay(hazard, resp);
return success(resp);
@@ -70,6 +71,7 @@
@PreAuthorize("@ss.hasPermission('safety:hazard:query')")
public CommonResult<PageResult<SafetyHazardRespVO>> page(@Valid SafetyHazardPageReqVO reqVO) {
var page = hazardService.getHazardPage(reqVO);
+ hazardService.fillPersonNames(page.getList());
var result = BeanUtils.toBean(page, SafetyHazardRespVO.class);
for (int i = 0; i < page.getList().size(); i++) {
SafetyHazardService.fillHazardDisplay(page.getList().get(i), result.getList().get(i));
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyInspectionController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyInspectionController.java
index a2c2850..f66b4da 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyInspectionController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyInspectionController.java
@@ -64,6 +64,8 @@
@PreAuthorize("@ss.hasPermission('safety:inspection-point:query')")
public CommonResult<SafetyInspectionPointRespVO> getPoint(@RequestParam("id") Long id) {
var point = inspectionService.getPoint(id);
+ // 鍗曟潯鏌ヨ涔熻鍥炲~涓绘暟鎹渶鏂板�硷紝涓嶈兘鍙繑鍥炲揩鐓�
+ inspectionService.fillPointRefs(java.util.List.of(point));
var resp = BeanUtils.toBean(point, SafetyInspectionPointRespVO.class);
SafetyInspectionService.fillPointDisplay(point, resp);
resp.setLastInspectTime(inspectionService.getLastInspectTime(id));
@@ -76,6 +78,7 @@
public CommonResult<PageResult<SafetyInspectionPointRespVO>> getPointPage(
@Valid SafetyInspectionPointPageReqVO reqVO) {
var page = inspectionService.getPointPage(reqVO);
+ inspectionService.fillPointRefs(page.getList());
var result = BeanUtils.toBean(page, SafetyInspectionPointRespVO.class);
for (int i = 0; i < page.getList().size(); i++) {
SafetyInspectionService.fillPointDisplay(page.getList().get(i), result.getList().get(i));
@@ -87,7 +90,9 @@
@Operation(summary = "鑾峰緱鍚敤涓殑宸℃鐐逛綅绮剧畝鍒楄〃锛堢Щ鍔ㄧ宸℃閫夋嫨锛�")
@PreAuthorize("@ss.hasPermission('safety:inspection-point:query')")
public CommonResult<List<SafetyInspectionPointRespVO>> getPointSimpleList() {
- List<SafetyInspectionPointRespVO> list = inspectionService.getEnabledPointList().stream()
+ var points = inspectionService.getEnabledPointList();
+ inspectionService.fillPointRefs(points);
+ List<SafetyInspectionPointRespVO> list = points.stream()
.map(point -> {
var resp = BeanUtils.toBean(point, SafetyInspectionPointRespVO.class);
SafetyInspectionService.fillPointDisplay(point, resp);
@@ -128,6 +133,7 @@
@PreAuthorize("@ss.hasPermission('safety:inspection:query')")
public CommonResult<SafetyInspectionRespVO> getRecord(@RequestParam("id") Long id) {
var record = inspectionService.getInspection(id);
+ inspectionService.fillInspectorNames(java.util.List.of(record));
var resp = BeanUtils.toBean(record, SafetyInspectionRespVO.class);
resp.setPointTypeName(cn.iocoder.yudao.module.mes.enums.safety.SafetyInspectionPointTypeEnum
.getNameByType(record.getPointType()));
@@ -141,6 +147,7 @@
public CommonResult<PageResult<SafetyInspectionRespVO>> getRecordPage(
@Valid SafetyInspectionPageReqVO reqVO) {
var page = inspectionService.getInspectionPage(reqVO);
+ inspectionService.fillInspectorNames(page.getList());
var result = BeanUtils.toBean(page, SafetyInspectionRespVO.class);
for (int i = 0; i < page.getList().size(); i++) {
var record = page.getList().get(i);
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyMaterialController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyMaterialController.java
index ee0e5f2..3bed64b 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyMaterialController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyMaterialController.java
@@ -62,6 +62,7 @@
@PreAuthorize("@ss.hasPermission('safety:material:query')")
public CommonResult<SafetyMaterialRespVO> get(@RequestParam("id") Long id) {
var material = materialService.getMaterial(id);
+ materialService.fillManagers(java.util.List.of(material));
var resp = BeanUtils.toBean(material, SafetyMaterialRespVO.class);
SafetyMaterialService.fillMaterialDisplay(material, resp);
return success(resp);
@@ -72,6 +73,7 @@
@PreAuthorize("@ss.hasPermission('safety:material:query')")
public CommonResult<PageResult<SafetyMaterialRespVO>> page(@Valid SafetyMaterialPageReqVO reqVO) {
var page = materialService.getMaterialPage(reqVO);
+ materialService.fillManagers(page.getList());
var result = BeanUtils.toBean(page, SafetyMaterialRespVO.class);
for (int i = 0; i < page.getList().size(); i++) {
SafetyMaterialService.fillMaterialDisplay(page.getList().get(i), result.getList().get(i));
@@ -83,7 +85,9 @@
@Operation(summary = "鑾峰緱浣庝簬瀹夊叏搴撳瓨鐨勭墿璧勫垪琛紙棰勮锛�")
@PreAuthorize("@ss.hasPermission('safety:material:query')")
public CommonResult<List<SafetyMaterialRespVO>> belowSafeStock() {
- List<SafetyMaterialRespVO> list = materialService.getBelowSafeStockList().stream()
+ var materials = materialService.getBelowSafeStockList();
+ materialService.fillManagers(materials);
+ List<SafetyMaterialRespVO> list = materials.stream()
.map(material -> {
var resp = BeanUtils.toBean(material, SafetyMaterialRespVO.class);
SafetyMaterialService.fillMaterialDisplay(material, resp);
@@ -98,7 +102,9 @@
@PreAuthorize("@ss.hasPermission('safety:material:query')")
public CommonResult<List<SafetyMaterialRespVO>> expiringList(
@RequestParam(value = "days", required = false) Integer days) {
- List<SafetyMaterialRespVO> list = materialService.getExpiringList(days).stream()
+ var materials = materialService.getExpiringList(days);
+ materialService.fillManagers(materials);
+ List<SafetyMaterialRespVO> list = materials.stream()
.map(material -> {
var resp = BeanUtils.toBean(material, SafetyMaterialRespVO.class);
SafetyMaterialService.fillMaterialDisplay(material, resp);
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyOrgController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyOrgController.java
index 985bed3..60bbf5a 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyOrgController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyOrgController.java
@@ -63,6 +63,14 @@
var org = orgService.getOrg(id);
var resp = new SafetyOrgRespVO();
org2resp(org, resp);
+ // 璐熻矗浜虹敤鍛樺伐妗f鏈�鏂板鍚嶈鐩栧揩鐓�
+ if (org.getLeaderId() != null) {
+ var employee = orgService.getLeader(org.getLeaderId());
+ if (employee != null) {
+ resp.setLeaderName(employee.getName());
+ resp.setLeaderPhone(employee.getPhone());
+ }
+ }
return success(resp);
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyTrainingController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyTrainingController.java
index a259a17..9664231 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyTrainingController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyTrainingController.java
@@ -62,6 +62,7 @@
@PreAuthorize("@ss.hasPermission('safety:training:query')")
public CommonResult<SafetyTrainingRespVO> get(@RequestParam("id") Long id) {
var training = trainingService.getTraining(id);
+ trainingService.fillTrainers(java.util.List.of(training));
var resp = BeanUtils.toBean(training, SafetyTrainingRespVO.class);
SafetyTrainingService.fillTrainingDisplay(training, resp);
return success(resp);
@@ -72,6 +73,7 @@
@PreAuthorize("@ss.hasPermission('safety:training:query')")
public CommonResult<PageResult<SafetyTrainingRespVO>> page(@Valid SafetyTrainingPageReqVO reqVO) {
var page = trainingService.getTrainingPage(reqVO);
+ trainingService.fillTrainers(page.getList());
var result = BeanUtils.toBean(page, SafetyTrainingRespVO.class);
for (int i = 0; i < page.getList().size(); i++) {
SafetyTrainingService.fillTrainingDisplay(page.getList().get(i), result.getList().get(i));
@@ -111,6 +113,7 @@
@PreAuthorize("@ss.hasPermission('safety:drill:query')")
public CommonResult<SafetyDrillRespVO> getDrill(@RequestParam("id") Long id) {
var drill = trainingService.getDrill(id);
+ trainingService.fillOrganizers(java.util.List.of(drill));
var resp = BeanUtils.toBean(drill, SafetyDrillRespVO.class);
SafetyTrainingService.fillDrillDisplay(drill, resp);
return success(resp);
@@ -121,6 +124,7 @@
@PreAuthorize("@ss.hasPermission('safety:drill:query')")
public CommonResult<PageResult<SafetyDrillRespVO>> drillPage(@Valid SafetyDrillPageReqVO reqVO) {
var page = trainingService.getDrillPage(reqVO);
+ trainingService.fillOrganizers(page.getList());
var result = BeanUtils.toBean(page, SafetyDrillRespVO.class);
for (int i = 0; i < page.getList().size(); i++) {
SafetyTrainingService.fillDrillDisplay(page.getList().get(i), result.getList().get(i));
@@ -160,6 +164,7 @@
@PreAuthorize("@ss.hasPermission('safety:accident:query')")
public CommonResult<SafetyAccidentRespVO> getAccident(@RequestParam("id") Long id) {
var accident = trainingService.getAccident(id);
+ trainingService.fillAccidentRefs(java.util.List.of(accident));
var resp = BeanUtils.toBean(accident, SafetyAccidentRespVO.class);
SafetyTrainingService.fillAccidentDisplay(accident, resp);
return success(resp);
@@ -171,6 +176,7 @@
public CommonResult<PageResult<SafetyAccidentRespVO>> accidentPage(
@Valid SafetyAccidentPageReqVO reqVO) {
var page = trainingService.getAccidentPage(reqVO);
+ trainingService.fillAccidentRefs(page.getList());
var result = BeanUtils.toBean(page, SafetyAccidentRespVO.class);
for (int i = 0; i < page.getList().size(); i++) {
SafetyTrainingService.fillAccidentDisplay(page.getList().get(i), result.getList().get(i));
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyWorkPermitController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyWorkPermitController.java
index 08e53d1..3119ae0 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyWorkPermitController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyWorkPermitController.java
@@ -62,6 +62,7 @@
@PreAuthorize("@ss.hasPermission('safety:permit:query')")
public CommonResult<SafetyWorkPermitRespVO> get(@RequestParam("id") Long id) {
var permit = permitService.getPermit(id);
+ permitService.fillPermitRefs(java.util.List.of(permit));
var resp = BeanUtils.toBean(permit, SafetyWorkPermitRespVO.class);
SafetyWorkPermitService.fillPermitDisplay(permit, resp);
return success(resp);
@@ -72,6 +73,7 @@
@PreAuthorize("@ss.hasPermission('safety:permit:query')")
public CommonResult<PageResult<SafetyWorkPermitRespVO>> page(@Valid SafetyWorkPermitPageReqVO reqVO) {
var page = permitService.getPermitPage(reqVO);
+ permitService.fillPermitRefs(page.getList());
var result = BeanUtils.toBean(page, SafetyWorkPermitRespVO.class);
for (int i = 0; i < page.getList().size(); i++) {
SafetyWorkPermitService.fillPermitDisplay(page.getList().get(i), result.getList().get(i));
@@ -121,8 +123,9 @@
@Parameter(name = "permitId", description = "浣滀笟绁ㄧ紪鍙�", required = true)
@PreAuthorize("@ss.hasPermission('safety:permit:query')")
public CommonResult<List<SafetyWorkPermitMonitorRespVO>> monitorList(@RequestParam("permitId") Long permitId) {
- return success(BeanUtils.toBean(permitService.getMonitorList(permitId),
- SafetyWorkPermitMonitorRespVO.class));
+ var monitors = permitService.getMonitorList(permitId);
+ permitService.fillMonitorGuardians(monitors);
+ return success(BeanUtils.toBean(monitors, SafetyWorkPermitMonitorRespVO.class));
}
@PostMapping("/monitor/create")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardAssignReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardAssignReqVO.java
index 2b3f3a9..f763d0f 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardAssignReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardAssignReqVO.java
@@ -22,10 +22,9 @@
@NotNull(message = "闅愭偅缂栧彿涓嶈兘涓虹┖")
private Long id;
- @Schema(description = "鏁存敼璐d换浜�", requiredMode = Schema.RequiredMode.REQUIRED, example = "璧靛叚")
- @NotBlank(message = "鏁存敼璐d换浜轰笉鑳戒负绌�")
- @Size(max = 50)
- private String assignee;
+ @Schema(description = "鏁存敼璐d换浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "璇烽�夋嫨鏁存敼璐d换浜�")
+ private Long assigneeId;
@Schema(description = "鏁存敼鏈熼檺")
@DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardRecheckReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardRecheckReqVO.java
index da189ba..0230fb6 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardRecheckReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardRecheckReqVO.java
@@ -20,10 +20,9 @@
@NotNull(message = "闅愭偅缂栧彿涓嶈兘涓虹┖")
private Long id;
- @Schema(description = "澶嶆煡浜�", requiredMode = Schema.RequiredMode.REQUIRED, example = "閽变竷")
- @NotBlank(message = "澶嶆煡浜轰笉鑳戒负绌�")
- @Size(max = 50)
- private String rechecker;
+ @Schema(description = "澶嶆煡浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "璇烽�夋嫨澶嶆煡浜�")
+ private Long recheckerId;
@Schema(description = "澶嶆煡缁撹锛歅ASSED-閫氳繃锛孯EJECTED-涓嶉�氳繃", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "澶嶆煡缁撹涓嶈兘涓虹┖")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardRespVO.java
index d7c374a..4ae9ea9 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardRespVO.java
@@ -30,8 +30,12 @@
private String location;
private String description;
private String photoUrls;
+ @Schema(description = "涓婃姤浜虹紪鍙�")
+ private Long reporterId;
private String reporter;
private LocalDateTime reportTime;
+ @Schema(description = "鏁存敼璐d换浜虹紪鍙�")
+ private Long assigneeId;
private String assignee;
private LocalDateTime assignTime;
private LocalDate rectifyDeadline;
@@ -40,6 +44,8 @@
private String rectifyDesc;
private String rectifyPhotoUrls;
private LocalDateTime rectifyTime;
+ @Schema(description = "澶嶆煡浜虹紪鍙�")
+ private Long recheckerId;
private String rechecker;
private LocalDateTime recheckTime;
private String recheckResult;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardSaveReqVO.java
index 270a3ed..ecd21ec 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardSaveReqVO.java
@@ -54,10 +54,9 @@
@Size(max = 2000)
private String photoUrls;
- @Schema(description = "涓婃姤浜�", requiredMode = Schema.RequiredMode.REQUIRED, example = "鐜嬩簲")
- @NotBlank(message = "涓婃姤浜轰笉鑳戒负绌�")
- @Size(max = 50)
- private String reporter;
+ @Schema(description = "涓婃姤浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "璇烽�夋嫨涓婃姤浜�")
+ private Long reporterId;
@Schema(description = "涓婃姤鏃堕棿")
@DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionPointRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionPointRespVO.java
index f569b4e..81926e9 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionPointRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionPointRespVO.java
@@ -20,12 +20,16 @@
private String pointType;
@Schema(description = "鐐逛綅绫诲瀷鍚嶇О")
private String pointTypeName;
+ @Schema(description = "鎵�灞炶溅闂寸紪鍙�")
+ private Long workshopId;
private String workshopName;
private String location;
private String inspectItems;
private String inspectCycle;
@Schema(description = "宸℃鍛ㄦ湡鍚嶇О")
private String inspectCycleName;
+ @Schema(description = "璐d换浜虹紪鍙�")
+ private Long ownerId;
private String ownerName;
private Integer status;
@Schema(description = "鏈�杩戜竴娆″贰妫�鏃堕棿")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionPointSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionPointSaveReqVO.java
index 1e3a27f..0d86357 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionPointSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionPointSaveReqVO.java
@@ -30,9 +30,8 @@
@Pattern(regexp = "HIGH_VOLTAGE_ROOM|UNIT_AREA|DANGER_CHEMICAL|FIRE_AREA|WORKSHOP|OTHER", message = "鐐逛綅绫诲瀷涓嶅悎娉�")
private String pointType;
- @Schema(description = "鎵�灞炶溅闂�/鍖哄煙")
- @Size(max = 100)
- private String workshopName;
+ @Schema(description = "鎵�灞炶溅闂达紙鍏宠仈 mes_md_workshop锛�")
+ private Long workshopId;
@Schema(description = "鍏蜂綋浣嶇疆")
@Size(max = 200)
@@ -46,9 +45,8 @@
@Pattern(regexp = "SHIFT|DAILY|WEEKLY|MONTHLY", message = "宸℃鍛ㄦ湡涓嶅悎娉�")
private String inspectCycle;
- @Schema(description = "璐d换浜�")
- @Size(max = 50)
- private String ownerName;
+ @Schema(description = "璐d换浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛�")
+ private Long ownerId;
@Schema(description = "鐘舵�侊細0-鍚敤锛�1-鍋滅敤", example = "0")
@NotNull(message = "鐘舵�佷笉鑳戒负绌�")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionRespVO.java
index 32a9de2..f3d93ad 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionRespVO.java
@@ -21,6 +21,8 @@
@Schema(description = "鐐逛綅绫诲瀷鍚嶇О")
private String pointTypeName;
private LocalDateTime inspectTime;
+ @Schema(description = "宸℃浜虹紪鍙�")
+ private Long inspectorId;
private String inspector;
private String result;
@Schema(description = "宸℃缁撴灉鍚嶇О")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionSaveReqVO.java
index 1baa4d1..df34455 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionSaveReqVO.java
@@ -27,10 +27,9 @@
@DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
private LocalDateTime inspectTime;
- @Schema(description = "宸℃浜�", requiredMode = Schema.RequiredMode.REQUIRED, example = "鏉庡洓")
- @NotBlank(message = "宸℃浜轰笉鑳戒负绌�")
- @Size(max = 50)
- private String inspector;
+ @Schema(description = "宸℃浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "璇烽�夋嫨宸℃浜�")
+ private Long inspectorId;
@Schema(description = "宸℃缁撴灉", example = "NORMAL")
@Pattern(regexp = "NORMAL|ABNORMAL", message = "宸℃缁撴灉鍙兘涓烘甯告垨寮傚父")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialRespVO.java
index 8e6306f..fef6976 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialRespVO.java
@@ -33,6 +33,8 @@
@Schema(description = "璺濇湁鏁堟湡澶╂暟锛岃礋鏁拌〃绀哄凡杩囨湡")
private Long expireRemainingDays;
private Integer validityMonths;
+ @Schema(description = "淇濈浜虹紪鍙�")
+ private Long managerId;
private String manager;
private Integer status;
private String remark;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialSaveReqVO.java
index 66c6977..f9d112f 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialSaveReqVO.java
@@ -62,9 +62,8 @@
@Min(value = 0, message = "鏈夋晥鏈熸湀鏁颁笉鑳戒负璐熸暟")
private Integer validityMonths;
- @Schema(description = "淇濈浜�")
- @Size(max = 50)
- private String manager;
+ @Schema(description = "淇濈浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛�")
+ private Long managerId;
@Schema(description = "鐘舵�侊細0-鍚敤锛�1-鍋滅敤", example = "0")
@NotNull(message = "鐘舵�佷笉鑳戒负绌�")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/org/SafetyOrgRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/org/SafetyOrgRespVO.java
index d45bdf8..cc587cd 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/org/SafetyOrgRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/org/SafetyOrgRespVO.java
@@ -18,6 +18,9 @@
private Long id;
private Long parentId;
private String name;
+ @Schema(description = "璐熻矗浜猴紙鍛樺伐缂栧彿锛�")
+ private Long leaderId;
+ @Schema(description = "璐熻矗浜哄鍚嶏紙蹇収锛�")
private String leaderName;
private String leaderPhone;
private String memberNames;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/org/SafetyOrgSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/org/SafetyOrgSaveReqVO.java
index 02d186c..6694c0a 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/org/SafetyOrgSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/org/SafetyOrgSaveReqVO.java
@@ -25,13 +25,8 @@
@Size(max = 100, message = "缁勭粐鍚嶇О闀垮害涓嶈兘瓒呰繃 100 瀛�")
private String name;
- @Schema(description = "璐熻矗浜哄鍚�")
- @Size(max = 50)
- private String leaderName;
-
- @Schema(description = "璐熻矗浜虹數璇�")
- @Size(max = 30)
- private String leaderPhone;
+ @Schema(description = "璐熻矗浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛�")
+ private Long leaderId;
@Schema(description = "鎴愬憳濮撳悕锛岄�楀彿鍒嗛殧")
@Size(max = 500)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitApproveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitApproveReqVO.java
index 8af0c32..bca98c7 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitApproveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitApproveReqVO.java
@@ -20,10 +20,9 @@
@NotNull(message = "浣滀笟绁ㄧ紪鍙蜂笉鑳戒负绌�")
private Long id;
- @Schema(description = "瀹℃壒浜�", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotBlank(message = "瀹℃壒浜轰笉鑳戒负绌�")
- @Size(max = 50)
- private String approver;
+ @Schema(description = "瀹℃壒浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "璇烽�夋嫨瀹℃壒浜�")
+ private Long approverId;
@Schema(description = "瀹℃壒缁撹锛欰PPROVED-閫氳繃锛孯EJECTED-椹冲洖", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "瀹℃壒缁撹涓嶈兘涓虹┖")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitMonitorRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitMonitorRespVO.java
index ba560f2..a279ef9 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitMonitorRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitMonitorRespVO.java
@@ -17,6 +17,8 @@
private Long id;
private Long permitId;
private LocalDateTime monitorTime;
+ @Schema(description = "鐩戞姢浜虹紪鍙�")
+ private Long guardianId;
private String guardian;
private String monitorContent;
private String abnormal;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitMonitorSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitMonitorSaveReqVO.java
index 05048b8..697f70d 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitMonitorSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitMonitorSaveReqVO.java
@@ -28,10 +28,9 @@
@DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
private LocalDateTime monitorTime;
- @Schema(description = "鐩戞姢浜�", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotBlank(message = "鐩戞姢浜轰笉鑳戒负绌�")
- @Size(max = 50)
- private String guardian;
+ @Schema(description = "鐩戞姢浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "璇烽�夋嫨鐩戞姢浜�")
+ private Long guardianId;
@Schema(description = "鐩戞姢鍐呭涓庢儏鍐�")
@Size(max = 1000)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitRespVO.java
index c76453d..c01439f 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitRespVO.java
@@ -20,9 +20,13 @@
@Schema(description = "浣滀笟绫诲瀷鍚嶇О")
private String permitTypeName;
private String title;
+ @Schema(description = "浣滀笟杞﹂棿缂栧彿")
+ private Long workshopId;
private String workshopName;
private String location;
private String workContent;
+ @Schema(description = "鐢宠浜虹紪鍙�")
+ private Long applicantId;
private String applicant;
private LocalDateTime applyTime;
private LocalDateTime planStartTime;
@@ -33,9 +37,13 @@
@Schema(description = "椋庨櫓绛夌骇鍚嶇О")
private String riskLevelName;
private String safetyMeasures;
+ @Schema(description = "瀹℃壒浜虹紪鍙�")
+ private Long approverId;
private String approver;
private LocalDateTime approveTime;
private String approveComment;
+ @Schema(description = "鐩戞姢浜虹紪鍙�")
+ private Long guardianId;
private String guardian;
private String status;
@Schema(description = "鐘舵�佸悕绉�")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitSaveReqVO.java
index a527a63..92abbf2 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitSaveReqVO.java
@@ -29,9 +29,8 @@
@Size(max = 200)
private String title;
- @Schema(description = "浣滀笟鍖哄煙/杞﹂棿")
- @Size(max = 100)
- private String workshopName;
+ @Schema(description = "浣滀笟杞﹂棿锛堝叧鑱� mes_md_workshop锛�")
+ private Long workshopId;
@Schema(description = "浣滀笟鍦扮偣")
@Size(max = 200)
@@ -41,10 +40,9 @@
@Size(max = 2000)
private String workContent;
- @Schema(description = "鐢宠浜�", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotBlank(message = "鐢宠浜轰笉鑳戒负绌�")
- @Size(max = 50)
- private String applicant;
+ @Schema(description = "鐢宠浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "璇烽�夋嫨鐢宠浜�")
+ private Long applicantId;
@Schema(description = "鐢宠鏃堕棿")
@DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
@@ -68,9 +66,8 @@
@Size(max = 2000)
private String safetyMeasures;
- @Schema(description = "鐩戞姢浜�")
- @Size(max = 50)
- private String guardian;
+ @Schema(description = "鐩戞姢浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛�")
+ private Long guardianId;
@Schema(description = "浣滀笟绁ㄩ檮浠� URL锛岄�楀彿鍒嗛殧")
@Size(max = 2000)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyAccidentRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyAccidentRespVO.java
index 19ecce8..ac50c83 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyAccidentRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyAccidentRespVO.java
@@ -26,6 +26,8 @@
private String levelName;
private LocalDateTime occurTime;
private String location;
+ @Schema(description = "鎵�灞炶溅闂寸紪鍙�")
+ private Long workshopId;
private String workshopName;
private String casualtyDesc;
private BigDecimal economicLoss;
@@ -33,6 +35,8 @@
private String description;
private String causeAnalysis;
private String measures;
+ @Schema(description = "鐧昏浜虹紪鍙�")
+ private Long reporterId;
private String reporter;
private LocalDateTime reportTime;
private String status;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyAccidentSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyAccidentSaveReqVO.java
index 6f928de..3623785 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyAccidentSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyAccidentSaveReqVO.java
@@ -42,9 +42,8 @@
@Size(max = 200)
private String location;
- @Schema(description = "鎵�灞炶溅闂�/鍖哄煙")
- @Size(max = 100)
- private String workshopName;
+ @Schema(description = "鎵�灞炶溅闂达紙鍏宠仈 mes_md_workshop锛�")
+ private Long workshopId;
@Schema(description = "浼や骸鎯呭喌")
@Size(max = 500)
@@ -70,9 +69,8 @@
@Size(max = 2000)
private String measures;
- @Schema(description = "鐧昏浜�")
- @Size(max = 50)
- private String reporter;
+ @Schema(description = "鐧昏浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛�")
+ private Long reporterId;
@Schema(description = "鐧昏鏃堕棿")
@DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyDrillRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyDrillRespVO.java
index db0a41c..8483740 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyDrillRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyDrillRespVO.java
@@ -22,6 +22,8 @@
private String drillTypeName;
private LocalDate drillDate;
private String location;
+ @Schema(description = "缁勭粐浜虹紪鍙�")
+ private Long organizerId;
private String organizer;
private String participants;
private Integer participantCount;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyDrillSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyDrillSaveReqVO.java
index 996102d..cf90a08 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyDrillSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyDrillSaveReqVO.java
@@ -36,9 +36,8 @@
@Size(max = 200)
private String location;
- @Schema(description = "缁勭粐浜�")
- @Size(max = 50)
- private String organizer;
+ @Schema(description = "缁勭粐浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛�")
+ private Long organizerId;
@Schema(description = "鍙傚姞浜哄憳濮撳悕锛岄�楀彿鍒嗛殧")
@Size(max = 2000)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyTrainingRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyTrainingRespVO.java
index 053a874..e79feb9 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyTrainingRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyTrainingRespVO.java
@@ -23,6 +23,8 @@
private String trainingTypeName;
private LocalDate trainDate;
private BigDecimal durationHours;
+ @Schema(description = "璁插笀/缁勭粐浜虹紪鍙�")
+ private Long trainerId;
private String trainer;
private String location;
private String participants;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyTrainingSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyTrainingSaveReqVO.java
index 30fc28d..9818d6a 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyTrainingSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyTrainingSaveReqVO.java
@@ -37,9 +37,8 @@
@DecimalMin(value = "0", message = "鍩硅瀛︽椂涓嶈兘涓鸿礋鏁�")
private BigDecimal durationHours;
- @Schema(description = "璁插笀/缁勭粐浜�")
- @Size(max = 50)
- private String trainer;
+ @Schema(description = "璁插笀/缁勭粐浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛�")
+ private Long trainerId;
@Schema(description = "鍩硅鍦扮偣")
@Size(max = 200)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyAccidentDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyAccidentDO.java
index 5ea6c6a..925beba 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyAccidentDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyAccidentDO.java
@@ -33,7 +33,9 @@
private LocalDateTime occurTime;
/** 鍙戠敓鍦扮偣 */
private String location;
- /** 鎵�灞炶溅闂�/鍖哄煙 */
+ /** 鎵�灞炶溅闂达紙鍏宠仈 mes_md_workshop.id锛� */
+ private Long workshopId;
+ /** 鎵�灞炶溅闂村悕绉帮紙蹇収锛岀敱杞﹂棿涓绘暟鎹甫鍑猴級 */
private String workshopName;
/** 浼や骸鎯呭喌 */
private String casualtyDesc;
@@ -47,7 +49,9 @@
private String causeAnalysis;
/** 澶勭悊鎺柦涓庢暣鏀硅姹� */
private String measures;
- /** 鐧昏浜� */
+ /** 鐧昏浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛� */
+ private Long reporterId;
+ /** 鐧昏浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛� */
private String reporter;
/** 鐧昏鏃堕棿 */
private LocalDateTime reportTime;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyDrillDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyDrillDO.java
index 533f4eb..55f560d 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyDrillDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyDrillDO.java
@@ -28,7 +28,9 @@
private LocalDate drillDate;
/** 婕旂粌鍦扮偣 */
private String location;
- /** 缁勭粐浜� */
+ /** 缁勭粐浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛� */
+ private Long organizerId;
+ /** 缁勭粐浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛� */
private String organizer;
/** 鍙傚姞浜哄憳濮撳悕锛岄�楀彿鍒嗛殧 */
private String participants;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyHazardDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyHazardDO.java
index bfc5870..2e5eb9c 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyHazardDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyHazardDO.java
@@ -43,11 +43,15 @@
private String description;
/** 鐜板満鐓х墖 URL锛岄�楀彿鍒嗛殧锛堢Щ鍔ㄧ鎷嶇収涓婁紶锛� */
private String photoUrls;
- /** 涓婃姤浜� */
+ /** 涓婃姤浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛� */
+ private Long reporterId;
+ /** 涓婃姤浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛� */
private String reporter;
/** 涓婃姤鏃堕棿 */
private LocalDateTime reportTime;
- /** 鏁存敼璐d换浜猴紙鍒嗘淳锛� */
+ /** 鏁存敼璐d换浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛� */
+ private Long assigneeId;
+ /** 鏁存敼璐d换浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛� */
private String assignee;
/** 鍒嗘淳鏃堕棿 */
private LocalDateTime assignTime;
@@ -59,7 +63,9 @@
private String rectifyPhotoUrls;
/** 鏁存敼瀹屾垚鏃堕棿 */
private LocalDateTime rectifyTime;
- /** 澶嶆煡浜� */
+ /** 澶嶆煡浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛� */
+ private Long recheckerId;
+ /** 澶嶆煡浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛� */
private String rechecker;
/** 澶嶆煡鏃堕棿 */
private LocalDateTime recheckTime;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyInspectionDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyInspectionDO.java
index 5bdb81f..6e59aba 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyInspectionDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyInspectionDO.java
@@ -28,7 +28,9 @@
private String pointType;
/** 宸℃鏃堕棿 */
private LocalDateTime inspectTime;
- /** 宸℃浜� */
+ /** 宸℃浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛� */
+ private Long inspectorId;
+ /** 宸℃浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛� */
private String inspector;
/** 宸℃缁撴灉锛歂ORMAL-姝e父锛孉BNORMAL-寮傚父 */
private String result;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyInspectionPointDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyInspectionPointDO.java
index bd8efe4..a9f0302 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyInspectionPointDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyInspectionPointDO.java
@@ -26,7 +26,9 @@
private String name;
/** 鐐逛綅绫诲瀷锛岃 SafetyInspectionPointTypeEnum */
private String pointType;
- /** 鎵�灞炶溅闂�/鍖哄煙 */
+ /** 鎵�灞炶溅闂达紙鍏宠仈 mes_md_workshop.id锛� */
+ private Long workshopId;
+ /** 鎵�灞炶溅闂村悕绉帮紙蹇収锛岀敱杞﹂棿涓绘暟鎹甫鍑猴級 */
private String workshopName;
/** 鍏蜂綋浣嶇疆 */
private String location;
@@ -34,7 +36,9 @@
private String inspectItems;
/** 宸℃鍛ㄦ湡锛岃 SafetyInspectCycleEnum */
private String inspectCycle;
- /** 璐d换浜� */
+ /** 璐d换浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛� */
+ private Long ownerId;
+ /** 璐d换浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛� */
private String ownerName;
/** 鐘舵�侊細0-鍚敤锛�1-鍋滅敤 */
private Integer status;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyMaterialDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyMaterialDO.java
index 82e2e1a..e9a5f7e 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyMaterialDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyMaterialDO.java
@@ -43,7 +43,9 @@
private LocalDate expireDate;
/** 鏈夋晥鏈熸湀鏁� */
private Integer validityMonths;
- /** 淇濈浜� */
+ /** 淇濈浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛� */
+ private Long managerId;
+ /** 淇濈浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛� */
private String manager;
/** 鐘舵�侊細0-鍚敤锛�1-鍋滅敤 */
private Integer status;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyOrgDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyOrgDO.java
index d4403a4..118e977 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyOrgDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyOrgDO.java
@@ -22,7 +22,9 @@
private Long parentId;
/** 缁勭粐鍚嶇О锛屽瀹夊叏鐢熶骇濮斿憳浼氥�佸畨鍏ㄧ鐞嗛儴 */
private String name;
- /** 璐熻矗浜哄鍚� */
+ /** 璐熻矗浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛� */
+ private Long leaderId;
+ /** 璐熻矗浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛� */
private String leaderName;
/** 璐熻矗浜虹數璇� */
private String leaderPhone;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyTrainingDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyTrainingDO.java
index 41f4433..4b782d9 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyTrainingDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyTrainingDO.java
@@ -29,7 +29,9 @@
private LocalDate trainDate;
/** 鍩硅瀛︽椂 */
private BigDecimal durationHours;
- /** 璁插笀/缁勭粐浜� */
+ /** 璁插笀/缁勭粐浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛� */
+ private Long trainerId;
+ /** 璁插笀/缁勭粐浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛� */
private String trainer;
/** 鍩硅鍦扮偣 */
private String location;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyWorkPermitDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyWorkPermitDO.java
index 528104c..02fa4cd 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyWorkPermitDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyWorkPermitDO.java
@@ -28,13 +28,17 @@
private String permitType;
/** 浣滀笟鍚嶇О */
private String title;
- /** 浣滀笟鍖哄煙/杞﹂棿 */
+ /** 浣滀笟杞﹂棿锛堝叧鑱� mes_md_workshop.id锛� */
+ private Long workshopId;
+ /** 浣滀笟杞﹂棿鍚嶇О锛堝揩鐓э紝鐢辫溅闂翠富鏁版嵁甯﹀嚭锛� */
private String workshopName;
/** 浣滀笟鍦扮偣 */
private String location;
/** 浣滀笟鍐呭涓庤寖鍥� */
private String workContent;
- /** 鐢宠浜� */
+ /** 鐢宠浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛� */
+ private Long applicantId;
+ /** 鐢宠浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛� */
private String applicant;
/** 鐢宠鏃堕棿 */
private LocalDateTime applyTime;
@@ -50,13 +54,17 @@
private String riskLevel;
/** 瀹夊叏鎺柦 */
private String safetyMeasures;
- /** 瀹℃壒浜� */
+ /** 瀹℃壒浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛� */
+ private Long approverId;
+ /** 瀹℃壒浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛� */
private String approver;
/** 瀹℃壒鏃堕棿 */
private LocalDateTime approveTime;
/** 瀹℃壒鎰忚 */
private String approveComment;
- /** 鐩戞姢浜� */
+ /** 鐩戞姢浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛� */
+ private Long guardianId;
+ /** 鐩戞姢浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛� */
private String guardian;
/** 鐘舵�侊紝瑙� SafetyPermitStatusEnum */
private String status;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyWorkPermitMonitorDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyWorkPermitMonitorDO.java
index ba1b354..fb4d375 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyWorkPermitMonitorDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyWorkPermitMonitorDO.java
@@ -24,7 +24,9 @@
private Long permitId;
/** 鐩戞姢鏃堕棿 */
private LocalDateTime monitorTime;
- /** 鐩戞姢浜� */
+ /** 鐩戞姢浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛� */
+ private Long guardianId;
+ /** 鐩戞姢浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛� */
private String guardian;
/** 鐩戞姢鍐呭涓庢儏鍐� */
private String monitorContent;
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 c9cd2ab..c7647c4 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
@@ -42,6 +42,7 @@
ErrorCode SAFETY_PERMIT_TIME_INVALID = new ErrorCode(1_040_965_002, "璁″垝缁撴潫鏃堕棿蹇呴』鏅氫簬寮�濮嬫椂闂�");
ErrorCode SAFETY_PERMIT_NOT_APPROVED = new ErrorCode(1_040_965_003, "浣滀笟绁ㄦ湭瀹℃壒閫氳繃锛屼笉鑳藉紑濮嬩綔涓�");
ErrorCode SAFETY_PERMIT_GUARDIAN_REQUIRED = new ErrorCode(1_040_965_004, "楂樺嵄浣滀笟蹇呴』鎸囧畾鐩戞姢浜�");
+ ErrorCode SAFETY_PERMIT_SELF_APPROVE = new ErrorCode(1_040_965_005, "鐢宠浜轰笉鑳藉鎵硅嚜宸辩殑浣滀笟绁�");
ErrorCode SAFETY_PERMIT_MONITOR_NOT_EXISTS = new ErrorCode(1_040_965_010, "鐩戞姢璁板綍涓嶅瓨鍦�");
// ========== 鐗╄祫鍙拌处 1_040_966_xxx ==========
@@ -55,6 +56,10 @@
ErrorCode SAFETY_DRILL_NOT_EXISTS = new ErrorCode(1_040_967_010, "婕旂粌璁板綍涓嶅瓨鍦�");
ErrorCode SAFETY_ACCIDENT_NOT_EXISTS = new ErrorCode(1_040_967_020, "浜嬫晠璁板綍涓嶅瓨鍦�");
+ // ========== 涓绘暟鎹紩鐢� 1_040_969_xxx ==========
+ ErrorCode SAFETY_WORKSHOP_NOT_EXISTS = new ErrorCode(1_040_969_000, "杞﹂棿涓嶅瓨鍦紝璇蜂粠杞﹂棿涓绘暟鎹腑閫夋嫨");
+ ErrorCode SAFETY_EMPLOYEE_REQUIRED = new ErrorCode(1_040_969_001, "璇烽�夋嫨鍛樺伐");
+
// ========== 鍙拌处瀵煎嚭 1_040_968_xxx ==========
ErrorCode SAFETY_LEDGER_EXPORT_ITEM_UNKNOWN = new ErrorCode(1_040_968_000, "鏈煡鐨勫彴璐﹀鍑洪」");
ErrorCode SAFETY_LEDGER_DATE_RANGE_INVALID = new ErrorCode(1_040_968_001, "寮�濮嬫棩鏈熶笉鑳芥櫄浜庣粨鏉熸棩鏈�");
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 575cddb..b40ca58 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
@@ -50,6 +50,8 @@
private SafetyCertificateMapper certificateMapper;
@Resource
private HrmEmployeeApi hrmEmployeeApi;
+ @Resource
+ private SafetyRefResolver refResolver;
public Long createCertificate(SafetyCertificateSaveReqVO reqVO) {
reqVO.setId(null);
@@ -113,9 +115,25 @@
}
/**
+ * 鎵归噺琛ュ叏灞曠ず瀛楁锛屾寔璇佷汉妗f涓�娆℃�ф煡濂斤紝閬垮厤閫愭潯鏌ヨ
+ */
+ public void fillDisplayFieldsBatch(List<SafetyCertificateDO> certs, List<SafetyCertificateRespVO> resps) {
+ var employeeMap = refResolver.employeeMap(certs.stream().map(SafetyCertificateDO::getEmployeeId).toList());
+ for (int i = 0; i < certs.size(); i++) {
+ fillDisplayFields(certs.get(i), resps.get(i), employeeMap.get(certs.get(i).getEmployeeId()));
+ }
+ }
+
+ /**
* 鍗曚釜璇佷欢鐨勫睍绀哄瓧娈佃ˉ鍏紙绫诲瀷鍚嶇О銆佺姸鎬佸悕绉般�佸墿浣欏ぉ鏁般�佹寔璇佷汉妗f锛�
*/
public void fillDisplayFields(SafetyCertificateDO cert, SafetyCertificateRespVO respVO) {
+ fillDisplayFields(cert, respVO, cert.getEmployeeId() == null ? null
+ : hrmEmployeeApi.getEmployee(cert.getEmployeeId()));
+ }
+
+ private void fillDisplayFields(SafetyCertificateDO cert, SafetyCertificateRespVO respVO,
+ HrmEmployeeSimpleDTO employee) {
respVO.setCertTypeName(SafetyCertificateTypeEnum.getNameByType(cert.getCertType()));
String status = resolveStatus(cert.getExpireDate(), cert.getWarnDays(), cert.getStatus());
respVO.setStatus(status);
@@ -123,8 +141,6 @@
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());
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyHazardService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyHazardService.java
index db2ebd9..255d851 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyHazardService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyHazardService.java
@@ -1,5 +1,6 @@
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;
@@ -17,6 +18,7 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
+import java.util.List;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.mes.enums.SafetyErrorCodeConstants.*;
@@ -37,6 +39,8 @@
@Resource
private SafetyHazardMapper hazardMapper;
+ @Resource
+ private SafetyRefResolver refResolver;
/**
* 闅愭偅涓婃姤锛堝惈绉诲姩绔媿鐓т笂浼犵殑 photoUrls锛�
@@ -47,7 +51,8 @@
SafetyHazardDO hazard = BeanUtils.toBean(reqVO, SafetyHazardDO.class);
hazard.setCode(hazardMapper.selectNextCode("HZ" + LocalDate.now().format(CODE_DATE)));
hazard.setTitle(StrUtil.trim(reqVO.getTitle()));
- hazard.setReporter(StrUtil.trim(reqVO.getReporter()));
+ hazard.setReporterId(reqVO.getReporterId());
+ hazard.setReporter(refResolver.requireEmployee(reqVO.getReporterId(), SAFETY_EMPLOYEE_REQUIRED).getName());
hazard.setLevel(StrUtil.blankToDefault(reqVO.getLevel(), SafetyHazardLevelEnum.GENERAL.getLevel()));
hazard.setSource(StrUtil.blankToDefault(reqVO.getSource(), SafetyHazardSourceEnum.SELF_CHECK.getSource()));
hazard.setReportTime(reqVO.getReportTime() == null ? LocalDateTime.now() : reqVO.getReportTime());
@@ -83,12 +88,14 @@
&& !SafetyHazardStatusEnum.REJECTED.getStatus().equals(hazard.getStatus())) {
throw exception(SAFETY_HAZARD_STATUS_ERROR);
}
- if (StrUtil.isBlank(reqVO.getAssignee())) {
+ if (reqVO.getAssigneeId() == null) {
throw exception(SAFETY_HAZARD_ASSIGNEE_REQUIRED);
}
+ var assignee = refResolver.requireEmployee(reqVO.getAssigneeId(), SAFETY_HAZARD_ASSIGNEE_REQUIRED);
SafetyHazardDO update = new SafetyHazardDO();
update.setId(hazard.getId());
- update.setAssignee(StrUtil.trim(reqVO.getAssignee()));
+ update.setAssigneeId(assignee.getId());
+ update.setAssignee(assignee.getName());
update.setAssignTime(LocalDateTime.now());
update.setRectifyDeadline(reqVO.getRectifyDeadline());
update.setStatus(SafetyHazardStatusEnum.RECTIFYING.getStatus());
@@ -128,14 +135,16 @@
if (!SafetyHazardStatusEnum.RECHECKING.getStatus().equals(hazard.getStatus())) {
throw exception(SAFETY_HAZARD_STATUS_ERROR);
}
- String rechecker = StrUtil.trim(reqVO.getRechecker());
- if (StrUtil.isNotBlank(hazard.getAssignee()) && hazard.getAssignee().equals(rechecker)) {
+ var rechecker = refResolver.requireEmployee(reqVO.getRecheckerId(), SAFETY_EMPLOYEE_REQUIRED);
+ // 鐢ㄥ憳宸ョ紪鍙锋瘮杈冿紝姣斿鍚嶆瘮杈冨彲闈狅紙鍚屽悕涓嶅悓浜� / 鏀瑰悕閮戒笉浼氳鍒わ級
+ if (hazard.getAssigneeId() != null && hazard.getAssigneeId().equals(rechecker.getId())) {
throw exception(SAFETY_HAZARD_SAME_OPERATOR);
}
boolean passed = "PASSED".equals(reqVO.getRecheckResult());
SafetyHazardDO update = new SafetyHazardDO();
update.setId(hazard.getId());
- update.setRechecker(rechecker);
+ update.setRecheckerId(rechecker.getId());
+ update.setRechecker(rechecker.getName());
update.setRecheckTime(LocalDateTime.now());
update.setRecheckResult(reqVO.getRecheckResult());
update.setRecheckRemark(reqVO.getRecheckRemark());
@@ -163,6 +172,26 @@
}
/**
+ * 鎵归噺鍥炲~涓婃姤浜� / 鏁存敼璐d换浜� / 澶嶆煡浜虹殑鏈�鏂板鍚�
+ */
+ public void fillPersonNames(List<SafetyHazardDO> hazards) {
+ if (CollUtil.isEmpty(hazards)) {
+ return;
+ }
+ var ids = new java.util.ArrayList<Long>(hazards.size() * 3);
+ hazards.forEach(h -> { ids.add(h.getReporterId()); ids.add(h.getAssigneeId()); ids.add(h.getRecheckerId()); });
+ var employeeMap = refResolver.employeeMap(ids);
+ hazards.forEach(hazard -> {
+ var reporter = employeeMap.get(hazard.getReporterId());
+ if (reporter != null) hazard.setReporter(reporter.getName());
+ var assignee = employeeMap.get(hazard.getAssigneeId());
+ if (assignee != null) hazard.setAssignee(assignee.getName());
+ var rechecker = employeeMap.get(hazard.getRecheckerId());
+ if (rechecker != null) hazard.setRechecker(rechecker.getName());
+ });
+ }
+
+ /**
* 灞曠ず瀛楁琛ュ叏锛堢瓑绾�/鏉ユ簮/鐘舵�佸悕绉般�佽秴鏈熸爣璁帮級
*/
public static void fillHazardDisplay(SafetyHazardDO hazard, SafetyHazardRespVO respVO) {
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyInspectionService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyInspectionService.java
index fb1bb45..aa4df41 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyInspectionService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyInspectionService.java
@@ -1,5 +1,6 @@
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;
@@ -35,6 +36,8 @@
private SafetyInspectionPointMapper pointMapper;
@Resource
private SafetyInspectionMapper inspectionMapper;
+ @Resource
+ private SafetyRefResolver refResolver;
// ==================== 宸℃鐐逛綅 ====================
@@ -48,6 +51,7 @@
point.setCode(code);
point.setName(StrUtil.trim(reqVO.getName()));
point.setInspectCycle(StrUtil.blankToDefault(reqVO.getInspectCycle(), SafetyInspectCycleEnum.DAILY.getCycle()));
+ applyPointRefs(point, reqVO.getWorkshopId(), reqVO.getOwnerId());
pointMapper.insert(point);
return point.getId();
}
@@ -62,6 +66,7 @@
SafetyInspectionPointDO point = BeanUtils.toBean(reqVO, SafetyInspectionPointDO.class);
point.setCode(code);
point.setName(StrUtil.trim(reqVO.getName()));
+ applyPointRefs(point, reqVO.getWorkshopId(), reqVO.getOwnerId());
pointMapper.updateById(point);
}
@@ -83,6 +88,45 @@
*/
public List<SafetyInspectionPointDO> getEnabledPointList() {
return pointMapper.selectListByStatus(0);
+ }
+
+ /**
+ * 鐐逛綅鐨勪富鏁版嵁寮曠敤锛氳溅闂� + 璐d换浜猴紝浠庝富鏁版嵁甯﹀嚭鍚嶇О钀藉揩鐓�
+ */
+ private void applyPointRefs(SafetyInspectionPointDO point, Long workshopId, Long ownerId) {
+ point.setWorkshopId(workshopId);
+ if (workshopId == null) {
+ point.setWorkshopName("");
+ } else {
+ point.setWorkshopName(refResolver.requireWorkshop(workshopId).getName());
+ }
+ point.setOwnerId(ownerId);
+ if (ownerId == null) {
+ point.setOwnerName("");
+ } else {
+ point.setOwnerName(refResolver.requireEmployee(ownerId, SAFETY_EMPLOYEE_REQUIRED).getName());
+ }
+ }
+
+ /**
+ * 鎵归噺鍥炲~鐐逛綅鐨勮溅闂村悕涓庤矗浠讳汉濮撳悕锛堢敤涓绘暟鎹渶鏂板�艰鐩栧揩鐓э級
+ */
+ public void fillPointRefs(List<SafetyInspectionPointDO> points) {
+ if (CollUtil.isEmpty(points)) {
+ return;
+ }
+ var workshopMap = refResolver.workshopMap(points.stream().map(SafetyInspectionPointDO::getWorkshopId).toList());
+ var employeeMap = refResolver.employeeMap(points.stream().map(SafetyInspectionPointDO::getOwnerId).toList());
+ points.forEach(point -> {
+ var workshop = workshopMap.get(point.getWorkshopId());
+ if (workshop != null) {
+ point.setWorkshopName(workshop.getName());
+ }
+ var employee = employeeMap.get(point.getOwnerId());
+ if (employee != null) {
+ point.setOwnerName(employee.getName());
+ }
+ });
}
public static void fillPointDisplay(SafetyInspectionPointDO point, SafetyInspectionPointRespVO respVO) {
@@ -129,7 +173,8 @@
inspection.setPointId(point.getId());
inspection.setPointName(point.getName());
inspection.setPointType(point.getPointType());
- inspection.setInspector(StrUtil.trim(reqVO.getInspector()));
+ inspection.setInspectorId(reqVO.getInspectorId());
+ inspection.setInspector(refResolver.requireEmployee(reqVO.getInspectorId(), SAFETY_EMPLOYEE_REQUIRED).getName());
inspection.setResult(StrUtil.blankToDefault(reqVO.getResult(), "NORMAL"));
inspection.setInspectTime(reqVO.getInspectTime() == null ? LocalDateTime.now() : reqVO.getInspectTime());
inspection.setHazardCount(reqVO.getHazardCount() == null ? 0 : reqVO.getHazardCount());
@@ -137,6 +182,22 @@
return inspection;
}
+ /**
+ * 鎵归噺鍥炲~宸℃浜烘渶鏂板鍚�
+ */
+ public void fillInspectorNames(List<SafetyInspectionDO> records) {
+ if (CollUtil.isEmpty(records)) {
+ return;
+ }
+ var employeeMap = refResolver.employeeMap(records.stream().map(SafetyInspectionDO::getInspectorId).toList());
+ records.forEach(record -> {
+ var employee = employeeMap.get(record.getInspectorId());
+ if (employee != null) {
+ record.setInspector(employee.getName());
+ }
+ });
+ }
+
/** 鏈�杩戜竴娆″贰妫�鏃堕棿锛堢敤浜庣偣浣嶅垪琛ㄥ睍绀猴級 */
public LocalDateTime getLastInspectTime(Long pointId) {
SafetyInspectionDO latest = inspectionMapper.selectLatestByPointId(pointId);
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 ba65069..dea71a1 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
@@ -129,7 +129,9 @@
if (start != null && end != null) {
reqVO.setInspectTime(new java.time.LocalDateTime[]{start.atStartOfDay(), end.atTime(23, 59, 59)});
}
- List<List<Object>> rows = inspectionService.getInspectionPage(reqVO).getList().stream()
+ var inspections = inspectionService.getInspectionPage(reqVO).getList();
+ inspectionService.fillInspectorNames(inspections);
+ List<List<Object>> rows = inspections.stream()
.map(i -> Arrays.<Object>asList(
dateTime(i.getInspectTime()), str(i.getPointName()),
SafetyInspectionPointTypeEnum.getNameByType(i.getPointType()),
@@ -149,7 +151,9 @@
if (start != null && end != null) {
reqVO.setReportTime(new java.time.LocalDateTime[]{start.atStartOfDay(), end.atTime(23, 59, 59)});
}
- List<List<Object>> rows = hazardService.getHazardPage(reqVO).getList().stream()
+ var hazards = hazardService.getHazardPage(reqVO).getList();
+ hazardService.fillPersonNames(hazards);
+ List<List<Object>> rows = hazards.stream()
.map(h -> Arrays.<Object>asList(
str(h.getCode()), str(h.getTitle()),
SafetyHazardLevelEnum.getNameByLevel(h.getLevel()),
@@ -174,7 +178,9 @@
if (start != null && end != null) {
reqVO.setPlanStartTime(new java.time.LocalDateTime[]{start.atStartOfDay(), end.atTime(23, 59, 59)});
}
- List<List<Object>> rows = permitService.getPermitPage(reqVO).getList().stream()
+ var permits = permitService.getPermitPage(reqVO).getList();
+ permitService.fillPermitRefs(permits);
+ List<List<Object>> rows = permits.stream()
.map(p -> Arrays.<Object>asList(
str(p.getCode()), SafetyPermitTypeEnum.getNameByType(p.getPermitType()),
str(p.getTitle()), str(p.getWorkshopName()), str(p.getLocation()),
@@ -194,7 +200,9 @@
reqVO.setPageSize(5_000);
List<List<Object>> rows = new ArrayList<>();
for (SafetyWorkPermitDO permit : permitService.getPermitPage(reqVO).getList()) {
- for (SafetyWorkPermitMonitorDO monitor : permitService.getMonitorList(permit.getId())) {
+ var monitors = permitService.getMonitorList(permit.getId());
+ permitService.fillMonitorGuardians(monitors);
+ for (SafetyWorkPermitMonitorDO monitor : monitors) {
rows.add(Arrays.asList(str(permit.getCode()), dateTime(monitor.getMonitorTime()),
str(monitor.getGuardian()), str(monitor.getMonitorContent()), str(monitor.getAbnormal())));
}
@@ -208,7 +216,9 @@
var reqVO = new cn.iocoder.yudao.module.mes.controller.admin.safety.vo.material.SafetyMaterialPageReqVO();
reqVO.setPageNo(1);
reqVO.setPageSize(50_000);
- List<List<Object>> rows = materialService.getMaterialPage(reqVO).getList().stream()
+ var materials = materialService.getMaterialPage(reqVO).getList();
+ materialService.fillManagers(materials);
+ List<List<Object>> rows = materials.stream()
.map(m -> Arrays.<Object>asList(
str(m.getCode()), str(m.getName()),
SafetyMaterialCategoryEnum.getNameByCategory(m.getCategory()),
@@ -242,7 +252,9 @@
private Sheet trainingSheet(LocalDate start, LocalDate end) {
List<String> headers = List.of("鍩硅鏃ユ湡", "鍩硅涓婚", "鍩硅绫诲瀷", "瀛︽椂", "璁插笀/缁勭粐浜�",
"鍩硅鍦扮偣", "鍙傚姞浜烘暟", "鍩硅鍐呭", "鑰冩牳鎯呭喌");
- List<List<Object>> rows = trainingService.listTrainingBetween(start, end).stream()
+ var trainings = trainingService.listTrainingBetween(start, end);
+ trainingService.fillTrainers(trainings);
+ List<List<Object>> rows = trainings.stream()
.map(t -> Arrays.<Object>asList(
date(t.getTrainDate()), str(t.getTitle()),
SafetyTrainingTypeEnum.getNameByType(t.getTrainingType()),
@@ -256,7 +268,9 @@
private Sheet drillSheet(LocalDate start, LocalDate end) {
List<String> headers = List.of("婕旂粌鏃ユ湡", "婕旂粌鍚嶇О", "婕旂粌绫诲瀷", "鍦扮偣", "缁勭粐浜�",
"鍙傚姞浜烘暟", "鏃堕暱(鍒嗛挓)", "婕旂粌杩囩▼", "鎬荤粨涓庢敼杩�");
- List<List<Object>> rows = trainingService.listDrillBetween(start, end).stream()
+ var drills = trainingService.listDrillBetween(start, end);
+ trainingService.fillOrganizers(drills);
+ List<List<Object>> rows = drills.stream()
.map(d -> Arrays.<Object>asList(
date(d.getDrillDate()), str(d.getTitle()),
SafetyDrillTypeEnum.getNameByType(d.getDrillType()), str(d.getLocation()),
@@ -270,7 +284,9 @@
private Sheet accidentSheet(LocalDate start, LocalDate end) {
List<String> headers = List.of("浜嬫晠缂栧彿", "浜嬫晠鍚嶇О", "浜嬫晠绫诲瀷", "绛夌骇", "鍙戠敓鏃堕棿", "鍙戠敓鍦扮偣",
"浼や骸鎯呭喌", "缁忔祹鎹熷け(鍏�)", "浜嬫晠缁忚繃", "鍘熷洜鍒嗘瀽", "澶勭悊鎺柦", "鐘舵��");
- List<List<Object>> rows = trainingService.listAccidentBetween(start, end).stream()
+ var accidents = trainingService.listAccidentBetween(start, end);
+ trainingService.fillAccidentRefs(accidents);
+ List<List<Object>> rows = accidents.stream()
.map(a -> Arrays.<Object>asList(
str(a.getCode()), str(a.getTitle()),
SafetyAccidentTypeEnum.getNameByType(a.getAccidentType()),
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyMaterialService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyMaterialService.java
index 6412acd..7b9f0b5 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyMaterialService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyMaterialService.java
@@ -1,5 +1,6 @@
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;
@@ -36,6 +37,8 @@
@Resource
private SafetyMaterialMapper materialMapper;
@Resource
+ private SafetyRefResolver refResolver;
+ @Resource
private SafetyMaterialStockMapper stockMapper;
// ==================== 鐗╄祫鍙拌处 ====================
@@ -50,6 +53,7 @@
material.setCode(code);
material.setName(StrUtil.trim(reqVO.getName()));
material.setUnit(StrUtil.blankToDefault(reqVO.getUnit(), "涓�"));
+ applyManager(material, reqVO.getManagerId());
material.setStockQty(reqVO.getStockQty() == null ? BigDecimal.ZERO : reqVO.getStockQty());
material.setSafeStock(reqVO.getSafeStock() == null ? BigDecimal.ZERO : reqVO.getSafeStock());
materialMapper.insert(material);
@@ -66,6 +70,7 @@
SafetyMaterialDO material = BeanUtils.toBean(reqVO, SafetyMaterialDO.class);
material.setCode(code);
material.setName(StrUtil.trim(reqVO.getName()));
+ applyManager(material, reqVO.getManagerId());
// 搴撳瓨鏁伴噺鍙兘閫氳繃鍑哄叆搴撳崟鍙樺姩锛岀姝㈢洿鎺ョ紪杈�
material.setStockQty(null);
materialMapper.updateById(material);
@@ -84,6 +89,29 @@
return materialMapper.selectPage(reqVO);
}
+ /**
+ * 淇濈浜猴細浠庡憳宸ユ。妗堝甫鍑哄鍚嶈惤蹇収
+ */
+ private void applyManager(SafetyMaterialDO material, Long managerId) {
+ material.setManagerId(managerId);
+ material.setManager(managerId == null ? ""
+ : refResolver.requireEmployee(managerId, SAFETY_EMPLOYEE_REQUIRED).getName());
+ }
+
+ /**
+ * 鎵归噺鍥炲~淇濈浜烘渶鏂板鍚�
+ */
+ public void fillManagers(List<SafetyMaterialDO> materials) {
+ if (CollUtil.isEmpty(materials)) {
+ return;
+ }
+ var employeeMap = refResolver.employeeMap(materials.stream().map(SafetyMaterialDO::getManagerId).toList());
+ materials.forEach(material -> {
+ var employee = employeeMap.get(material.getManagerId());
+ if (employee != null) material.setManager(employee.getName());
+ });
+ }
+
public static void fillMaterialDisplay(SafetyMaterialDO material, SafetyMaterialRespVO respVO) {
respVO.setCategoryName(SafetyMaterialCategoryEnum.getNameByCategory(material.getCategory()));
BigDecimal stock = material.getStockQty() == null ? BigDecimal.ZERO : material.getStockQty();
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyOrgService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyOrgService.java
index 9f0d696..c9594a8 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyOrgService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyOrgService.java
@@ -29,12 +29,15 @@
@Resource
private SafetyOrgMapper safetyOrgMapper;
+ @Resource
+ private SafetyRefResolver refResolver;
public Long createOrg(SafetyOrgSaveReqVO reqVO) {
reqVO.setId(null);
validateParent(reqVO.getParentId(), null);
SafetyOrgDO org = BeanUtils.toBean(reqVO, SafetyOrgDO.class);
org.setParentId(reqVO.getParentId() == null ? 0L : reqVO.getParentId());
+ applyLeader(org, reqVO.getLeaderId());
safetyOrgMapper.insert(org);
return org.getId();
}
@@ -44,7 +47,22 @@
validateParent(reqVO.getParentId(), reqVO.getId());
SafetyOrgDO org = BeanUtils.toBean(reqVO, SafetyOrgDO.class);
org.setParentId(reqVO.getParentId() == null ? 0L : reqVO.getParentId());
+ applyLeader(org, reqVO.getLeaderId());
safetyOrgMapper.updateById(org);
+ }
+
+ /**
+ * 璐熻矗浜猴細浠庡憳宸ユ。妗堝甫鍑哄鍚嶄笌鐢佃瘽骞惰惤蹇収
+ */
+ private void applyLeader(SafetyOrgDO org, Long leaderId) {
+ org.setLeaderId(leaderId);
+ if (leaderId == null) {
+ org.setLeaderName("");
+ return;
+ }
+ var employee = refResolver.requireEmployee(leaderId, SAFETY_EMPLOYEE_REQUIRED);
+ org.setLeaderName(employee.getName());
+ org.setLeaderPhone(employee.getPhone());
}
public void deleteOrg(Long id) {
@@ -60,11 +78,27 @@
}
/**
+ * 鍙栬礋璐d汉鏈�鏂版。妗堬紙渚涘崟鏉℃煡璇㈠洖濉敤锛�
+ */
+ public cn.iocoder.yudao.module.hrm.api.employee.dto.HrmEmployeeSimpleDTO getLeader(Long leaderId) {
+ return refResolver.findEmployee(leaderId);
+ }
+
+ /**
* 鏌ヨ缁勭粐鏍�
*/
public List<SafetyOrgRespVO> getOrgTree() {
List<SafetyOrgDO> all = safetyOrgMapper.selectListOrdered();
List<SafetyOrgRespVO> nodes = BeanUtils.toBean(all, SafetyOrgRespVO.class);
+ // 璐熻矗浜虹敤鍛樺伐妗f鏈�鏂板鍚嶈鐩栧揩鐓э紝鍛樺伐鏀瑰悕/璋冨矖鍚庢爲涔熷悓姝�
+ var employeeMap = refResolver.employeeMap(
+ all.stream().map(SafetyOrgDO::getLeaderId).toList());
+ nodes.forEach(node -> {
+ var employee = employeeMap.get(node.getLeaderId());
+ if (employee != null) {
+ node.setLeaderName(employee.getName());
+ }
+ });
Map<Long, List<SafetyOrgRespVO>> grouped = nodes.stream()
.collect(Collectors.groupingBy(SafetyOrgRespVO::getParentId, Collectors.toList()));
nodes.forEach(node -> node.setChildren(grouped.getOrDefault(node.getId(), new ArrayList<>())));
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyRefResolver.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyRefResolver.java
new file mode 100644
index 0000000..6350614
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyRefResolver.java
@@ -0,0 +1,117 @@
+package cn.iocoder.yudao.module.mes.service.safety;
+
+import cn.hutool.core.collection.CollUtil;
+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.dal.dataobject.md.workstation.MesMdWorkshopDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.md.workstation.MesMdWorkshopMapper;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Component;
+
+import java.util.Collection;
+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.*;
+
+/**
+ * 瀹夊叏鐢熶骇 - 涓绘暟鎹紩鐢ㄨВ鏋愬櫒
+ *
+ * <p>妯″潡鍐呮墍鏈夈�屼汉鍛樸�嶄笌銆岃溅闂淬�嶅瓧娈电粺涓�璧拌繖閲岃В鏋愶紝閬垮厤姣忎釜 Service 閲嶅鍐欎竴閬嶃��</p>
+ *
+ * <p>缁熶竴绾﹀畾锛氫笟鍔¤〃瀛� {@code xxxId} 鍏宠仈涓绘暟鎹紝鍚屾椂淇濈暀 {@code xxxName} 浣滀负蹇収銆�
+ * 淇濆瓨鏃朵粠涓绘暟鎹妸鍚嶇О甯﹀嚭鍐欏揩鐓э紱鏌ヨ鏃剁敤涓绘暟鎹渶鏂板�艰鐩栧揩鐓э紝
+ * 杩欐牱鍛樺伐璋冨矖銆佽溅闂存敼鍚嶅悗鍙拌处浼氳嚜鍔ㄨ窡鐫�鍙橈紝鑰屼富鏁版嵁琚垹鏃惰�佽褰曚粛鑳介潬蹇収灞曠ず銆�</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Component
+public class SafetyRefResolver {
+
+ @Resource
+ private HrmEmployeeApi hrmEmployeeApi;
+ @Resource
+ private MesMdWorkshopMapper workshopMapper;
+
+ // ==================== 鍛樺伐 ====================
+
+ /**
+ * 鎸夊憳宸ョ紪鍙峰彇鍛樺伐锛屽繀椤诲瓨鍦�
+ *
+ * @throws cn.iocoder.yudao.framework.common.exception.ServiceException 鍛樺伐涓嶅瓨鍦ㄦ椂鎶涘嚭
+ */
+ public HrmEmployeeSimpleDTO requireEmployee(Long employeeId, cn.iocoder.yudao.framework.common.exception.ErrorCode errorCode) {
+ if (employeeId == null) {
+ throw exception(errorCode);
+ }
+ HrmEmployeeSimpleDTO employee = hrmEmployeeApi.getEmployee(employeeId);
+ if (employee == null) {
+ throw exception(errorCode);
+ }
+ return employee;
+ }
+
+ /**
+ * 鍙┖鐨勫憳宸ヨВ鏋愶細id 涓虹┖杩斿洖 null锛屼笉鏍¢獙瀛樺湪鎬э紙鐢ㄤ簬闈炲繀濉瓧娈碉級
+ */
+ public HrmEmployeeSimpleDTO findEmployee(Long employeeId) {
+ return employeeId == null ? null : hrmEmployeeApi.getEmployee(employeeId);
+ }
+
+ /**
+ * 鎵归噺鍙栧憳宸ワ紝杩斿洖 id -> 鍛樺伐 鐨� Map
+ */
+ public Map<Long, HrmEmployeeSimpleDTO> employeeMap(Collection<Long> employeeIds) {
+ if (CollUtil.isEmpty(employeeIds)) {
+ return Map.of();
+ }
+ List<Long> ids = employeeIds.stream().filter(Objects::nonNull).distinct().toList();
+ if (ids.isEmpty()) {
+ return Map.of();
+ }
+ return hrmEmployeeApi.getEmployeeList(ids).stream()
+ .collect(Collectors.toMap(HrmEmployeeSimpleDTO::getId, e -> e, (a, b) -> a));
+ }
+
+ // ==================== 杞﹂棿 ====================
+
+ /**
+ * 鎸夎溅闂寸紪鍙峰彇杞﹂棿锛屽繀椤诲瓨鍦�
+ */
+ public MesMdWorkshopDO requireWorkshop(Long workshopId) {
+ if (workshopId == null) {
+ throw exception(SAFETY_WORKSHOP_NOT_EXISTS);
+ }
+ MesMdWorkshopDO workshop = workshopMapper.selectById(workshopId);
+ if (workshop == null) {
+ throw exception(SAFETY_WORKSHOP_NOT_EXISTS);
+ }
+ return workshop;
+ }
+
+ /**
+ * 鍙┖鐨勮溅闂磋В鏋�
+ */
+ public MesMdWorkshopDO findWorkshop(Long workshopId) {
+ return workshopId == null ? null : workshopMapper.selectById(workshopId);
+ }
+
+ /**
+ * 鎵归噺鍙栬溅闂达紝杩斿洖 id -> 杞﹂棿 鐨� Map
+ */
+ public Map<Long, MesMdWorkshopDO> workshopMap(Collection<Long> workshopIds) {
+ if (CollUtil.isEmpty(workshopIds)) {
+ return Map.of();
+ }
+ List<Long> ids = workshopIds.stream().filter(Objects::nonNull).distinct().toList();
+ if (ids.isEmpty()) {
+ return Map.of();
+ }
+ return workshopMapper.selectBatchIds(ids).stream()
+ .collect(Collectors.toMap(MesMdWorkshopDO::getId, w -> w, (a, b) -> a));
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyTrainingService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyTrainingService.java
index 03284b3..bd857fb 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyTrainingService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyTrainingService.java
@@ -1,5 +1,6 @@
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;
@@ -39,6 +40,8 @@
@Resource
private SafetyTrainingMapper trainingMapper;
@Resource
+ private SafetyRefResolver refResolver;
+ @Resource
private SafetyDrillMapper drillMapper;
@Resource
private SafetyAccidentMapper accidentMapper;
@@ -50,6 +53,9 @@
SafetyTrainingDO training = BeanUtils.toBean(reqVO, SafetyTrainingDO.class);
training.setTitle(StrUtil.trim(reqVO.getTitle()));
training.setTrainingType(StrUtil.blankToDefault(reqVO.getTrainingType(), SafetyTrainingTypeEnum.SAFETY.getType()));
+ training.setTrainerId(reqVO.getTrainerId());
+ training.setTrainer(reqVO.getTrainerId() == null ? ""
+ : refResolver.requireEmployee(reqVO.getTrainerId(), SAFETY_EMPLOYEE_REQUIRED).getName());
training.setParticipantCount(resolveCount(reqVO.getParticipantCount(), reqVO.getParticipants()));
training.setRemark(reqVO.getRemark() == null ? "" : reqVO.getRemark().trim());
trainingMapper.insert(training);
@@ -77,6 +83,51 @@
return trainingMapper.selectPage(reqVO);
}
+ /**
+ * 浜嬫晠鐨勪富鏁版嵁寮曠敤锛氭墍灞炶溅闂� + 鐧昏浜�
+ */
+ private void applyAccidentRefs(SafetyAccidentDO accident, SafetyAccidentSaveReqVO reqVO) {
+ accident.setWorkshopId(reqVO.getWorkshopId());
+ accident.setWorkshopName(reqVO.getWorkshopId() == null ? ""
+ : refResolver.requireWorkshop(reqVO.getWorkshopId()).getName());
+ accident.setReporterId(reqVO.getReporterId());
+ accident.setReporter(reqVO.getReporterId() == null ? ""
+ : refResolver.requireEmployee(reqVO.getReporterId(), SAFETY_EMPLOYEE_REQUIRED).getName());
+ }
+
+ /** 鎵归噺鍥炲~鍩硅璁插笀鏈�鏂板鍚� */
+ public void fillTrainers(List<SafetyTrainingDO> trainings) {
+ if (CollUtil.isEmpty(trainings)) return;
+ var employeeMap = refResolver.employeeMap(trainings.stream().map(SafetyTrainingDO::getTrainerId).toList());
+ trainings.forEach(t -> {
+ var e = employeeMap.get(t.getTrainerId());
+ if (e != null) t.setTrainer(e.getName());
+ });
+ }
+
+ /** 鎵归噺鍥炲~婕旂粌缁勭粐浜烘渶鏂板鍚� */
+ public void fillOrganizers(List<SafetyDrillDO> drills) {
+ if (CollUtil.isEmpty(drills)) return;
+ var employeeMap = refResolver.employeeMap(drills.stream().map(SafetyDrillDO::getOrganizerId).toList());
+ drills.forEach(d -> {
+ var e = employeeMap.get(d.getOrganizerId());
+ if (e != null) d.setOrganizer(e.getName());
+ });
+ }
+
+ /** 鎵归噺鍥炲~浜嬫晠鐨勮溅闂村悕涓庣櫥璁颁汉濮撳悕 */
+ public void fillAccidentRefs(List<SafetyAccidentDO> accidents) {
+ if (CollUtil.isEmpty(accidents)) return;
+ var workshopMap = refResolver.workshopMap(accidents.stream().map(SafetyAccidentDO::getWorkshopId).toList());
+ var employeeMap = refResolver.employeeMap(accidents.stream().map(SafetyAccidentDO::getReporterId).toList());
+ accidents.forEach(a -> {
+ var w = workshopMap.get(a.getWorkshopId());
+ if (w != null) a.setWorkshopName(w.getName());
+ var e = employeeMap.get(a.getReporterId());
+ if (e != null) a.setReporter(e.getName());
+ });
+ }
+
public static void fillTrainingDisplay(SafetyTrainingDO training, SafetyTrainingRespVO respVO) {
respVO.setTrainingTypeName(SafetyTrainingTypeEnum.getNameByType(training.getTrainingType()));
}
@@ -88,6 +139,9 @@
SafetyDrillDO drill = BeanUtils.toBean(reqVO, SafetyDrillDO.class);
drill.setTitle(StrUtil.trim(reqVO.getTitle()));
drill.setDrillType(StrUtil.blankToDefault(reqVO.getDrillType(), SafetyDrillTypeEnum.FIRE.getType()));
+ drill.setOrganizerId(reqVO.getOrganizerId());
+ drill.setOrganizer(reqVO.getOrganizerId() == null ? ""
+ : refResolver.requireEmployee(reqVO.getOrganizerId(), SAFETY_EMPLOYEE_REQUIRED).getName());
drill.setParticipantCount(resolveCount(reqVO.getParticipantCount(), reqVO.getParticipants()));
drill.setRemark(reqVO.getRemark() == null ? "" : reqVO.getRemark().trim());
drillMapper.insert(drill);
@@ -128,6 +182,7 @@
accident.setTitle(StrUtil.trim(reqVO.getTitle()));
accident.setLevel(StrUtil.blankToDefault(reqVO.getLevel(), SafetyAccidentLevelEnum.GENERAL.getLevel()));
accident.setStatus(StrUtil.blankToDefault(reqVO.getStatus(), SafetyAccidentStatusEnum.REPORTED.getStatus()));
+ applyAccidentRefs(accident, reqVO);
accident.setReportTime(reqVO.getReportTime() == null ? LocalDateTime.now() : reqVO.getReportTime());
accident.setRemark(reqVO.getRemark() == null ? "" : reqVO.getRemark().trim());
accidentMapper.insert(accident);
@@ -138,6 +193,7 @@
validateAccidentExists(reqVO.getId());
SafetyAccidentDO accident = BeanUtils.toBean(reqVO, SafetyAccidentDO.class);
accident.setCode(null);
+ applyAccidentRefs(accident, reqVO);
accidentMapper.updateById(accident);
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyWorkPermitService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyWorkPermitService.java
index 77c9b00..3899bc6 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyWorkPermitService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyWorkPermitService.java
@@ -1,5 +1,6 @@
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;
@@ -41,6 +42,8 @@
@Resource
private SafetyWorkPermitMapper permitMapper;
@Resource
+ private SafetyRefResolver refResolver;
+ @Resource
private SafetyWorkPermitMonitorMapper monitorMapper;
/**
@@ -53,7 +56,7 @@
SafetyWorkPermitDO permit = BeanUtils.toBean(reqVO, SafetyWorkPermitDO.class);
permit.setCode(permitMapper.selectNextCode("WP" + LocalDate.now().format(CODE_DATE)));
permit.setTitle(StrUtil.trim(reqVO.getTitle()));
- permit.setApplicant(StrUtil.trim(reqVO.getApplicant()));
+ applyPermitRefs(permit, reqVO);
permit.setApplyTime(reqVO.getApplyTime() == null ? LocalDateTime.now() : reqVO.getApplyTime());
permit.setRiskLevel(StrUtil.blankToDefault(reqVO.getRiskLevel(), SafetyRiskLevelEnum.NORMAL.getLevel()));
permit.setStatus(SafetyPermitStatusEnum.PENDING.getStatus());
@@ -72,7 +75,23 @@
SafetyWorkPermitDO update = BeanUtils.toBean(reqVO, SafetyWorkPermitDO.class);
update.setCode(null);
update.setStatus(null);
+ applyPermitRefs(update, reqVO);
permitMapper.updateById(update);
+ }
+
+ /**
+ * 浣滀笟绁ㄧ殑涓绘暟鎹紩鐢細浣滀笟杞﹂棿 + 鐢宠浜� + 鐩戞姢浜猴紝浠庝富鏁版嵁甯﹀嚭鍚嶇О钀藉揩鐓�
+ */
+ private void applyPermitRefs(SafetyWorkPermitDO permit, SafetyWorkPermitSaveReqVO reqVO) {
+ permit.setWorkshopId(reqVO.getWorkshopId());
+ permit.setWorkshopName(reqVO.getWorkshopId() == null ? ""
+ : refResolver.requireWorkshop(reqVO.getWorkshopId()).getName());
+ var applicant = refResolver.requireEmployee(reqVO.getApplicantId(), SAFETY_EMPLOYEE_REQUIRED);
+ permit.setApplicantId(applicant.getId());
+ permit.setApplicant(applicant.getName());
+ permit.setGuardianId(reqVO.getGuardianId());
+ permit.setGuardian(reqVO.getGuardianId() == null ? ""
+ : refResolver.requireEmployee(reqVO.getGuardianId(), SAFETY_EMPLOYEE_REQUIRED).getName());
}
/**
@@ -85,19 +104,20 @@
public void approvePermit(SafetyWorkPermitApproveReqVO reqVO) {
SafetyWorkPermitDO permit = validatePermitExists(reqVO.getId());
ensureStatus(permit, SafetyPermitStatusEnum.PENDING);
- String approver = StrUtil.trim(reqVO.getApprover());
- // 鐢宠浜轰笉鑳藉鎵硅嚜宸辩殑浣滀笟绁�
- if (approver.equals(permit.getApplicant())) {
- throw exception(SAFETY_PERMIT_STATUS_ERROR);
+ var approver = refResolver.requireEmployee(reqVO.getApproverId(), SAFETY_EMPLOYEE_REQUIRED);
+ // 鐢宠浜轰笉鑳藉鎵硅嚜宸辩殑浣滀笟绁紙鎸夊憳宸ョ紪鍙锋瘮杈冿紝閬垮厤鍚屽悕璇垽锛�
+ if (permit.getApplicantId() != null && permit.getApplicantId().equals(approver.getId())) {
+ throw exception(SAFETY_PERMIT_SELF_APPROVE);
}
boolean approved = "APPROVED".equals(reqVO.getDecision());
if (approved && SafetyPermitTypeEnum.requiresGuardian(permit.getPermitType())
- && StrUtil.isBlank(permit.getGuardian())) {
+ && permit.getGuardianId() == null) {
throw exception(SAFETY_PERMIT_GUARDIAN_REQUIRED);
}
SafetyWorkPermitDO update = new SafetyWorkPermitDO();
update.setId(permit.getId());
- update.setApprover(approver);
+ update.setApproverId(approver.getId());
+ update.setApprover(approver.getName());
update.setApproveTime(LocalDateTime.now());
update.setApproveComment(reqVO.getApproveComment());
update.setStatus(approved ? SafetyPermitStatusEnum.APPROVED.getStatus()
@@ -173,7 +193,9 @@
}
SafetyWorkPermitMonitorDO monitor = BeanUtils.toBean(reqVO, SafetyWorkPermitMonitorDO.class);
monitor.setId(null);
- monitor.setGuardian(StrUtil.trim(reqVO.getGuardian()));
+ var guardian = refResolver.requireEmployee(reqVO.getGuardianId(), SAFETY_EMPLOYEE_REQUIRED);
+ monitor.setGuardianId(guardian.getId());
+ monitor.setGuardian(guardian.getName());
monitor.setMonitorTime(reqVO.getMonitorTime() == null ? LocalDateTime.now() : reqVO.getMonitorTime());
monitorMapper.insert(monitor);
return monitor.getId();
@@ -192,6 +214,44 @@
// ==================== 灞曠ず瀛楁 ====================
+ /**
+ * 鎵归噺鍥炲~浣滀笟绁ㄧ殑杞﹂棿鍚嶄笌涓変釜浜哄憳濮撳悕锛堢敵璇蜂汉/瀹℃壒浜�/鐩戞姢浜猴級
+ */
+ public void fillPermitRefs(List<SafetyWorkPermitDO> permits) {
+ if (CollUtil.isEmpty(permits)) {
+ return;
+ }
+ var workshopMap = refResolver.workshopMap(permits.stream().map(SafetyWorkPermitDO::getWorkshopId).toList());
+ var ids = new java.util.ArrayList<Long>(permits.size() * 3);
+ permits.forEach(p -> { ids.add(p.getApplicantId()); ids.add(p.getApproverId()); ids.add(p.getGuardianId()); });
+ var employeeMap = refResolver.employeeMap(ids);
+ permits.forEach(permit -> {
+ var workshop = workshopMap.get(permit.getWorkshopId());
+ if (workshop != null) permit.setWorkshopName(workshop.getName());
+ var applicant = employeeMap.get(permit.getApplicantId());
+ if (applicant != null) permit.setApplicant(applicant.getName());
+ var approver = employeeMap.get(permit.getApproverId());
+ if (approver != null) permit.setApprover(approver.getName());
+ var guardian = employeeMap.get(permit.getGuardianId());
+ if (guardian != null) permit.setGuardian(guardian.getName());
+ });
+ }
+
+ /**
+ * 鎵归噺鍥炲~鐩戞姢璁板綍鐨勭洃鎶や汉鏈�鏂板鍚�
+ */
+ public void fillMonitorGuardians(List<SafetyWorkPermitMonitorDO> monitors) {
+ if (CollUtil.isEmpty(monitors)) {
+ return;
+ }
+ var employeeMap = refResolver.employeeMap(
+ monitors.stream().map(SafetyWorkPermitMonitorDO::getGuardianId).toList());
+ monitors.forEach(monitor -> {
+ var employee = employeeMap.get(monitor.getGuardianId());
+ if (employee != null) monitor.setGuardian(employee.getName());
+ });
+ }
+
public static void fillPermitDisplay(SafetyWorkPermitDO permit, SafetyWorkPermitRespVO respVO) {
respVO.setPermitTypeName(SafetyPermitTypeEnum.getNameByType(permit.getPermitType()));
respVO.setRiskLevelName(SafetyRiskLevelEnum.getNameByLevel(permit.getRiskLevel()));
--
Gitblit v1.9.3