From de754f277f7cef20206c5f30fee6e033c426a554 Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期一, 02 十一月 2026 13:05:32 +0800
Subject: [PATCH] feat(safety): 安全生产五期 - 安全教育培训与持证管理
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/MesSafetyCertificateService.java | 27
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/certificate/MesSafetyCertificatePageReqVO.java | 30 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/MesSafetyTrainingAttendeeMapper.java | 47 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/MesSafetyTrainingController.java | 163 +++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/DictTypeConstants.java | 9
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/training/MesSafetyTrainingAttendeeRespVO.java | 46 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/training/MesSafetyTrainingRespVO.java | 70 ++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/MesSafetyTrainingDO.java | 128 ++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/training/MesSafetyTrainingAttendeeSaveReqVO.java | 43 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/certificate/MesSafetyCertificateSaveReqVO.java | 55 +
sql/mysql/mes_safety_training_init.sql | 201 ++++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/training/MesSafetyTrainingPageReqVO.java | 43 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/certificate/MesSafetyCertificateRespVO.java | 64 ++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/MesSafetyCertificateMapper.java | 57 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/MesSafetyCertificateController.java | 144 ++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/MesSafetyTrainingService.java | 56 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/MesSafetyTrainingAttendeeDO.java | 88 ++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java | 11
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/MesSafetyCertificateServiceImpl.java | 99 +++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/training/MesSafetyTrainingSaveReqVO.java | 68 ++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/MesSafetyTrainingMapper.java | 46 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/MesSafetyTrainingServiceImpl.java | 203 ++++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/MesSafetyCertificateDO.java | 88 ++
23 files changed, 1,786 insertions(+), 0 deletions(-)
diff --git a/sql/mysql/mes_safety_training_init.sql b/sql/mysql/mes_safety_training_init.sql
new file mode 100644
index 0000000..dd170bf
--- /dev/null
+++ b/sql/mysql/mes_safety_training_init.sql
@@ -0,0 +1,201 @@
+-- =====================================================================
+-- 瀹夊叏鐢熶骇妯″潡 鈥斺�� 浜旀湡锛氬畨鍏ㄦ暀鑲插煿璁�
+--
+-- 瀹氫綅锛氬煿璁鍒� 鈫� 缁勭粐鍩硅 鈫� 鍙傝绛惧埌 鈫� 鑰冭瘯璇勫垎 鈫� 鎸佽瘉绠$悊锛屽舰鎴愬煿璁。妗堥棴鐜��
+-- 鐗圭浣滀笟浜哄憳鏄惁鎸佹湁鏁堣瘉浠讹紝鍙�氳繃璧勬牸璇佷功琛ㄦ牳鏌ャ��
+--
+-- 涓夊紶琛細
+-- mes_safety_training 鍩硅鎵规锛堜竴娆″煿璁椿鍔級
+-- mes_safety_training_attendee 鍙傝浜哄憳锛堝惈绛惧埌涓庤�冭瘯鎴愮哗锛�
+-- mes_safety_certificate 瀹夊叏璧勬牸璇佷功锛堢壒绉嶄綔涓氳瘉绛夛紝鍚湁鏁堟湡锛�
+--
+-- 鍐呭锛�
+-- 1. 寤鸿〃 3 寮�
+-- 2. 瀛楀吀锛氬煿璁被鍨� / 鍩硅鐘舵�� / 绛惧埌鐘舵�� / 璇佷功绫诲瀷
+-- 3. 鑿滃崟锛氬煿璁鐞嗐�佽祫鏍艰瘉涔︼紝鎸傚湪銆屽畨鍏ㄧ敓浜с�嶇洰褰曚笅
+-- 4. 鎺堟潈瓒呯骇绠$悊鍛�
+--
+-- 鐗规�э細鍙噸澶嶆墽琛�
+-- =====================================================================
+
+-- ---------------------------------------------------------------------
+-- 1. 鍩硅鎵规
+-- ---------------------------------------------------------------------
+CREATE TABLE IF NOT EXISTS `mes_safety_training` (
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '缂栧彿',
+ `code` varchar(64) NOT NULL COMMENT '鍩硅缂栧彿',
+ `title` varchar(200) NOT NULL COMMENT '鍩硅涓婚',
+
+ `training_type` tinyint DEFAULT NULL COMMENT '鍩硅绫诲瀷锛堝瓧鍏� mes_safety_training_type锛�',
+ `training_level` tinyint DEFAULT NULL COMMENT '鍩硅灞傜骇锛堝瓧鍏� mes_safety_training_level锛�1鍏徃绾� 2杞﹂棿绾� 3鐝粍绾э級',
+
+ `trainer` varchar(100) DEFAULT NULL COMMENT '璁插笀/鎺堣浜�',
+ `trainer_org` varchar(200) DEFAULT NULL COMMENT '璁插笀鍗曚綅锛堝閮ㄨ甯堟椂濉啓锛�',
+ `location` varchar(255) DEFAULT NULL COMMENT '鍩硅鍦扮偣',
+
+ `start_time` datetime DEFAULT NULL COMMENT '鍩硅寮�濮嬫椂闂�',
+ `end_time` datetime DEFAULT NULL COMMENT '鍩硅缁撴潫鏃堕棿',
+ `duration_hours` decimal(6,1) DEFAULT NULL COMMENT '瀛︽椂',
+
+ `content` varchar(2000) DEFAULT NULL COMMENT '鍩硅鍐呭',
+ `material` varchar(500) DEFAULT NULL COMMENT '鍩硅璧勬枡/鏁欐潗',
+
+ `status` tinyint NOT NULL DEFAULT '0' COMMENT '鐘舵�侊細0璁″垝涓� 10杩涜涓� 20宸插畬鎴� 30宸插彇娑�',
+
+ `attendee_count` int DEFAULT '0' COMMENT '鍙傝浜烘暟锛堝啑浣欑粺璁★級',
+ `signed_count` int DEFAULT '0' COMMENT '瀹炲埌浜烘暟锛堝啑浣欑粺璁★級',
+ `avg_score` decimal(6,2) DEFAULT NULL COMMENT '鑰冭瘯骞冲潎鍒嗭紙鍐椾綑缁熻锛�',
+
+ `remark` varchar(500) DEFAULT NULL COMMENT '澶囨敞',
+ `creator` varchar(64) DEFAULT '' COMMENT '鍒涘缓鑰�',
+ `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
+ `updater` varchar(64) DEFAULT '' COMMENT '鏇存柊鑰�',
+ `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '鏇存柊鏃堕棿',
+ `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '鏄惁鍒犻櫎',
+ PRIMARY KEY (`id`) USING BTREE,
+ UNIQUE KEY `uk_code` (`code`) USING BTREE,
+ KEY `idx_status` (`status`) USING BTREE,
+ KEY `idx_start` (`start_time`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='瀹夊叏鐢熶骇-鍩硅鎵规';
+
+-- ---------------------------------------------------------------------
+-- 2. 鍙傝浜哄憳锛堝惈绛惧埌涓庤�冭瘯鎴愮哗锛�
+-- ---------------------------------------------------------------------
+CREATE TABLE IF NOT EXISTS `mes_safety_training_attendee` (
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '缂栧彿',
+ `training_id` bigint NOT NULL COMMENT '鍩硅鎵规缂栧彿',
+ `user_id` bigint NOT NULL COMMENT '鍙傝浜虹紪鍙�',
+ `dept_id` bigint DEFAULT NULL COMMENT '鎵�灞為儴闂ㄧ紪鍙�',
+
+ `sign_status` tinyint DEFAULT '0' COMMENT '绛惧埌鐘舵�侊細0鏈鍒� 1宸茬鍒� 2杩熷埌 3缂哄腑',
+ `sign_time` datetime DEFAULT NULL COMMENT '绛惧埌鏃堕棿',
+
+ `score` decimal(6,2) DEFAULT NULL COMMENT '鑰冭瘯鎴愮哗',
+ `passed` tinyint DEFAULT '0' COMMENT '鏄惁閫氳繃锛�0鏈�� 1閫氳繃 2涓嶉�氳繃',
+
+ `remark` varchar(255) DEFAULT NULL COMMENT '澶囨敞',
+ `creator` varchar(64) DEFAULT '' COMMENT '鍒涘缓鑰�',
+ `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
+ `updater` varchar(64) DEFAULT '' COMMENT '鏇存柊鑰�',
+ `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '鏇存柊鏃堕棿',
+ `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '鏄惁鍒犻櫎',
+ PRIMARY KEY (`id`) USING BTREE,
+ KEY `idx_training` (`training_id`) USING BTREE,
+ KEY `idx_user` (`user_id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='瀹夊叏鐢熶骇-鍩硅鍙傝浜哄憳';
+
+-- ---------------------------------------------------------------------
+-- 3. 瀹夊叏璧勬牸璇佷功
+-- ---------------------------------------------------------------------
+CREATE TABLE IF NOT EXISTS `mes_safety_certificate` (
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '缂栧彿',
+ `user_id` bigint NOT NULL COMMENT '鎸佽瘉浜虹紪鍙�',
+ `dept_id` bigint DEFAULT NULL COMMENT '鎵�灞為儴闂ㄧ紪鍙�',
+
+ `cert_type` tinyint NOT NULL COMMENT '璇佷功绫诲瀷锛堝瓧鍏� mes_safety_cert_type锛�',
+ `cert_no` varchar(100) NOT NULL COMMENT '璇佷功缂栧彿',
+ `issue_org` varchar(200) DEFAULT NULL COMMENT '鍙戣瘉鏈哄叧',
+ `issue_date` date DEFAULT NULL COMMENT '鍙戣瘉鏃ユ湡',
+ `expire_date` date DEFAULT NULL COMMENT '鏈夋晥鏈熻嚦锛堢┖琛ㄧず闀挎湡鏈夋晥锛�',
+
+ `status` tinyint NOT NULL DEFAULT '1' COMMENT '鐘舵�侊細1鏈夋晥 0宸蹭綔搴�',
+ `attachment_url` varchar(500) DEFAULT NULL COMMENT '璇佷功鎵弿浠跺湴鍧�',
+ `remark` varchar(500) DEFAULT NULL COMMENT '澶囨敞',
+ `creator` varchar(64) DEFAULT '' COMMENT '鍒涘缓鑰�',
+ `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
+ `updater` varchar(64) DEFAULT '' COMMENT '鏇存柊鑰�',
+ `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '鏇存柊鏃堕棿',
+ `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '鏄惁鍒犻櫎',
+ PRIMARY KEY (`id`) USING BTREE,
+ UNIQUE KEY `uk_cert_no` (`cert_no`) USING BTREE,
+ KEY `idx_user` (`user_id`) USING BTREE,
+ KEY `idx_expire` (`expire_date`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='瀹夊叏鐢熶骇-瀹夊叏璧勬牸璇佷功';
+
+-- ---------------------------------------------------------------------
+-- 4. 瀛楀吀
+-- ---------------------------------------------------------------------
+DELETE FROM system_dict_data WHERE dict_type IN
+ ('mes_safety_training_type', 'mes_safety_training_level', 'mes_safety_training_status',
+ 'mes_safety_attendee_status', 'mes_safety_cert_type');
+
+DELETE FROM system_dict_type WHERE type IN
+ ('mes_safety_training_type', 'mes_safety_training_level', 'mes_safety_training_status',
+ 'mes_safety_attendee_status', 'mes_safety_cert_type');
+
+INSERT INTO system_dict_type (name, type, status, remark, creator, create_time, updater, update_time, deleted)
+VALUES ('瀹夊叏鐢熶骇-鍩硅绫诲瀷', 'mes_safety_training_type', 0, '鍩硅娲诲姩鍒嗙被', '1', NOW(), '1', NOW(), b'0'),
+ ('瀹夊叏鐢熶骇-鍩硅灞傜骇', 'mes_safety_training_level', 0, '涓夌骇鏁欒偛灞傜骇', '1', NOW(), '1', NOW(), b'0'),
+ ('瀹夊叏鐢熶骇-鍩硅鐘舵��', 'mes_safety_training_status', 0, '鍩硅鎵规鐘舵��', '1', NOW(), '1', NOW(), b'0'),
+ ('瀹夊叏鐢熶骇-绛惧埌鐘舵��', 'mes_safety_attendee_status', 0, '鍙傝绛惧埌鎯呭喌', '1', NOW(), '1', NOW(), b'0'),
+ ('瀹夊叏鐢熶骇-璇佷功绫诲瀷', 'mes_safety_cert_type', 0, '瀹夊叏璧勬牸璇佷功绫诲瀷', '1', NOW(), '1', NOW(), b'0');
+
+INSERT INTO system_dict_data (sort, label, value, dict_type, status, color_type, creator, create_time, updater, update_time, deleted)
+VALUES
+-- 鍩硅绫诲瀷
+(1, '涓夌骇瀹夊叏鏁欒偛', '1', 'mes_safety_training_type', 0, 'processing', '1', NOW(), '1', NOW(), b'0'),
+(2, '涓撻」鍩硅', '2', 'mes_safety_training_type', 0, 'default', '1', NOW(), '1', NOW(), b'0'),
+(3, '澶嶈', '3', 'mes_safety_training_type', 0, 'warning', '1', NOW(), '1', NOW(), b'0'),
+(4, '鏃ュ父瀹夊叏鏁欒偛', '4', 'mes_safety_training_type', 0, 'default', '1', NOW(), '1', NOW(), b'0'),
+(5, '鍏朵粬', '5', 'mes_safety_training_type', 0, 'default', '1', NOW(), '1', NOW(), b'0'),
+-- 鍩硅灞傜骇
+(1, '鍏徃绾�', '1', 'mes_safety_training_level', 0, 'processing', '1', NOW(), '1', NOW(), b'0'),
+(2, '杞﹂棿绾�', '2', 'mes_safety_training_level', 0, 'default', '1', NOW(), '1', NOW(), b'0'),
+(3, '鐝粍绾�', '3', 'mes_safety_training_level', 0, 'default', '1', NOW(), '1', NOW(), b'0'),
+-- 鍩硅鐘舵��
+(1, '璁″垝涓�', '0', 'mes_safety_training_status', 0, 'processing', '1', NOW(), '1', NOW(), b'0'),
+(2, '杩涜涓�', '10', 'mes_safety_training_status', 0, 'warning', '1', NOW(), '1', NOW(), b'0'),
+(3, '宸插畬鎴�', '20', 'mes_safety_training_status', 0, 'success', '1', NOW(), '1', NOW(), b'0'),
+(4, '宸插彇娑�', '30', 'mes_safety_training_status', 0, 'default', '1', NOW(), '1', NOW(), b'0'),
+-- 绛惧埌鐘舵��
+(1, '鏈鍒�', '0', 'mes_safety_attendee_status', 0, 'default', '1', NOW(), '1', NOW(), b'0'),
+(2, '宸茬鍒�', '1', 'mes_safety_attendee_status', 0, 'success', '1', NOW(), '1', NOW(), b'0'),
+(3, '杩熷埌', '2', 'mes_safety_attendee_status', 0, 'warning', '1', NOW(), '1', NOW(), b'0'),
+(4, '缂哄腑', '3', 'mes_safety_attendee_status', 0, 'error', '1', NOW(), '1', NOW(), b'0'),
+-- 璇佷功绫诲瀷
+(1, '鐗圭浣滀笟鎿嶄綔璇�', '1', 'mes_safety_cert_type', 0, 'processing', '1', NOW(), '1', NOW(), b'0'),
+(2, '瀹夊叏绠$悊浜哄憳璇�', '2', 'mes_safety_cert_type', 0, 'default', '1', NOW(), '1', NOW(), b'0'),
+(3, '涓昏璐熻矗浜鸿瘉', '3', 'mes_safety_cert_type', 0, 'default', '1', NOW(), '1', NOW(), b'0'),
+(4, '鍏朵粬璧勬牸璇�', '4', 'mes_safety_cert_type', 0, 'default', '1', NOW(), '1', NOW(), b'0');
+
+-- ---------------------------------------------------------------------
+-- 5. 鑿滃崟锛堟寕鍦� 1065910 瀹夊叏鐢熶骇涓嬶級
+-- ---------------------------------------------------------------------
+DELETE FROM system_role_menu WHERE menu_id BETWEEN 1065941 AND 1065960;
+
+DELETE FROM system_menu WHERE id BETWEEN 1065941 AND 1065960;
+
+INSERT INTO system_menu (id, name, permission, type, sort, parent_id, path, icon,
+ component, component_name, status, visible, keep_alive, always_show,
+ creator, create_time, updater, update_time, deleted)
+VALUES
+-- 鍩硅绠$悊
+(1065941, '瀹夊叏鏁欒偛鍩硅', '', 2, 6, 1065910, 'training', 'ep:reading',
+ 'safety/training/index', 'SafetyTraining', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1065942, '鍩硅鏌ヨ', 'mes:safety-training:query', 3, 1, 1065941, '', '', NULL, NULL, 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1065943, '鍩硅鍒涘缓', 'mes:safety-training:create', 3, 2, 1065941, '', '', NULL, NULL, 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1065944, '鍩硅淇敼', 'mes:safety-training:update', 3, 3, 1065941, '', '', NULL, NULL, 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1065945, '鍩硅鍒犻櫎', 'mes:safety-training:delete', 3, 4, 1065941, '', '', NULL, NULL, 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1065946, '鍙傝浜哄憳缁存姢', 'mes:safety-training:attendee', 3, 5, 1065941, '', '', NULL, NULL, 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
+-- 璧勬牸璇佷功
+(1065947, '瀹夊叏璧勬牸璇佷功', '', 2, 7, 1065910, 'certificate', 'ep:medal',
+ 'safety/certificate/index', 'SafetyCertificate', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1065948, '璇佷功鏌ヨ', 'mes:safety-certificate:query', 3, 1, 1065947, '', '', NULL, NULL, 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1065949, '璇佷功鍒涘缓', 'mes:safety-certificate:create', 3, 2, 1065947, '', '', NULL, NULL, 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1065950, '璇佷功淇敼', 'mes:safety-certificate:update', 3, 3, 1065947, '', '', NULL, NULL, 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1065951, '璇佷功鍒犻櫎', 'mes:safety-certificate:delete', 3, 4, 1065947, '', '', NULL, NULL, 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0');
+
+INSERT INTO system_role_menu (role_id, menu_id, creator, create_time, updater, update_time, deleted)
+SELECT 1, m.id, '1', NOW(), '1', NOW(), b'0'
+FROM system_menu m
+WHERE m.id BETWEEN 1065941 AND 1065960;
+
+-- ---------------------------------------------------------------------
+-- 6. 楠岃瘉
+-- ---------------------------------------------------------------------
+SELECT id, parent_id, name, path, component, permission, type
+FROM system_menu WHERE id BETWEEN 1065910 AND 1065960 ORDER BY id;
+
+SELECT dict_type, label, value FROM system_dict_data
+WHERE dict_type LIKE 'mes_safety_training%' OR dict_type IN ('mes_safety_attendee_status', 'mes_safety_cert_type')
+ORDER BY dict_type, sort;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/MesSafetyCertificateController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/MesSafetyCertificateController.java
new file mode 100644
index 0000000..0d172d5
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/MesSafetyCertificateController.java
@@ -0,0 +1,144 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.certificate.MesSafetyCertificatePageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.certificate.MesSafetyCertificateRespVO;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.certificate.MesSafetyCertificateSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.MesSafetyCertificateDO;
+import cn.iocoder.yudao.module.mes.service.safety.MesSafetyCertificateService;
+import cn.iocoder.yudao.module.system.api.dept.DeptApi;
+import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDate;
+import java.time.temporal.ChronoUnit;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+/**
+ * 瀹夊叏鐢熶骇 - 瀹夊叏璧勬牸璇佷功 Controller
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Tag(name = "绠$悊鍚庡彴 - 瀹夊叏鐢熶骇-瀹夊叏璧勬牸璇佷功")
+@RestController
+@RequestMapping("/mes/safety/certificate")
+@Validated
+public class MesSafetyCertificateController {
+
+ /** 鍗冲皢鍒版湡闃堝�硷紙澶╋級 */
+ private static final long EXPIRING_SOON_DAYS = 30L;
+
+ @Resource
+ private MesSafetyCertificateService certificateService;
+
+ @Resource
+ private AdminUserApi adminUserApi;
+
+ @Resource
+ private DeptApi deptApi;
+
+ @PostMapping("/create")
+ @Operation(summary = "鍒涘缓璧勬牸璇佷功")
+ @PreAuthorize("@ss.hasPermission('mes:safety-certificate:create')")
+ public CommonResult<Long> createCertificate(@Valid @RequestBody MesSafetyCertificateSaveReqVO createReqVO) {
+ return success(certificateService.createCertificate(createReqVO));
+ }
+
+ @PutMapping("/update")
+ @Operation(summary = "鏇存柊璧勬牸璇佷功")
+ @PreAuthorize("@ss.hasPermission('mes:safety-certificate:update')")
+ public CommonResult<Boolean> updateCertificate(@Valid @RequestBody MesSafetyCertificateSaveReqVO updateReqVO) {
+ certificateService.updateCertificate(updateReqVO);
+ return success(true);
+ }
+
+ @DeleteMapping("/delete")
+ @Operation(summary = "鍒犻櫎璧勬牸璇佷功")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('mes:safety-certificate:delete')")
+ public CommonResult<Boolean> deleteCertificate(@RequestParam("id") Long id) {
+ certificateService.deleteCertificate(id);
+ return success(true);
+ }
+
+ @GetMapping("/get")
+ @Operation(summary = "鑾峰緱璧勬牸璇佷功")
+ @Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
+ @PreAuthorize("@ss.hasPermission('mes:safety-certificate:query')")
+ public CommonResult<MesSafetyCertificateRespVO> getCertificate(@RequestParam("id") Long id) {
+ MesSafetyCertificateDO certificate = certificateService.getCertificate(id);
+ if (certificate == null) {
+ return success(null);
+ }
+ List<MesSafetyCertificateRespVO> list = buildRespList(Collections.singletonList(certificate));
+ return success(list.isEmpty() ? null : list.get(0));
+ }
+
+ @GetMapping("/page")
+ @Operation(summary = "鑾峰緱璧勬牸璇佷功鍒嗛〉")
+ @PreAuthorize("@ss.hasPermission('mes:safety-certificate:query')")
+ public CommonResult<PageResult<MesSafetyCertificateRespVO>> getCertificatePage(@Valid MesSafetyCertificatePageReqVO pageReqVO) {
+ PageResult<MesSafetyCertificateDO> pageResult = certificateService.getCertificatePage(pageReqVO);
+ List<MesSafetyCertificateRespVO> list = buildRespList(pageResult.getList());
+ return success(new PageResult<>(list, pageResult.getTotal()));
+ }
+
+ /**
+ * 杞崲涓� VO 骞跺~鍏呮寔璇佷汉濮撳悕銆侀儴闂ㄥ悕绉般�佸埌鏈熷ぉ鏁颁笌鍒版湡鏍囪
+ */
+ private List<MesSafetyCertificateRespVO> buildRespList(List<MesSafetyCertificateDO> list) {
+ if (list == null || list.isEmpty()) {
+ return Collections.emptyList();
+ }
+ List<MesSafetyCertificateRespVO> respList = BeanUtils.toBean(list, MesSafetyCertificateRespVO.class);
+
+ Set<Long> userIds = list.stream().map(MesSafetyCertificateDO::getUserId)
+ .filter(Objects::nonNull).collect(Collectors.toSet());
+ Map<Long, AdminUserRespDTO> userMap = userIds.isEmpty()
+ ? Collections.emptyMap() : adminUserApi.getUserMap(userIds);
+
+ Set<Long> deptIds = list.stream().map(MesSafetyCertificateDO::getDeptId)
+ .filter(Objects::nonNull).collect(Collectors.toSet());
+ Map<Long, String> deptNameMap = new HashMap<>();
+ if (!deptIds.isEmpty()) {
+ List<DeptRespDTO> depts = deptApi.getDeptList(deptIds);
+ if (depts != null) {
+ depts.forEach(d -> deptNameMap.put(d.getId(), d.getName()));
+ }
+ }
+
+ LocalDate today = LocalDate.now();
+ for (MesSafetyCertificateRespVO vo : respList) {
+ AdminUserRespDTO user = userMap.get(vo.getUserId());
+ if (user != null) {
+ vo.setUserName(user.getNickname());
+ }
+ vo.setDeptName(deptNameMap.get(vo.getDeptId()));
+ if (vo.getExpireDate() != null) {
+ long days = ChronoUnit.DAYS.between(today, vo.getExpireDate());
+ vo.setDaysToExpire(days);
+ vo.setExpired(days < 0);
+ vo.setExpiringSoon(days >= 0 && days <= EXPIRING_SOON_DAYS);
+ } else {
+ vo.setExpired(false);
+ vo.setExpiringSoon(false);
+ }
+ }
+ return respList;
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/MesSafetyTrainingController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/MesSafetyTrainingController.java
new file mode 100644
index 0000000..7d5eeae
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/MesSafetyTrainingController.java
@@ -0,0 +1,163 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.training.MesSafetyTrainingAttendeeRespVO;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.training.MesSafetyTrainingAttendeeSaveReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.training.MesSafetyTrainingPageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.training.MesSafetyTrainingRespVO;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.training.MesSafetyTrainingSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.MesSafetyTrainingAttendeeDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.MesSafetyTrainingDO;
+import cn.iocoder.yudao.module.mes.service.safety.MesSafetyTrainingService;
+import cn.iocoder.yudao.module.system.api.dept.DeptApi;
+import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+/**
+ * 瀹夊叏鐢熶骇 - 瀹夊叏鏁欒偛鍩硅 Controller
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Tag(name = "绠$悊鍚庡彴 - 瀹夊叏鐢熶骇-瀹夊叏鏁欒偛鍩硅")
+@RestController
+@RequestMapping("/mes/safety/training")
+@Validated
+public class MesSafetyTrainingController {
+
+ @Resource
+ private MesSafetyTrainingService trainingService;
+
+ @Resource
+ private AdminUserApi adminUserApi;
+
+ @Resource
+ private DeptApi deptApi;
+
+ @PostMapping("/create")
+ @Operation(summary = "鍒涘缓鍩硅鎵规")
+ @PreAuthorize("@ss.hasPermission('mes:safety-training:create')")
+ public CommonResult<Long> createTraining(@Valid @RequestBody MesSafetyTrainingSaveReqVO createReqVO) {
+ return success(trainingService.createTraining(createReqVO));
+ }
+
+ @PutMapping("/update")
+ @Operation(summary = "鏇存柊鍩硅鎵规")
+ @PreAuthorize("@ss.hasPermission('mes:safety-training:update')")
+ public CommonResult<Boolean> updateTraining(@Valid @RequestBody MesSafetyTrainingSaveReqVO updateReqVO) {
+ trainingService.updateTraining(updateReqVO);
+ return success(true);
+ }
+
+ @DeleteMapping("/delete")
+ @Operation(summary = "鍒犻櫎鍩硅鎵规")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('mes:safety-training:delete')")
+ public CommonResult<Boolean> deleteTraining(@RequestParam("id") Long id) {
+ trainingService.deleteTraining(id);
+ return success(true);
+ }
+
+ @GetMapping("/get")
+ @Operation(summary = "鑾峰緱鍩硅鎵规")
+ @Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
+ @PreAuthorize("@ss.hasPermission('mes:safety-training:query')")
+ public CommonResult<MesSafetyTrainingRespVO> getTraining(@RequestParam("id") Long id) {
+ MesSafetyTrainingDO training = trainingService.getTraining(id);
+ return success(training == null ? null : BeanUtils.toBean(training, MesSafetyTrainingRespVO.class));
+ }
+
+ @GetMapping("/page")
+ @Operation(summary = "鑾峰緱鍩硅鎵规鍒嗛〉")
+ @PreAuthorize("@ss.hasPermission('mes:safety-training:query')")
+ public CommonResult<PageResult<MesSafetyTrainingRespVO>> getTrainingPage(@Valid MesSafetyTrainingPageReqVO pageReqVO) {
+ PageResult<MesSafetyTrainingDO> pageResult = trainingService.getTrainingPage(pageReqVO);
+ return success(new PageResult<>(
+ BeanUtils.toBean(pageResult.getList(), MesSafetyTrainingRespVO.class),
+ pageResult.getTotal()));
+ }
+
+ // ==================== 鍙傝浜哄憳 ====================
+
+ @GetMapping("/attendee-list")
+ @Operation(summary = "鑾峰緱鍙傝浜哄憳鍒楄〃")
+ @Parameter(name = "trainingId", description = "鍩硅鎵规缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('mes:safety-training:query')")
+ public CommonResult<List<MesSafetyTrainingAttendeeRespVO>> getAttendeeList(@RequestParam("trainingId") Long trainingId) {
+ return success(buildAttendeeRespList(trainingService.getAttendeeList(trainingId)));
+ }
+
+ @PostMapping("/save-attendees")
+ @Operation(summary = "鍏ㄩ噺淇濆瓨鍙傝浜哄憳")
+ @Parameter(name = "trainingId", description = "鍩硅鎵规缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('mes:safety-training:attendee')")
+ public CommonResult<Boolean> saveAttendees(@RequestParam("trainingId") Long trainingId,
+ @RequestBody List<MesSafetyTrainingAttendeeSaveReqVO> attendees) {
+ trainingService.saveAttendees(trainingId, attendees);
+ return success(true);
+ }
+
+ @PutMapping("/update-attendee")
+ @Operation(summary = "鏇存柊鍙傝浜哄憳绛惧埌/鎴愮哗")
+ @PreAuthorize("@ss.hasPermission('mes:safety-training:attendee')")
+ public CommonResult<Boolean> updateAttendee(@Valid @RequestBody MesSafetyTrainingAttendeeSaveReqVO reqVO) {
+ trainingService.updateAttendee(reqVO);
+ return success(true);
+ }
+
+ @DeleteMapping("/delete-attendee")
+ @Operation(summary = "鍒犻櫎鍙傝浜哄憳")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('mes:safety-training:attendee')")
+ public CommonResult<Boolean> deleteAttendee(@RequestParam("id") Long id) {
+ trainingService.deleteAttendee(id);
+ return success(true);
+ }
+
+ private List<MesSafetyTrainingAttendeeRespVO> buildAttendeeRespList(List<MesSafetyTrainingAttendeeDO> list) {
+ if (list == null || list.isEmpty()) {
+ return Collections.emptyList();
+ }
+ List<MesSafetyTrainingAttendeeRespVO> respList = BeanUtils.toBean(list, MesSafetyTrainingAttendeeRespVO.class);
+
+ Set<Long> userIds = list.stream().map(MesSafetyTrainingAttendeeDO::getUserId)
+ .filter(Objects::nonNull).collect(Collectors.toSet());
+ Map<Long, AdminUserRespDTO> userMap = userIds.isEmpty()
+ ? Collections.emptyMap() : adminUserApi.getUserMap(userIds);
+
+ Set<Long> deptIds = list.stream().map(MesSafetyTrainingAttendeeDO::getDeptId)
+ .filter(Objects::nonNull).collect(Collectors.toSet());
+ Map<Long, String> deptNameMap = new HashMap<>();
+ if (!deptIds.isEmpty()) {
+ List<DeptRespDTO> depts = deptApi.getDeptList(deptIds);
+ if (depts != null) {
+ depts.forEach(d -> deptNameMap.put(d.getId(), d.getName()));
+ }
+ }
+
+ for (MesSafetyTrainingAttendeeRespVO vo : respList) {
+ AdminUserRespDTO user = userMap.get(vo.getUserId());
+ if (user != null) {
+ vo.setUserName(user.getNickname());
+ }
+ vo.setDeptName(deptNameMap.get(vo.getDeptId()));
+ }
+ return respList;
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/certificate/MesSafetyCertificatePageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/certificate/MesSafetyCertificatePageReqVO.java
new file mode 100644
index 0000000..4099a71
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/certificate/MesSafetyCertificatePageReqVO.java
@@ -0,0 +1,30 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.certificate;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+@Schema(description = "绠$悊鍚庡彴 - 瀹夊叏鐢熶骇-璧勬牸璇佷功鍒嗛〉 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class MesSafetyCertificatePageReqVO extends PageParam {
+
+ @Schema(description = "鎸佽瘉浜虹紪鍙�", example = "1")
+ private Long userId;
+
+ @Schema(description = "璇佷功绫诲瀷", example = "1")
+ private Integer certType;
+
+ @Schema(description = "璇佷功缂栧彿", example = "T123456789")
+ private String certNo;
+
+ @Schema(description = "鐘舵��", example = "1")
+ private Integer status;
+
+ @Schema(description = "鏄惁鍙湅鍗冲皢鍒版湡锛�30 澶╁唴锛�", example = "false")
+ private Boolean expiringSoon;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/certificate/MesSafetyCertificateRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/certificate/MesSafetyCertificateRespVO.java
new file mode 100644
index 0000000..f44346a
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/certificate/MesSafetyCertificateRespVO.java
@@ -0,0 +1,64 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.certificate;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+@Schema(description = "绠$悊鍚庡彴 - 瀹夊叏鐢熶骇-璧勬牸璇佷功 Response VO")
+@Data
+public class MesSafetyCertificateRespVO {
+
+ @Schema(description = "缂栧彿", example = "1024")
+ private Long id;
+
+ @Schema(description = "鎸佽瘉浜虹紪鍙�", example = "1")
+ private Long userId;
+
+ @Schema(description = "鎸佽瘉浜哄鍚�")
+ private String userName;
+
+ @Schema(description = "鎵�灞為儴闂ㄧ紪鍙�", example = "120")
+ private Long deptId;
+
+ @Schema(description = "鎵�灞為儴闂ㄥ悕绉�")
+ private String deptName;
+
+ @Schema(description = "璇佷功绫诲瀷", example = "1")
+ private Integer certType;
+
+ @Schema(description = "璇佷功缂栧彿", example = "T123456789")
+ private String certNo;
+
+ @Schema(description = "鍙戣瘉鏈哄叧")
+ private String issueOrg;
+
+ @Schema(description = "鍙戣瘉鏃ユ湡")
+ private LocalDate issueDate;
+
+ @Schema(description = "鏈夋晥鏈熻嚦")
+ private LocalDate expireDate;
+
+ @Schema(description = "璺濆埌鏈熷ぉ鏁帮紙璐熸暟琛ㄧず宸茶繃鏈燂級", example = "180")
+ private Long daysToExpire;
+
+ @Schema(description = "鏄惁宸茶繃鏈�", example = "false")
+ private Boolean expired;
+
+ @Schema(description = "鏄惁鍗冲皢鍒版湡锛�30 澶╁唴锛�", example = "false")
+ private Boolean expiringSoon;
+
+ @Schema(description = "鐘舵�侊細1鏈夋晥 0宸蹭綔搴�", example = "1")
+ private Integer status;
+
+ @Schema(description = "璇佷功鎵弿浠跺湴鍧�")
+ private String attachmentUrl;
+
+ @Schema(description = "澶囨敞")
+ private String remark;
+
+ @Schema(description = "鍒涘缓鏃堕棿")
+ private LocalDateTime createTime;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/certificate/MesSafetyCertificateSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/certificate/MesSafetyCertificateSaveReqVO.java
new file mode 100644
index 0000000..3a45d4a
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/certificate/MesSafetyCertificateSaveReqVO.java
@@ -0,0 +1,55 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.certificate;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
+
+@Schema(description = "绠$悊鍚庡彴 - 瀹夊叏鐢熶骇-璧勬牸璇佷功鏂板/淇敼 Request VO")
+@Data
+public class MesSafetyCertificateSaveReqVO {
+
+ @Schema(description = "缂栧彿", example = "1024")
+ private Long id;
+
+ @Schema(description = "鎸佽瘉浜虹紪鍙�", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+ @NotNull(message = "鎸佽瘉浜轰笉鑳戒负绌�")
+ private Long userId;
+
+ @Schema(description = "鎵�灞為儴闂ㄧ紪鍙�", example = "120")
+ private Long deptId;
+
+ @Schema(description = "璇佷功绫诲瀷", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+ @NotNull(message = "璇佷功绫诲瀷涓嶈兘涓虹┖")
+ private Integer certType;
+
+ @Schema(description = "璇佷功缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "T123456789")
+ @NotEmpty(message = "璇佷功缂栧彿涓嶈兘涓虹┖")
+ private String certNo;
+
+ @Schema(description = "鍙戣瘉鏈哄叧", example = "鏂扮枂搴旀�ョ鐞嗗巺")
+ private String issueOrg;
+
+ @Schema(description = "鍙戣瘉鏃ユ湡")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+ private LocalDate issueDate;
+
+ @Schema(description = "鏈夋晥鏈熻嚦锛堢暀绌鸿〃绀洪暱鏈熸湁鏁堬級")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+ private LocalDate expireDate;
+
+ @Schema(description = "鐘舵�侊細1鏈夋晥 0宸蹭綔搴�", example = "1")
+ private Integer status;
+
+ @Schema(description = "璇佷功鎵弿浠跺湴鍧�")
+ private String attachmentUrl;
+
+ @Schema(description = "澶囨敞")
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/training/MesSafetyTrainingAttendeeRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/training/MesSafetyTrainingAttendeeRespVO.java
new file mode 100644
index 0000000..7fc381a
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/training/MesSafetyTrainingAttendeeRespVO.java
@@ -0,0 +1,46 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.training;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Schema(description = "绠$悊鍚庡彴 - 瀹夊叏鐢熶骇-鍙傝浜哄憳 Response VO")
+@Data
+public class MesSafetyTrainingAttendeeRespVO {
+
+ @Schema(description = "缂栧彿", example = "1024")
+ private Long id;
+
+ @Schema(description = "鍩硅鎵规缂栧彿", example = "1")
+ private Long trainingId;
+
+ @Schema(description = "鍙傝浜虹紪鍙�", example = "1")
+ private Long userId;
+
+ @Schema(description = "鍙傝浜哄鍚�")
+ private String userName;
+
+ @Schema(description = "鎵�灞為儴闂ㄧ紪鍙�", example = "120")
+ private Long deptId;
+
+ @Schema(description = "鎵�灞為儴闂ㄥ悕绉�")
+ private String deptName;
+
+ @Schema(description = "绛惧埌鐘舵�侊細0鏈鍒� 1宸茬鍒� 2杩熷埌 3缂哄腑", example = "1")
+ private Integer signStatus;
+
+ @Schema(description = "绛惧埌鏃堕棿")
+ private LocalDateTime signTime;
+
+ @Schema(description = "鑰冭瘯鎴愮哗", example = "88")
+ private BigDecimal score;
+
+ @Schema(description = "鏄惁閫氳繃锛�0鏈�� 1閫氳繃 2涓嶉�氳繃", example = "1")
+ private Integer passed;
+
+ @Schema(description = "澶囨敞")
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/training/MesSafetyTrainingAttendeeSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/training/MesSafetyTrainingAttendeeSaveReqVO.java
new file mode 100644
index 0000000..b45e1a2
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/training/MesSafetyTrainingAttendeeSaveReqVO.java
@@ -0,0 +1,43 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.training;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Schema(description = "绠$悊鍚庡彴 - 瀹夊叏鐢熶骇-鍙傝浜哄憳 淇濆瓨 Request VO")
+@Data
+public class MesSafetyTrainingAttendeeSaveReqVO {
+
+ @Schema(description = "缂栧彿", example = "1024")
+ private Long id;
+
+ @Schema(description = "鍩硅鎵规缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+ @NotNull(message = "鍩硅鎵规涓嶈兘涓虹┖")
+ private Long trainingId;
+
+ @Schema(description = "鍙傝浜虹紪鍙�", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+ @NotNull(message = "鍙傝浜轰笉鑳戒负绌�")
+ private Long userId;
+
+ @Schema(description = "鎵�灞為儴闂ㄧ紪鍙�", example = "120")
+ private Long deptId;
+
+ @Schema(description = "绛惧埌鐘舵�侊細0鏈鍒� 1宸茬鍒� 2杩熷埌 3缂哄腑", example = "0")
+ private Integer signStatus;
+
+ @Schema(description = "绛惧埌鏃堕棿")
+ private LocalDateTime signTime;
+
+ @Schema(description = "鑰冭瘯鎴愮哗", example = "88")
+ private BigDecimal score;
+
+ @Schema(description = "鏄惁閫氳繃锛�0鏈�� 1閫氳繃 2涓嶉�氳繃", example = "0")
+ private Integer passed;
+
+ @Schema(description = "澶囨敞")
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/training/MesSafetyTrainingPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/training/MesSafetyTrainingPageReqVO.java
new file mode 100644
index 0000000..8c9ea89
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/training/MesSafetyTrainingPageReqVO.java
@@ -0,0 +1,43 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.training;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "绠$悊鍚庡彴 - 瀹夊叏鐢熶骇-鍩硅鍒嗛〉 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class MesSafetyTrainingPageReqVO extends PageParam {
+
+ @Schema(description = "鍩硅缂栧彿", example = "PX-2026-001")
+ private String code;
+
+ @Schema(description = "鍩硅涓婚", example = "鐗圭浣滀笟瀹夊叏鎿嶄綔鍩硅")
+ private String title;
+
+ @Schema(description = "鍩硅绫诲瀷", example = "2")
+ private Integer trainingType;
+
+ @Schema(description = "鍩硅灞傜骇", example = "1")
+ private Integer trainingLevel;
+
+ @Schema(description = "鐘舵��", example = "0")
+ private Integer status;
+
+ @Schema(description = "鍩硅寮�濮嬫椂闂�-璧�")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+ private LocalDateTime startTimeStart;
+
+ @Schema(description = "鍩硅寮�濮嬫椂闂�-姝�")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+ private LocalDateTime startTimeEnd;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/training/MesSafetyTrainingRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/training/MesSafetyTrainingRespVO.java
new file mode 100644
index 0000000..1a19712
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/training/MesSafetyTrainingRespVO.java
@@ -0,0 +1,70 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.training;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Schema(description = "绠$悊鍚庡彴 - 瀹夊叏鐢熶骇-鍩硅 Response VO")
+@Data
+public class MesSafetyTrainingRespVO {
+
+ @Schema(description = "缂栧彿", example = "1024")
+ private Long id;
+
+ @Schema(description = "鍩硅缂栧彿", example = "PX-2026-001")
+ private String code;
+
+ @Schema(description = "鍩硅涓婚")
+ private String title;
+
+ @Schema(description = "鍩硅绫诲瀷", example = "2")
+ private Integer trainingType;
+
+ @Schema(description = "鍩硅灞傜骇", example = "1")
+ private Integer trainingLevel;
+
+ @Schema(description = "璁插笀/鎺堣浜�")
+ private String trainer;
+
+ @Schema(description = "璁插笀鍗曚綅")
+ private String trainerOrg;
+
+ @Schema(description = "鍩硅鍦扮偣")
+ private String location;
+
+ @Schema(description = "鍩硅寮�濮嬫椂闂�")
+ private LocalDateTime startTime;
+
+ @Schema(description = "鍩硅缁撴潫鏃堕棿")
+ private LocalDateTime endTime;
+
+ @Schema(description = "瀛︽椂", example = "4")
+ private BigDecimal durationHours;
+
+ @Schema(description = "鍩硅鍐呭")
+ private String content;
+
+ @Schema(description = "鍩硅璧勬枡/鏁欐潗")
+ private String material;
+
+ @Schema(description = "鐘舵��", example = "0")
+ private Integer status;
+
+ @Schema(description = "鍙傝浜烘暟", example = "10")
+ private Integer attendeeCount;
+
+ @Schema(description = "瀹炲埌浜烘暟", example = "9")
+ private Integer signedCount;
+
+ @Schema(description = "鑰冭瘯骞冲潎鍒�", example = "85.5")
+ private BigDecimal avgScore;
+
+ @Schema(description = "澶囨敞")
+ private String remark;
+
+ @Schema(description = "鍒涘缓鏃堕棿")
+ private LocalDateTime createTime;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/training/MesSafetyTrainingSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/training/MesSafetyTrainingSaveReqVO.java
new file mode 100644
index 0000000..d2c8e37
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/training/MesSafetyTrainingSaveReqVO.java
@@ -0,0 +1,68 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.training;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "绠$悊鍚庡彴 - 瀹夊叏鐢熶骇-鍩硅鏂板/淇敼 Request VO")
+@Data
+public class MesSafetyTrainingSaveReqVO {
+
+ @Schema(description = "缂栧彿", example = "1024")
+ private Long id;
+
+ @Schema(description = "鍩硅缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "PX-2026-001")
+ @NotEmpty(message = "鍩硅缂栧彿涓嶈兘涓虹┖")
+ private String code;
+
+ @Schema(description = "鍩硅涓婚", requiredMode = Schema.RequiredMode.REQUIRED, example = "鐗圭浣滀笟瀹夊叏鎿嶄綔鍩硅")
+ @NotEmpty(message = "鍩硅涓婚涓嶈兘涓虹┖")
+ private String title;
+
+ @Schema(description = "鍩硅绫诲瀷", example = "2")
+ private Integer trainingType;
+
+ @Schema(description = "鍩硅灞傜骇", example = "1")
+ private Integer trainingLevel;
+
+ @Schema(description = "璁插笀/鎺堣浜�", example = "寮犲伐")
+ private String trainer;
+
+ @Schema(description = "璁插笀鍗曚綅")
+ private String trainerOrg;
+
+ @Schema(description = "鍩硅鍦扮偣", example = "涓�妤煎煿璁")
+ private String location;
+
+ @Schema(description = "鍩硅寮�濮嬫椂闂�")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+ private LocalDateTime startTime;
+
+ @Schema(description = "鍩硅缁撴潫鏃堕棿")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+ private LocalDateTime endTime;
+
+ @Schema(description = "瀛︽椂", example = "4")
+ private BigDecimal durationHours;
+
+ @Schema(description = "鍩硅鍐呭")
+ private String content;
+
+ @Schema(description = "鍩硅璧勬枡/鏁欐潗")
+ private String material;
+
+ @Schema(description = "鐘舵��", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
+ @NotNull(message = "鐘舵�佷笉鑳戒负绌�")
+ private Integer status;
+
+ @Schema(description = "澶囨敞")
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/MesSafetyCertificateDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/MesSafetyCertificateDO.java
new file mode 100644
index 0000000..0bb3189
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/MesSafetyCertificateDO.java
@@ -0,0 +1,88 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.safety;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+import java.time.LocalDate;
+
+/**
+ * 瀹夊叏鐢熶骇 - 瀹夊叏璧勬牸璇佷功 DO
+ *
+ * 鐗圭浣滀笟鎿嶄綔璇併�佸畨鍏ㄧ鐞嗕汉鍛樿瘉绛夛紝鍚湁鏁堟湡鐢ㄤ簬鍒版湡鎻愰啋
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("mes_safety_certificate")
+@KeySequence("mes_safety_certificate_seq")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class MesSafetyCertificateDO extends BaseDO {
+
+ /** 鐘舵�侊細鏈夋晥 */
+ public static final Integer STATUS_VALID = 1;
+ /** 鐘舵�侊細宸蹭綔搴� */
+ public static final Integer STATUS_INVALID = 0;
+
+ @TableId
+ private Long id;
+
+ /**
+ * 鎸佽瘉浜虹紪鍙�
+ */
+ private Long userId;
+
+ /**
+ * 鎵�灞為儴闂ㄧ紪鍙�
+ */
+ private Long deptId;
+
+ /**
+ * 璇佷功绫诲瀷
+ *
+ * 瀛楀吀 mes_safety_cert_type锛�1鐗圭浣滀笟鎿嶄綔璇� 2瀹夊叏绠$悊浜哄憳璇� 3涓昏璐熻矗浜鸿瘉 4鍏朵粬璧勬牸璇�
+ */
+ private Integer certType;
+
+ /**
+ * 璇佷功缂栧彿
+ */
+ private String certNo;
+
+ /**
+ * 鍙戣瘉鏈哄叧
+ */
+ private String issueOrg;
+
+ /**
+ * 鍙戣瘉鏃ユ湡
+ */
+ private LocalDate issueDate;
+
+ /**
+ * 鏈夋晥鏈熻嚦锛堜负绌鸿〃绀洪暱鏈熸湁鏁堬級
+ */
+ private LocalDate expireDate;
+
+ /**
+ * 鐘舵�侊細1鏈夋晥 0宸蹭綔搴�
+ */
+ private Integer status;
+
+ /**
+ * 璇佷功鎵弿浠跺湴鍧�
+ */
+ private String attachmentUrl;
+
+ /**
+ * 澶囨敞
+ */
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/MesSafetyTrainingAttendeeDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/MesSafetyTrainingAttendeeDO.java
new file mode 100644
index 0000000..e92a6ec
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/MesSafetyTrainingAttendeeDO.java
@@ -0,0 +1,88 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.safety;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鍩硅鍙傝浜哄憳 DO
+ *
+ * 鍚鍒版儏鍐典笌鑰冭瘯鎴愮哗
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("mes_safety_training_attendee")
+@KeySequence("mes_safety_training_attendee_seq")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class MesSafetyTrainingAttendeeDO extends BaseDO {
+
+ /** 绛惧埌鐘舵�侊細鏈鍒� */
+ public static final Integer SIGN_NONE = 0;
+ /** 绛惧埌鐘舵�侊細宸茬鍒� */
+ public static final Integer SIGN_DONE = 1;
+ /** 绛惧埌鐘舵�侊細杩熷埌 */
+ public static final Integer SIGN_LATE = 2;
+ /** 绛惧埌鐘舵�侊細缂哄腑 */
+ public static final Integer SIGN_ABSENT = 3;
+
+ /** 鑰冭瘯缁撴灉锛氭湭鑰� */
+ public static final Integer PASS_NONE = 0;
+ /** 鑰冭瘯缁撴灉锛氶�氳繃 */
+ public static final Integer PASS_YES = 1;
+ /** 鑰冭瘯缁撴灉锛氫笉閫氳繃 */
+ public static final Integer PASS_NO = 2;
+
+ @TableId
+ private Long id;
+
+ /**
+ * 鍩硅鎵规缂栧彿
+ */
+ private Long trainingId;
+
+ /**
+ * 鍙傝浜虹紪鍙�
+ */
+ private Long userId;
+
+ /**
+ * 鎵�灞為儴闂ㄧ紪鍙�
+ */
+ private Long deptId;
+
+ /**
+ * 绛惧埌鐘舵�侊細0鏈鍒� 1宸茬鍒� 2杩熷埌 3缂哄腑
+ */
+ private Integer signStatus;
+
+ /**
+ * 绛惧埌鏃堕棿
+ */
+ private LocalDateTime signTime;
+
+ /**
+ * 鑰冭瘯鎴愮哗
+ */
+ private BigDecimal score;
+
+ /**
+ * 鏄惁閫氳繃锛�0鏈�� 1閫氳繃 2涓嶉�氳繃
+ */
+ private Integer passed;
+
+ /**
+ * 澶囨敞
+ */
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/MesSafetyTrainingDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/MesSafetyTrainingDO.java
new file mode 100644
index 0000000..6a38a4d
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/MesSafetyTrainingDO.java
@@ -0,0 +1,128 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.safety;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鍩硅鎵规 DO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("mes_safety_training")
+@KeySequence("mes_safety_training_seq")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class MesSafetyTrainingDO extends BaseDO {
+
+ /** 鐘舵�侊細璁″垝涓� */
+ public static final Integer STATUS_PLANNED = 0;
+ /** 鐘舵�侊細杩涜涓� */
+ public static final Integer STATUS_ONGOING = 10;
+ /** 鐘舵�侊細宸插畬鎴� */
+ public static final Integer STATUS_FINISHED = 20;
+ /** 鐘舵�侊細宸插彇娑� */
+ public static final Integer STATUS_CANCELED = 30;
+
+ @TableId
+ private Long id;
+
+ /**
+ * 鍩硅缂栧彿
+ */
+ private String code;
+
+ /**
+ * 鍩硅涓婚
+ */
+ private String title;
+
+ /**
+ * 鍩硅绫诲瀷
+ *
+ * 瀛楀吀 mes_safety_training_type锛�1涓夌骇瀹夊叏鏁欒偛 2涓撻」鍩硅 3澶嶈 4鏃ュ父瀹夊叏鏁欒偛 5鍏朵粬
+ */
+ private Integer trainingType;
+
+ /**
+ * 鍩硅灞傜骇
+ *
+ * 瀛楀吀 mes_safety_training_level锛�1鍏徃绾� 2杞﹂棿绾� 3鐝粍绾�
+ */
+ private Integer trainingLevel;
+
+ /**
+ * 璁插笀 / 鎺堣浜�
+ */
+ private String trainer;
+
+ /**
+ * 璁插笀鍗曚綅锛堝閮ㄨ甯堟椂濉啓锛�
+ */
+ private String trainerOrg;
+
+ /**
+ * 鍩硅鍦扮偣
+ */
+ private String location;
+
+ /**
+ * 鍩硅寮�濮嬫椂闂�
+ */
+ private LocalDateTime startTime;
+
+ /**
+ * 鍩硅缁撴潫鏃堕棿
+ */
+ private LocalDateTime endTime;
+
+ /**
+ * 瀛︽椂
+ */
+ private BigDecimal durationHours;
+
+ /**
+ * 鍩硅鍐呭
+ */
+ private String content;
+
+ /**
+ * 鍩硅璧勬枡 / 鏁欐潗
+ */
+ private String material;
+
+ /**
+ * 鐘舵�侊細0璁″垝涓� 10杩涜涓� 20宸插畬鎴� 30宸插彇娑�
+ */
+ private Integer status;
+
+ /**
+ * 鍙傝浜烘暟锛堝啑浣欑粺璁★級
+ */
+ private Integer attendeeCount;
+
+ /**
+ * 瀹炲埌浜烘暟锛堝啑浣欑粺璁★級
+ */
+ private Integer signedCount;
+
+ /**
+ * 鑰冭瘯骞冲潎鍒嗭紙鍐椾綑缁熻锛�
+ */
+ private BigDecimal avgScore;
+
+ /**
+ * 澶囨敞
+ */
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/MesSafetyCertificateMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/MesSafetyCertificateMapper.java
new file mode 100644
index 0000000..4a658b0
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/MesSafetyCertificateMapper.java
@@ -0,0 +1,57 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.safety;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.certificate.MesSafetyCertificatePageReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.MesSafetyCertificateDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ * 瀹夊叏鐢熶骇 - 瀹夊叏璧勬牸璇佷功 Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface MesSafetyCertificateMapper extends BaseMapperX<MesSafetyCertificateDO> {
+
+ default PageResult<MesSafetyCertificateDO> selectPage(MesSafetyCertificatePageReqVO reqVO) {
+ LambdaQueryWrapperX<MesSafetyCertificateDO> wrapper = new LambdaQueryWrapperX<MesSafetyCertificateDO>()
+ .eqIfPresent(MesSafetyCertificateDO::getUserId, reqVO.getUserId())
+ .eqIfPresent(MesSafetyCertificateDO::getCertType, reqVO.getCertType())
+ .likeIfPresent(MesSafetyCertificateDO::getCertNo, reqVO.getCertNo())
+ .eqIfPresent(MesSafetyCertificateDO::getStatus, reqVO.getStatus());
+ // 鍙湅鍗冲皢鍒版湡锛堝惈宸茶繃鏈燂級锛歟xpireDate 鍦ㄤ粖澶�+30 涔嬪墠
+ if (Boolean.TRUE.equals(reqVO.getExpiringSoon())) {
+ LocalDate today = LocalDate.now();
+ wrapper.isNotNull(MesSafetyCertificateDO::getExpireDate)
+ .le(MesSafetyCertificateDO::getExpireDate, today.plusDays(30));
+ }
+ wrapper.orderByAsc(MesSafetyCertificateDO::getExpireDate)
+ .orderByDesc(MesSafetyCertificateDO::getId);
+ return selectPage(reqVO, wrapper);
+ }
+
+ default MesSafetyCertificateDO selectByCertNo(String certNo) {
+ return selectOne(MesSafetyCertificateDO::getCertNo, certNo);
+ }
+
+ /**
+ * 缁熻鏈夋晥浣嗗凡杩囨湡鐨勮瘉涔︽暟閲�
+ */
+ default Long selectCountExpired(LocalDate today) {
+ return selectCount(new LambdaQueryWrapperX<MesSafetyCertificateDO>()
+ .eq(MesSafetyCertificateDO::getStatus, MesSafetyCertificateDO.STATUS_VALID)
+ .isNotNull(MesSafetyCertificateDO::getExpireDate)
+ .lt(MesSafetyCertificateDO::getExpireDate, today));
+ }
+
+ default List<MesSafetyCertificateDO> selectAllList() {
+ return selectList(new LambdaQueryWrapperX<MesSafetyCertificateDO>()
+ .orderByAsc(MesSafetyCertificateDO::getExpireDate));
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/MesSafetyTrainingAttendeeMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/MesSafetyTrainingAttendeeMapper.java
new file mode 100644
index 0000000..69bcfc1
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/MesSafetyTrainingAttendeeMapper.java
@@ -0,0 +1,47 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.safety;
+
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.MesSafetyTrainingAttendeeDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鍩硅鍙傝浜哄憳 Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface MesSafetyTrainingAttendeeMapper extends BaseMapperX<MesSafetyTrainingAttendeeDO> {
+
+ default List<MesSafetyTrainingAttendeeDO> selectListByTrainingId(Long trainingId) {
+ return selectList(new LambdaQueryWrapperX<MesSafetyTrainingAttendeeDO>()
+ .eq(MesSafetyTrainingAttendeeDO::getTrainingId, trainingId)
+ .orderByAsc(MesSafetyTrainingAttendeeDO::getId));
+ }
+
+ default MesSafetyTrainingAttendeeDO selectByTrainingIdAndUserId(Long trainingId, Long userId) {
+ return selectOne(new LambdaQueryWrapperX<MesSafetyTrainingAttendeeDO>()
+ .eq(MesSafetyTrainingAttendeeDO::getTrainingId, trainingId)
+ .eq(MesSafetyTrainingAttendeeDO::getUserId, userId));
+ }
+
+ default void deleteByTrainingId(Long trainingId) {
+ delete(new LambdaQueryWrapperX<MesSafetyTrainingAttendeeDO>()
+ .eq(MesSafetyTrainingAttendeeDO::getTrainingId, trainingId));
+ }
+
+ default Long selectCountByTrainingId(Long trainingId) {
+ return selectCount(new LambdaQueryWrapperX<MesSafetyTrainingAttendeeDO>()
+ .eq(MesSafetyTrainingAttendeeDO::getTrainingId, trainingId));
+ }
+
+ default Long selectCountSignedByTrainingId(Long trainingId) {
+ return selectCount(new LambdaQueryWrapperX<MesSafetyTrainingAttendeeDO>()
+ .eq(MesSafetyTrainingAttendeeDO::getTrainingId, trainingId)
+ .in(MesSafetyTrainingAttendeeDO::getSignStatus,
+ MesSafetyTrainingAttendeeDO.SIGN_DONE, MesSafetyTrainingAttendeeDO.SIGN_LATE));
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/MesSafetyTrainingMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/MesSafetyTrainingMapper.java
new file mode 100644
index 0000000..2280682
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/MesSafetyTrainingMapper.java
@@ -0,0 +1,46 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.safety;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.training.MesSafetyTrainingPageReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.MesSafetyTrainingDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鍩硅鎵规 Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface MesSafetyTrainingMapper extends BaseMapperX<MesSafetyTrainingDO> {
+
+ default PageResult<MesSafetyTrainingDO> selectPage(MesSafetyTrainingPageReqVO reqVO) {
+ return selectPage(reqVO, new LambdaQueryWrapperX<MesSafetyTrainingDO>()
+ .likeIfPresent(MesSafetyTrainingDO::getCode, reqVO.getCode())
+ .likeIfPresent(MesSafetyTrainingDO::getTitle, reqVO.getTitle())
+ .eqIfPresent(MesSafetyTrainingDO::getTrainingType, reqVO.getTrainingType())
+ .eqIfPresent(MesSafetyTrainingDO::getTrainingLevel, reqVO.getTrainingLevel())
+ .eqIfPresent(MesSafetyTrainingDO::getStatus, reqVO.getStatus())
+ .geIfPresent(MesSafetyTrainingDO::getStartTime, reqVO.getStartTimeStart())
+ .leIfPresent(MesSafetyTrainingDO::getStartTime, reqVO.getStartTimeEnd())
+ .orderByDesc(MesSafetyTrainingDO::getId));
+ }
+
+ default MesSafetyTrainingDO selectByCode(String code) {
+ return selectOne(MesSafetyTrainingDO::getCode, code);
+ }
+
+ default Long selectCountByStatus(Integer status) {
+ return selectCount(new LambdaQueryWrapperX<MesSafetyTrainingDO>()
+ .eq(MesSafetyTrainingDO::getStatus, status));
+ }
+
+ default List<MesSafetyTrainingDO> selectAllList() {
+ return selectList(new LambdaQueryWrapperX<MesSafetyTrainingDO>()
+ .orderByDesc(MesSafetyTrainingDO::getId));
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/DictTypeConstants.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/DictTypeConstants.java
index dc59111..1a8f80e 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/DictTypeConstants.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/DictTypeConstants.java
@@ -135,4 +135,13 @@
String MES_SAFETY_TICKET_TYPE = "mes_safety_ticket_type"; // 浣滀笟绫诲瀷
String MES_SAFETY_TICKET_LEVEL = "mes_safety_ticket_level"; // 浣滀笟绾у埆
String MES_SAFETY_TICKET_STATUS = "mes_safety_ticket_status"; // 浣滀笟绁ㄧ姸鎬�
+
+ // 瀹夊叏鏁欒偛鍩硅
+ String MES_SAFETY_TRAINING_TYPE = "mes_safety_training_type"; // 鍩硅绫诲瀷
+ String MES_SAFETY_TRAINING_LEVEL = "mes_safety_training_level"; // 鍩硅灞傜骇锛堜笁绾ф暀鑲诧級
+ String MES_SAFETY_TRAINING_STATUS = "mes_safety_training_status"; // 鍩硅鐘舵��
+ String MES_SAFETY_ATTENDEE_STATUS = "mes_safety_attendee_status"; // 绛惧埌鐘舵��
+
+ // 瀹夊叏璧勬牸璇佷功
+ String MES_SAFETY_CERT_TYPE = "mes_safety_cert_type"; // 璇佷功绫诲瀷
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java
index 4b6b7a7..0887b79 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java
@@ -869,4 +869,15 @@
ErrorCode MES_SAFETY_TICKET_REJECT_REASON_REQUIRED = new ErrorCode(1_040_906_004, "瀹℃壒椹冲洖鏃跺繀椤诲~鍐欓┏鍥炲師鍥�");
ErrorCode MES_SAFETY_TICKET_HAS_REFERENCE = new ErrorCode(1_040_906_005, "璇ヨ褰曞凡琚綔涓氱エ寮曠敤锛屾棤娉曞垹闄�");
+ // ========== MES 瀹夊叏鐢熶骇 - 瀹夊叏鏁欒偛鍩硅锛�1-040-907-000锛� ==========
+ ErrorCode MES_SAFETY_TRAINING_NOT_EXISTS = new ErrorCode(1_040_907_000, "鍩硅鎵规涓嶅瓨鍦�");
+ ErrorCode MES_SAFETY_TRAINING_CODE_DUPLICATE = new ErrorCode(1_040_907_001, "鍩硅缂栧彿宸插瓨鍦�");
+ ErrorCode MES_SAFETY_TRAINING_TIME_INVALID = new ErrorCode(1_040_907_002, "鍩硅缁撴潫鏃堕棿蹇呴』鏅氫簬寮�濮嬫椂闂�");
+ ErrorCode MES_SAFETY_TRAINING_ATTENDEE_NOT_EXISTS = new ErrorCode(1_040_907_003, "鍙傝浜哄憳璁板綍涓嶅瓨鍦�");
+
+ // ========== MES 瀹夊叏鐢熶骇 - 瀹夊叏璧勬牸璇佷功锛�1-040-908-000锛� ==========
+ ErrorCode MES_SAFETY_CERTIFICATE_NOT_EXISTS = new ErrorCode(1_040_908_000, "璧勬牸璇佷功涓嶅瓨鍦�");
+ ErrorCode MES_SAFETY_CERTIFICATE_NO_DUPLICATE = new ErrorCode(1_040_908_001, "璇佷功缂栧彿宸插瓨鍦�");
+ ErrorCode MES_SAFETY_CERTIFICATE_DATE_INVALID = new ErrorCode(1_040_908_002, "鏈夋晥鏈熷繀椤绘櫄浜庡彂璇佹棩鏈�");
+
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/MesSafetyCertificateService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/MesSafetyCertificateService.java
new file mode 100644
index 0000000..7d3ef57
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/MesSafetyCertificateService.java
@@ -0,0 +1,27 @@
+package cn.iocoder.yudao.module.mes.service.safety;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.certificate.MesSafetyCertificatePageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.certificate.MesSafetyCertificateSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.MesSafetyCertificateDO;
+
+/**
+ * 瀹夊叏鐢熶骇 - 璧勬牸璇佷功 Service 鎺ュ彛
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+public interface MesSafetyCertificateService {
+
+ PageResult<MesSafetyCertificateDO> getCertificatePage(MesSafetyCertificatePageReqVO pageReqVO);
+
+ MesSafetyCertificateDO getCertificate(Long id);
+
+ Long createCertificate(MesSafetyCertificateSaveReqVO createReqVO);
+
+ void updateCertificate(MesSafetyCertificateSaveReqVO updateReqVO);
+
+ void deleteCertificate(Long id);
+
+ MesSafetyCertificateDO validateCertificateExists(Long id);
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/MesSafetyCertificateServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/MesSafetyCertificateServiceImpl.java
new file mode 100644
index 0000000..449f9c7
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/MesSafetyCertificateServiceImpl.java
@@ -0,0 +1,99 @@
+package cn.iocoder.yudao.module.mes.service.safety;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.certificate.MesSafetyCertificatePageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.certificate.MesSafetyCertificateSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.MesSafetyCertificateDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.safety.MesSafetyCertificateMapper;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import java.util.Objects;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
+
+/**
+ * 瀹夊叏鐢熶骇 - 璧勬牸璇佷功 Service 瀹炵幇
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Service
+@Validated
+public class MesSafetyCertificateServiceImpl implements MesSafetyCertificateService {
+
+ @Resource
+ private MesSafetyCertificateMapper certificateMapper;
+
+ @Override
+ public PageResult<MesSafetyCertificateDO> getCertificatePage(MesSafetyCertificatePageReqVO pageReqVO) {
+ return certificateMapper.selectPage(pageReqVO);
+ }
+
+ @Override
+ public MesSafetyCertificateDO getCertificate(Long id) {
+ return certificateMapper.selectById(id);
+ }
+
+ @Override
+ public Long createCertificate(MesSafetyCertificateSaveReqVO createReqVO) {
+ validateCertNoUnique(null, createReqVO.getCertNo());
+ validateDateRange(createReqVO);
+ MesSafetyCertificateDO certificate = BeanUtils.toBean(createReqVO, MesSafetyCertificateDO.class);
+ if (certificate.getStatus() == null) {
+ certificate.setStatus(MesSafetyCertificateDO.STATUS_VALID);
+ }
+ certificateMapper.insert(certificate);
+ return certificate.getId();
+ }
+
+ @Override
+ public void updateCertificate(MesSafetyCertificateSaveReqVO updateReqVO) {
+ validateCertificateExists(updateReqVO.getId());
+ validateCertNoUnique(updateReqVO.getId(), updateReqVO.getCertNo());
+ validateDateRange(updateReqVO);
+ MesSafetyCertificateDO updateObj = BeanUtils.toBean(updateReqVO, MesSafetyCertificateDO.class);
+ certificateMapper.updateById(updateObj);
+ }
+
+ @Override
+ public void deleteCertificate(Long id) {
+ validateCertificateExists(id);
+ certificateMapper.deleteById(id);
+ }
+
+ @Override
+ public MesSafetyCertificateDO validateCertificateExists(Long id) {
+ if (id == null) {
+ throw exception(MES_SAFETY_CERTIFICATE_NOT_EXISTS);
+ }
+ MesSafetyCertificateDO certificate = certificateMapper.selectById(id);
+ if (certificate == null) {
+ throw exception(MES_SAFETY_CERTIFICATE_NOT_EXISTS);
+ }
+ return certificate;
+ }
+
+ /**
+ * 鏈夋晥鏈熷繀椤绘櫄浜庡彂璇佹棩鏈�
+ */
+ private void validateDateRange(MesSafetyCertificateSaveReqVO reqVO) {
+ if (reqVO.getIssueDate() != null && reqVO.getExpireDate() != null
+ && !reqVO.getExpireDate().isAfter(reqVO.getIssueDate())) {
+ throw exception(MES_SAFETY_CERTIFICATE_DATE_INVALID);
+ }
+ }
+
+ private void validateCertNoUnique(Long id, String certNo) {
+ MesSafetyCertificateDO exists = certificateMapper.selectByCertNo(certNo);
+ if (exists == null) {
+ return;
+ }
+ if (id == null || !Objects.equals(exists.getId(), id)) {
+ throw exception(MES_SAFETY_CERTIFICATE_NO_DUPLICATE);
+ }
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/MesSafetyTrainingService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/MesSafetyTrainingService.java
new file mode 100644
index 0000000..c55d732
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/MesSafetyTrainingService.java
@@ -0,0 +1,56 @@
+package cn.iocoder.yudao.module.mes.service.safety;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.training.MesSafetyTrainingAttendeeSaveReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.training.MesSafetyTrainingPageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.training.MesSafetyTrainingSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.MesSafetyTrainingAttendeeDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.MesSafetyTrainingDO;
+
+import java.util.List;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鍩硅 Service 鎺ュ彛
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+public interface MesSafetyTrainingService {
+
+ PageResult<MesSafetyTrainingDO> getTrainingPage(MesSafetyTrainingPageReqVO pageReqVO);
+
+ MesSafetyTrainingDO getTraining(Long id);
+
+ Long createTraining(MesSafetyTrainingSaveReqVO createReqVO);
+
+ void updateTraining(MesSafetyTrainingSaveReqVO updateReqVO);
+
+ void deleteTraining(Long id);
+
+ MesSafetyTrainingDO validateTrainingExists(Long id);
+
+ /**
+ * 鑾峰緱鎸囧畾鍩硅鐨勫弬璁汉鍛樺垪琛�
+ */
+ List<MesSafetyTrainingAttendeeDO> getAttendeeList(Long trainingId);
+
+ /**
+ * 鍏ㄩ噺淇濆瓨鍙傝浜哄憳锛堜互浼犲叆鍒楄〃涓哄噯瑕嗙洊锛�
+ */
+ void saveAttendees(Long trainingId, List<MesSafetyTrainingAttendeeSaveReqVO> attendees);
+
+ /**
+ * 鏇存柊鍗曚釜鍙傝浜哄憳鐨勭鍒� / 鎴愮哗
+ */
+ void updateAttendee(MesSafetyTrainingAttendeeSaveReqVO reqVO);
+
+ /**
+ * 鍒犻櫎鍙傝浜哄憳
+ */
+ void deleteAttendee(Long id);
+
+ /**
+ * 鍒锋柊鍩硅鎵规鐨勫啑浣欑粺璁★紙鍙傝浜烘暟 / 瀹炲埌浜烘暟 / 骞冲潎鍒嗭級
+ */
+ void refreshStatistics(Long trainingId);
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/MesSafetyTrainingServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/MesSafetyTrainingServiceImpl.java
new file mode 100644
index 0000000..afcc2cc
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/MesSafetyTrainingServiceImpl.java
@@ -0,0 +1,203 @@
+package cn.iocoder.yudao.module.mes.service.safety;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.training.MesSafetyTrainingAttendeeSaveReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.training.MesSafetyTrainingPageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.training.MesSafetyTrainingSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.MesSafetyTrainingAttendeeDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.MesSafetyTrainingDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.safety.MesSafetyTrainingAttendeeMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.safety.MesSafetyTrainingMapper;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鍩硅 Service 瀹炵幇
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Service
+@Validated
+public class MesSafetyTrainingServiceImpl implements MesSafetyTrainingService {
+
+ @Resource
+ private MesSafetyTrainingMapper trainingMapper;
+
+ @Resource
+ private MesSafetyTrainingAttendeeMapper attendeeMapper;
+
+ @Override
+ public PageResult<MesSafetyTrainingDO> getTrainingPage(MesSafetyTrainingPageReqVO pageReqVO) {
+ return trainingMapper.selectPage(pageReqVO);
+ }
+
+ @Override
+ public MesSafetyTrainingDO getTraining(Long id) {
+ return trainingMapper.selectById(id);
+ }
+
+ @Override
+ public Long createTraining(MesSafetyTrainingSaveReqVO createReqVO) {
+ validateCodeUnique(null, createReqVO.getCode());
+ validateTimeRange(createReqVO);
+ MesSafetyTrainingDO training = BeanUtils.toBean(createReqVO, MesSafetyTrainingDO.class);
+ training.setAttendeeCount(0);
+ training.setSignedCount(0);
+ trainingMapper.insert(training);
+ return training.getId();
+ }
+
+ @Override
+ public void updateTraining(MesSafetyTrainingSaveReqVO updateReqVO) {
+ validateTrainingExists(updateReqVO.getId());
+ validateCodeUnique(updateReqVO.getId(), updateReqVO.getCode());
+ validateTimeRange(updateReqVO);
+ MesSafetyTrainingDO updateObj = BeanUtils.toBean(updateReqVO, MesSafetyTrainingDO.class);
+ // 缁熻瀛楁鐢卞弬璁汉鍛樼淮鎶わ紝涓嶉�氳繃姝ゆ帴鍙d慨鏀�
+ updateObj.setAttendeeCount(null);
+ updateObj.setSignedCount(null);
+ updateObj.setAvgScore(null);
+ trainingMapper.updateById(updateObj);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void deleteTraining(Long id) {
+ validateTrainingExists(id);
+ // 绾ц仈鍒犻櫎鍙傝璁板綍锛岄伩鍏嶅鍎挎暟鎹�
+ attendeeMapper.deleteByTrainingId(id);
+ trainingMapper.deleteById(id);
+ }
+
+ @Override
+ public MesSafetyTrainingDO validateTrainingExists(Long id) {
+ if (id == null) {
+ throw exception(MES_SAFETY_TRAINING_NOT_EXISTS);
+ }
+ MesSafetyTrainingDO training = trainingMapper.selectById(id);
+ if (training == null) {
+ throw exception(MES_SAFETY_TRAINING_NOT_EXISTS);
+ }
+ return training;
+ }
+
+ @Override
+ public List<MesSafetyTrainingAttendeeDO> getAttendeeList(Long trainingId) {
+ return attendeeMapper.selectListByTrainingId(trainingId);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void saveAttendees(Long trainingId, List<MesSafetyTrainingAttendeeSaveReqVO> attendees) {
+ validateTrainingExists(trainingId);
+ // 鍏ㄩ噺瑕嗙洊锛氬厛娓呯┖鍐嶆彃鍏ワ紝淇濊瘉涓庡墠绔垪琛ㄤ竴鑷�
+ attendeeMapper.deleteByTrainingId(trainingId);
+ if (attendees != null && !attendees.isEmpty()) {
+ List<MesSafetyTrainingAttendeeDO> list = new ArrayList<>(attendees.size());
+ for (MesSafetyTrainingAttendeeSaveReqVO vo : attendees) {
+ MesSafetyTrainingAttendeeDO attendee = BeanUtils.toBean(vo, MesSafetyTrainingAttendeeDO.class);
+ attendee.setId(null);
+ attendee.setTrainingId(trainingId);
+ if (attendee.getSignStatus() == null) {
+ attendee.setSignStatus(MesSafetyTrainingAttendeeDO.SIGN_NONE);
+ }
+ if (attendee.getPassed() == null) {
+ attendee.setPassed(MesSafetyTrainingAttendeeDO.PASS_NONE);
+ }
+ list.add(attendee);
+ }
+ attendeeMapper.insertBatch(list);
+ }
+ refreshStatistics(trainingId);
+ }
+
+ @Override
+ public void updateAttendee(MesSafetyTrainingAttendeeSaveReqVO reqVO) {
+ if (reqVO.getId() == null) {
+ throw exception(MES_SAFETY_TRAINING_ATTENDEE_NOT_EXISTS);
+ }
+ MesSafetyTrainingAttendeeDO exists = attendeeMapper.selectById(reqVO.getId());
+ if (exists == null) {
+ throw exception(MES_SAFETY_TRAINING_ATTENDEE_NOT_EXISTS);
+ }
+ MesSafetyTrainingAttendeeDO updateObj = new MesSafetyTrainingAttendeeDO();
+ updateObj.setId(reqVO.getId());
+ updateObj.setSignStatus(reqVO.getSignStatus());
+ updateObj.setSignTime(reqVO.getSignTime());
+ updateObj.setScore(reqVO.getScore());
+ updateObj.setPassed(reqVO.getPassed());
+ updateObj.setRemark(reqVO.getRemark());
+ attendeeMapper.updateById(updateObj);
+ refreshStatistics(exists.getTrainingId());
+ }
+
+ @Override
+ public void deleteAttendee(Long id) {
+ MesSafetyTrainingAttendeeDO exists = attendeeMapper.selectById(id);
+ if (exists == null) {
+ throw exception(MES_SAFETY_TRAINING_ATTENDEE_NOT_EXISTS);
+ }
+ attendeeMapper.deleteById(id);
+ refreshStatistics(exists.getTrainingId());
+ }
+
+ @Override
+ public void refreshStatistics(Long trainingId) {
+ Long total = attendeeMapper.selectCountByTrainingId(trainingId);
+ Long signed = attendeeMapper.selectCountSignedByTrainingId(trainingId);
+ List<MesSafetyTrainingAttendeeDO> list = attendeeMapper.selectListByTrainingId(trainingId);
+ // 骞冲潎鍒嗗彧缁熻鏈夋垚缁╃殑
+ BigDecimal sum = BigDecimal.ZERO;
+ int scored = 0;
+ for (MesSafetyTrainingAttendeeDO a : list) {
+ if (a.getScore() != null) {
+ sum = sum.add(a.getScore());
+ scored++;
+ }
+ }
+ BigDecimal avg = scored > 0
+ ? sum.divide(BigDecimal.valueOf(scored), 2, RoundingMode.HALF_UP)
+ : null;
+ MesSafetyTrainingDO updateObj = new MesSafetyTrainingDO();
+ updateObj.setId(trainingId);
+ updateObj.setAttendeeCount(total == null ? 0 : total.intValue());
+ updateObj.setSignedCount(signed == null ? 0 : signed.intValue());
+ updateObj.setAvgScore(avg);
+ trainingMapper.updateById(updateObj);
+ }
+
+ /**
+ * 鏍¢獙鍩硅鏃堕棿鍖洪棿
+ */
+ private void validateTimeRange(MesSafetyTrainingSaveReqVO reqVO) {
+ LocalDateTime start = reqVO.getStartTime();
+ LocalDateTime end = reqVO.getEndTime();
+ if (start != null && end != null && !end.isAfter(start)) {
+ throw exception(MES_SAFETY_TRAINING_TIME_INVALID);
+ }
+ }
+
+ private void validateCodeUnique(Long id, String code) {
+ MesSafetyTrainingDO exists = trainingMapper.selectByCode(code);
+ if (exists == null) {
+ return;
+ }
+ if (id == null || !Objects.equals(exists.getId(), id)) {
+ throw exception(MES_SAFETY_TRAINING_CODE_DUPLICATE);
+ }
+ }
+
+}
--
Gitblit v1.9.3