From 5ea3ccadce91cb9e7a760da8d0d34b316a977d78 Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期一, 02 十一月 2026 12:01:26 +0800
Subject: [PATCH] feat(safety): 安全生产四期 - 特种作业票证管理
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/DictTypeConstants.java | 5
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/MesSafetyWorkTicketServiceImpl.java | 188 +++++++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/ticket/MesSafetyWorkTicketApproveReqVO.java | 25 +
sql/mysql/mes_safety_ticket_init.sql | 150 +++++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/ticket/MesSafetyWorkTicketPageReqVO.java | 49 ++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/MesSafetyWorkTicketService.java | 45 ++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/ticket/MesSafetyWorkTicketRespVO.java | 120 ++++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/MesSafetyWorkTicketDO.java | 188 +++++++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/MesSafetyWorkTicketMapper.java | 64 +++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/MesSafetyWorkTicketController.java | 179 +++++++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java | 8
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/MesSafetyRiskUnitServiceImpl.java | 9
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/ticket/MesSafetyWorkTicketSaveReqVO.java | 72 +++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/ticket/MesSafetyWorkTicketCloseReqVO.java | 35 +
14 files changed, 1,137 insertions(+), 0 deletions(-)
diff --git a/sql/mysql/mes_safety_ticket_init.sql b/sql/mysql/mes_safety_ticket_init.sql
new file mode 100644
index 0000000..d7daeec
--- /dev/null
+++ b/sql/mysql/mes_safety_ticket_init.sql
@@ -0,0 +1,150 @@
+-- =====================================================================
+-- 瀹夊叏鐢熶骇妯″潡 鈥斺�� 鍥涙湡锛氱壒绉嶄綔涓氱エ璇佺鐞�
+--
+-- 瀹氫綅锛氶珮椋庨櫓浣滀笟蹇呴』鍏堝姙绁ㄣ�佸鎵归�氳繃鍚庢墠鍙綔涓氾紝浣滀笟鏈熼棿闇�鐩戞姢浜虹‘璁わ紝
+-- 瀹屽伐鍚庣櫥璁板苟褰掓。锛屽舰鎴愬彲杩芥函鐨勪綔涓氳鍙褰曘��
+--
+-- 鏀寔浣滀笟绫诲瀷锛堝彲鎸夊鎴峰疄闄呭鍑忓瓧鍏稿嵆鍙級锛�
+-- 1 鍔ㄧ伀浣滀笟 / 2 鍙楅檺绌洪棿浣滀笟 / 3 楂樺浣滀笟 / 4 鍚婅浣滀笟
+-- 5 涓存椂鐢ㄧ數浣滀笟 / 6 鏂矾浣滀笟 / 7 鐩叉澘鎶藉牭浣滀笟 / 8 璁惧妫�淇綔涓�
+--
+-- 鐘舵�佹祦杞細
+-- 0 寰呭鎵� --瀹℃壒閫氳繃--> 10 宸叉壒鍑� --瀹屽伐鐧昏--> 20 宸插畬宸� --褰掓。--> 30 宸插綊妗�
+-- 鈹�
+-- 鈹�--瀹℃壒椹冲洖--> 90 宸查┏鍥�
+--
+-- 浣跨敤绾︽潫锛堟湇鍔$寮烘牎楠岋級锛�
+-- * 浣滀笟缁撴潫鏃堕棿蹇呴』鏅氫簬寮�濮嬫椂闂�
+-- * 瀹℃壒閫氳繃鍚庝笉鍏佽鍐嶆敼浣滀笟淇℃伅锛堥渶浣滃簾閲嶅紑锛�
+-- * 宸插綊妗g殑浣滀笟绁ㄥ彧璇�
+--
+-- 鍐呭锛�
+-- 1. 寤鸿〃 mes_safety_work_ticket
+-- 2. 瀛楀吀锛氫綔涓氱被鍨� / 浣滀笟绾у埆 / 浣滀笟绁ㄧ姸鎬�
+-- 3. 鑿滃崟鎸傚湪銆屽畨鍏ㄧ敓浜с�嶇洰褰曚笅
+-- 4. 鎺堟潈瓒呯骇绠$悊鍛�
+--
+-- 鐗规�э細鍙噸澶嶆墽琛�
+-- =====================================================================
+
+CREATE TABLE IF NOT EXISTS `mes_safety_work_ticket` (
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '缂栧彿',
+ `code` varchar(64) NOT NULL COMMENT '浣滀笟绁ㄥ彿',
+
+ `ticket_type` tinyint NOT NULL COMMENT '浣滀笟绫诲瀷锛堝瓧鍏� mes_safety_ticket_type锛�',
+ `ticket_level` tinyint DEFAULT NULL COMMENT '浣滀笟绾у埆锛堝瓧鍏� mes_safety_ticket_level锛�',
+
+ `unit_id` bigint DEFAULT NULL COMMENT '鍏宠仈椋庨櫓鍗曞厓缂栧彿',
+ `workshop_id` bigint DEFAULT NULL COMMENT '鎵�灞炶溅闂寸紪鍙�',
+ `work_location` varchar(255) DEFAULT NULL COMMENT '浣滀笟鍦扮偣',
+ `work_content` varchar(1000) DEFAULT NULL COMMENT '浣滀笟鍐呭',
+
+ `plan_start_time` datetime DEFAULT NULL COMMENT '璁″垝寮�濮嬫椂闂�',
+ `plan_end_time` datetime DEFAULT NULL COMMENT '璁″垝缁撴潫鏃堕棿',
+ `actual_start_time` datetime DEFAULT NULL COMMENT '瀹為檯寮�濮嬫椂闂�',
+ `actual_end_time` datetime DEFAULT NULL COMMENT '瀹為檯缁撴潫鏃堕棿',
+
+ `applicant_user_id` bigint DEFAULT NULL COMMENT '鐢宠浜虹紪鍙�',
+ `applicant_dept_id` bigint DEFAULT NULL COMMENT '鐢宠閮ㄩ棬缂栧彿',
+ `contractor` varchar(200) DEFAULT NULL COMMENT '鏂藉伐鍗曚綅/鎵垮寘鍟�',
+ `worker_names` varchar(500) DEFAULT NULL COMMENT '浣滀笟浜哄憳锛堝涓敤閫楀彿鍒嗛殧锛�',
+ `guardian_user_id` bigint DEFAULT NULL COMMENT '鐩戞姢浜虹紪鍙�',
+ `guardian_confirm` bit(1) DEFAULT b'0' COMMENT '鐩戞姢浜烘槸鍚﹀凡纭',
+
+ `safety_measures` varchar(2000) DEFAULT NULL COMMENT '瀹夊叏鎺柦',
+ `safety_check_result` varchar(1000) DEFAULT NULL COMMENT '瀹夊叏浜ゅ簳/妫�鏌ョ粨鏋�',
+
+ `approver_user_id` bigint DEFAULT NULL COMMENT '瀹℃壒浜虹紪鍙�',
+ `approve_time` datetime DEFAULT NULL COMMENT '瀹℃壒鏃堕棿',
+ `approve_comment` varchar(500) DEFAULT NULL COMMENT '瀹℃壒鎰忚',
+ `reject_reason` varchar(500) DEFAULT NULL COMMENT '椹冲洖鍘熷洜',
+
+ `status` tinyint NOT NULL DEFAULT '0' COMMENT '鐘舵�侊細0寰呭鎵� 10宸叉壒鍑� 20宸插畬宸� 30宸插綊妗� 90宸查┏鍥�',
+
+ `close_time` datetime DEFAULT NULL COMMENT '褰掓。鏃堕棿',
+ `close_user_id` bigint DEFAULT NULL COMMENT '褰掓。浜虹紪鍙�',
+ `close_remark` 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_code` (`code`) USING BTREE,
+ KEY `idx_status` (`status`) USING BTREE,
+ KEY `idx_type` (`ticket_type`) USING BTREE,
+ KEY `idx_plan_start` (`plan_start_time`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='瀹夊叏鐢熶骇-鐗圭浣滀笟绁ㄨ瘉';
+
+-- ---------------------------------------------------------------------
+-- 瀛楀吀
+-- ---------------------------------------------------------------------
+DELETE FROM system_dict_data WHERE dict_type IN
+ ('mes_safety_ticket_type', 'mes_safety_ticket_level', 'mes_safety_ticket_status');
+
+DELETE FROM system_dict_type WHERE type IN
+ ('mes_safety_ticket_type', 'mes_safety_ticket_level', 'mes_safety_ticket_status');
+
+INSERT INTO system_dict_type (name, type, status, remark, creator, create_time, updater, update_time, deleted)
+VALUES ('瀹夊叏鐢熶骇-浣滀笟绫诲瀷', 'mes_safety_ticket_type', 0, '鐗圭浣滀笟绁ㄨ瘉绫诲瀷', '1', NOW(), '1', NOW(), b'0'),
+ ('瀹夊叏鐢熶骇-浣滀笟绾у埆', 'mes_safety_ticket_level', 0, '鍔ㄧ伀/楂樺绛夋寜椋庨櫓鍒嗙骇鐨勪綔涓氱骇鍒�', '1', NOW(), '1', NOW(), b'0'),
+ ('瀹夊叏鐢熶骇-浣滀笟绁ㄧ姸鎬�', 'mes_safety_ticket_status', 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_ticket_type', 0, 'error', '1', NOW(), '1', NOW(), b'0'),
+(2, '鍙楅檺绌洪棿浣滀笟', '2', 'mes_safety_ticket_type', 0, 'warning', '1', NOW(), '1', NOW(), b'0'),
+(3, '楂樺浣滀笟', '3', 'mes_safety_ticket_type', 0, 'warning', '1', NOW(), '1', NOW(), b'0'),
+(4, '鍚婅浣滀笟', '4', 'mes_safety_ticket_type', 0, 'processing', '1', NOW(), '1', NOW(), b'0'),
+(5, '涓存椂鐢ㄧ數浣滀笟', '5', 'mes_safety_ticket_type', 0, 'processing', '1', NOW(), '1', NOW(), b'0'),
+(6, '鏂矾浣滀笟', '6', 'mes_safety_ticket_type', 0, 'default', '1', NOW(), '1', NOW(), b'0'),
+(7, '鐩叉澘鎶藉牭浣滀笟', '7', 'mes_safety_ticket_type', 0, 'warning', '1', NOW(), '1', NOW(), b'0'),
+(8, '璁惧妫�淇綔涓�', '8', 'mes_safety_ticket_type', 0, 'default', '1', NOW(), '1', NOW(), b'0'),
+-- 浣滀笟绾у埆
+(1, '鐗规畩浣滀笟', '1', 'mes_safety_ticket_level', 0, 'error', '1', NOW(), '1', NOW(), b'0'),
+(2, '涓�绾т綔涓�', '2', 'mes_safety_ticket_level', 0, 'warning', '1', NOW(), '1', NOW(), b'0'),
+(3, '浜岀骇浣滀笟', '3', 'mes_safety_ticket_level', 0, 'processing', '1', NOW(), '1', NOW(), b'0'),
+(4, '涓夌骇浣滀笟', '4', 'mes_safety_ticket_level', 0, 'success', '1', NOW(), '1', NOW(), b'0'),
+-- 浣滀笟绁ㄧ姸鎬�
+(1, '寰呭鎵�', '0', 'mes_safety_ticket_status', 0, 'processing', '1', NOW(), '1', NOW(), b'0'),
+(2, '宸叉壒鍑�', '10', 'mes_safety_ticket_status', 0, 'success', '1', NOW(), '1', NOW(), b'0'),
+(3, '宸插畬宸�', '20', 'mes_safety_ticket_status', 0, 'default', '1', NOW(), '1', NOW(), b'0'),
+(4, '宸插綊妗�', '30', 'mes_safety_ticket_status', 0, 'default', '1', NOW(), '1', NOW(), b'0'),
+(5, '宸查┏鍥�', '90', 'mes_safety_ticket_status', 0, 'error', '1', NOW(), '1', NOW(), b'0');
+
+-- ---------------------------------------------------------------------
+-- 鑿滃崟锛堟寕鍦� 1065910 瀹夊叏鐢熶骇涓嬶級
+-- ---------------------------------------------------------------------
+DELETE FROM system_role_menu WHERE menu_id BETWEEN 1065934 AND 1065950;
+
+DELETE FROM system_menu WHERE id BETWEEN 1065934 AND 1065950;
+
+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
+(1065934, '鐗圭浣滀笟绁ㄨ瘉', '', 2, 5, 1065910, 'work-ticket', 'ep:tickets',
+ 'safety/ticket/index', 'SafetyWorkTicket', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1065935, '浣滀笟绁ㄦ煡璇�', 'mes:safety-ticket:query', 3, 1, 1065934, '', '', NULL, NULL, 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1065936, '浣滀笟绁ㄧ敵璇�', 'mes:safety-ticket:create', 3, 2, 1065934, '', '', NULL, NULL, 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1065937, '浣滀笟绁ㄤ慨鏀�', 'mes:safety-ticket:update', 3, 3, 1065934, '', '', NULL, NULL, 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1065938, '浣滀笟绁ㄥ垹闄�', 'mes:safety-ticket:delete', 3, 4, 1065934, '', '', NULL, NULL, 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1065939, '浣滀笟绁ㄥ鎵�', 'mes:safety-ticket:approve', 3, 5, 1065934, '', '', NULL, NULL, 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1065940, '瀹屽伐褰掓。', 'mes:safety-ticket:close', 3, 6, 1065934, '', '', 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 1065934 AND 1065950;
+
+-- ---------------------------------------------------------------------
+-- 楠岃瘉
+-- ---------------------------------------------------------------------
+SELECT id, parent_id, name, path, component, permission, type
+FROM system_menu WHERE id BETWEEN 1065910 AND 1065950 ORDER BY id;
+
+SELECT dict_type, label, value FROM system_dict_data
+WHERE dict_type LIKE 'mes_safety_ticket%' ORDER BY dict_type, sort;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/MesSafetyWorkTicketController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/MesSafetyWorkTicketController.java
new file mode 100644
index 0000000..4597edf
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/MesSafetyWorkTicketController.java
@@ -0,0 +1,179 @@
+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.framework.security.core.util.SecurityFrameworkUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.ticket.MesSafetyWorkTicketApproveReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.ticket.MesSafetyWorkTicketCloseReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.ticket.MesSafetyWorkTicketPageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.ticket.MesSafetyWorkTicketRespVO;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.ticket.MesSafetyWorkTicketSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkshopDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.MesSafetyRiskUnitDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.MesSafetyWorkTicketDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.md.workstation.MesMdWorkshopMapper;
+import cn.iocoder.yudao.module.mes.service.safety.MesSafetyRiskUnitService;
+import cn.iocoder.yudao.module.mes.service.safety.MesSafetyWorkTicketService;
+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.LocalDateTime;
+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/work-ticket")
+@Validated
+public class MesSafetyWorkTicketController {
+
+ @Resource
+ private MesSafetyWorkTicketService ticketService;
+
+ @Resource
+ private MesSafetyRiskUnitService riskUnitService;
+
+ @Resource
+ private MesMdWorkshopMapper workshopMapper;
+
+ @Resource
+ private AdminUserApi adminUserApi;
+
+ @PostMapping("/create")
+ @Operation(summary = "鐢宠浣滀笟绁�")
+ @PreAuthorize("@ss.hasPermission('mes:safety-ticket:create')")
+ public CommonResult<Long> createTicket(@Valid @RequestBody MesSafetyWorkTicketSaveReqVO createReqVO) {
+ return success(ticketService.createTicket(createReqVO));
+ }
+
+ @PutMapping("/update")
+ @Operation(summary = "淇敼浣滀笟绁�")
+ @PreAuthorize("@ss.hasPermission('mes:safety-ticket:update')")
+ public CommonResult<Boolean> updateTicket(@Valid @RequestBody MesSafetyWorkTicketSaveReqVO updateReqVO) {
+ ticketService.updateTicket(updateReqVO);
+ return success(true);
+ }
+
+ @DeleteMapping("/delete")
+ @Operation(summary = "鍒犻櫎浣滀笟绁�")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('mes:safety-ticket:delete')")
+ public CommonResult<Boolean> deleteTicket(@RequestParam("id") Long id) {
+ ticketService.deleteTicket(id);
+ return success(true);
+ }
+
+ @PutMapping("/approve")
+ @Operation(summary = "瀹℃壒浣滀笟绁�")
+ @PreAuthorize("@ss.hasPermission('mes:safety-ticket:approve')")
+ public CommonResult<Boolean> approveTicket(@Valid @RequestBody MesSafetyWorkTicketApproveReqVO reqVO) {
+ ticketService.approveTicket(SecurityFrameworkUtils.getLoginUserId(), reqVO);
+ return success(true);
+ }
+
+ @PutMapping("/close")
+ @Operation(summary = "瀹屽伐鐧昏 / 褰掓。")
+ @PreAuthorize("@ss.hasPermission('mes:safety-ticket:close')")
+ public CommonResult<Boolean> closeTicket(@Valid @RequestBody MesSafetyWorkTicketCloseReqVO reqVO) {
+ ticketService.closeTicket(SecurityFrameworkUtils.getLoginUserId(), reqVO);
+ return success(true);
+ }
+
+ @GetMapping("/get")
+ @Operation(summary = "鑾峰緱浣滀笟绁�")
+ @Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
+ @PreAuthorize("@ss.hasPermission('mes:safety-ticket:query')")
+ public CommonResult<MesSafetyWorkTicketRespVO> getTicket(@RequestParam("id") Long id) {
+ MesSafetyWorkTicketDO ticket = ticketService.getTicket(id);
+ if (ticket == null) {
+ return success(null);
+ }
+ List<MesSafetyWorkTicketRespVO> list = buildRespList(Collections.singletonList(ticket));
+ return success(list.isEmpty() ? null : list.get(0));
+ }
+
+ @GetMapping("/page")
+ @Operation(summary = "鑾峰緱浣滀笟绁ㄥ垎椤�")
+ @PreAuthorize("@ss.hasPermission('mes:safety-ticket:query')")
+ public CommonResult<PageResult<MesSafetyWorkTicketRespVO>> getTicketPage(@Valid MesSafetyWorkTicketPageReqVO pageReqVO) {
+ PageResult<MesSafetyWorkTicketDO> pageResult = ticketService.getTicketPage(pageReqVO);
+ List<MesSafetyWorkTicketRespVO> list = buildRespList(pageResult.getList());
+ return success(new PageResult<>(list, pageResult.getTotal()));
+ }
+
+ /**
+ * 杞崲涓� VO 骞跺~鍏呰溅闂淬�佷汉鍛樸�侀闄╁崟鍏冨悕绉般�佽秴鏈熸爣璁�
+ */
+ private List<MesSafetyWorkTicketRespVO> buildRespList(List<MesSafetyWorkTicketDO> list) {
+ if (list == null || list.isEmpty()) {
+ return Collections.emptyList();
+ }
+ List<MesSafetyWorkTicketRespVO> respList = BeanUtils.toBean(list, MesSafetyWorkTicketRespVO.class);
+
+ // 杞﹂棿鍚嶇О
+ Set<Long> workshopIds = list.stream().map(MesSafetyWorkTicketDO::getWorkshopId)
+ .filter(Objects::nonNull).collect(Collectors.toSet());
+ Map<Long, String> workshopNameMap = new HashMap<>();
+ if (!workshopIds.isEmpty()) {
+ List<MesMdWorkshopDO> workshops = workshopMapper.selectByIds(workshopIds);
+ workshops.forEach(w -> workshopNameMap.put(w.getId(), w.getName()));
+ }
+
+ // 浜哄憳濮撳悕
+ Set<Long> userIds = new HashSet<>();
+ list.forEach(t -> {
+ if (t.getApplicantUserId() != null) userIds.add(t.getApplicantUserId());
+ if (t.getGuardianUserId() != null) userIds.add(t.getGuardianUserId());
+ if (t.getApproverUserId() != null) userIds.add(t.getApproverUserId());
+ });
+ Map<Long, AdminUserRespDTO> userMap = userIds.isEmpty()
+ ? Collections.emptyMap() : adminUserApi.getUserMap(userIds);
+
+ // 椋庨櫓鍗曞厓鍚嶇О
+ Set<Long> unitIds = list.stream().map(MesSafetyWorkTicketDO::getUnitId)
+ .filter(Objects::nonNull).collect(Collectors.toSet());
+ Map<Long, MesSafetyRiskUnitDO> unitMap = riskUnitService.getRiskUnitMap(unitIds);
+
+ LocalDateTime now = LocalDateTime.now();
+ for (MesSafetyWorkTicketRespVO vo : respList) {
+ vo.setWorkshopName(workshopNameMap.get(vo.getWorkshopId()));
+ vo.setApplicantUserName(nickname(userMap, vo.getApplicantUserId()));
+ vo.setGuardianUserName(nickname(userMap, vo.getGuardianUserId()));
+ vo.setApproverUserName(nickname(userMap, vo.getApproverUserId()));
+ MesSafetyRiskUnitDO unit = unitMap.get(vo.getUnitId());
+ if (unit != null) {
+ vo.setUnitName(unit.getName());
+ }
+ // 瓒呮湡锛氬凡鎵瑰噯浣嗚鍒掔粨鏉熸椂闂村凡杩�
+ vo.setOverdue(MesSafetyWorkTicketDO.STATUS_APPROVED.equals(vo.getStatus())
+ && vo.getPlanEndTime() != null
+ && vo.getPlanEndTime().isBefore(now));
+ }
+ return respList;
+ }
+
+ private String nickname(Map<Long, AdminUserRespDTO> userMap, Long userId) {
+ if (userId == null) {
+ return null;
+ }
+ AdminUserRespDTO user = userMap.get(userId);
+ return user != null ? user.getNickname() : null;
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/ticket/MesSafetyWorkTicketApproveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/ticket/MesSafetyWorkTicketApproveReqVO.java
new file mode 100644
index 0000000..e9fb642
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/ticket/MesSafetyWorkTicketApproveReqVO.java
@@ -0,0 +1,25 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.ticket;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+@Schema(description = "绠$悊鍚庡彴 - 瀹夊叏鐢熶骇-浣滀笟绁ㄥ鎵� Request VO")
+@Data
+public class MesSafetyWorkTicketApproveReqVO {
+
+ @Schema(description = "浣滀笟绁ㄧ紪鍙�", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+ @NotNull(message = "浣滀笟绁ㄧ紪鍙蜂笉鑳戒负绌�")
+ private Long id;
+
+ @Schema(description = "鏄惁閫氳繃", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
+ @NotNull(message = "瀹℃壒缁撹涓嶈兘涓虹┖")
+ private Boolean pass;
+
+ @Schema(description = "瀹℃壒鎰忚", example = "瀹夊叏鎺柦鍒颁綅锛屽悓鎰忎綔涓�")
+ private String approveComment;
+
+ @Schema(description = "椹冲洖鍘熷洜锛堜笉閫氳繃鏃跺繀濉級", example = "瀹夊叏鎺柦涓嶅畬鍠勶紝缂哄皯姘斾綋妫�娴�")
+ private String rejectReason;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/ticket/MesSafetyWorkTicketCloseReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/ticket/MesSafetyWorkTicketCloseReqVO.java
new file mode 100644
index 0000000..47f6a9d
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/ticket/MesSafetyWorkTicketCloseReqVO.java
@@ -0,0 +1,35 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.ticket;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+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
+public class MesSafetyWorkTicketCloseReqVO {
+
+ @Schema(description = "浣滀笟绁ㄧ紪鍙�", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+ @NotNull(message = "浣滀笟绁ㄧ紪鍙蜂笉鑳戒负绌�")
+ private Long id;
+
+ @Schema(description = "鏄惁鐩存帴褰掓。锛歠alse=浠呯櫥璁板畬宸ワ紙宸叉壒鍑嗏啋宸插畬宸ワ級锛泃rue=瀹屽伐骞跺綊妗o紙鈫掑凡褰掓。锛�",
+ example = "false")
+ private Boolean archive;
+
+ @Schema(description = "瀹為檯寮�濮嬫椂闂�")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+ private LocalDateTime actualStartTime;
+
+ @Schema(description = "瀹為檯缁撴潫鏃堕棿")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+ private LocalDateTime actualEndTime;
+
+ @Schema(description = "瀹屽伐 / 褰掓。璇存槑", example = "浣滀笟瀹屾垚锛岀幇鍦哄凡娓呯悊")
+ private String closeRemark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/ticket/MesSafetyWorkTicketPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/ticket/MesSafetyWorkTicketPageReqVO.java
new file mode 100644
index 0000000..0cf4d5c
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/ticket/MesSafetyWorkTicketPageReqVO.java
@@ -0,0 +1,49 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.ticket;
+
+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 MesSafetyWorkTicketPageReqVO extends PageParam {
+
+ @Schema(description = "浣滀笟绁ㄥ彿", example = "ZY-2026-001")
+ private String code;
+
+ @Schema(description = "浣滀笟绫诲瀷", example = "1")
+ private Integer ticketType;
+
+ @Schema(description = "浣滀笟绾у埆", example = "2")
+ private Integer ticketLevel;
+
+ @Schema(description = "鐘舵��", example = "0")
+ private Integer status;
+
+ @Schema(description = "鎵�灞炶溅闂寸紪鍙�", example = "7")
+ private Long workshopId;
+
+ @Schema(description = "鐢宠浜虹紪鍙�", example = "1")
+ private Long applicantUserId;
+
+ @Schema(description = "浣滀笟鍦扮偣", example = "閫犵焊杞﹂棿")
+ private String workLocation;
+
+ @Schema(description = "璁″垝寮�濮嬫椂闂�-璧�")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+ private LocalDateTime planStartTimeStart;
+
+ @Schema(description = "璁″垝寮�濮嬫椂闂�-姝�")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+ private LocalDateTime planStartTimeEnd;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/ticket/MesSafetyWorkTicketRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/ticket/MesSafetyWorkTicketRespVO.java
new file mode 100644
index 0000000..0f8d5fd
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/ticket/MesSafetyWorkTicketRespVO.java
@@ -0,0 +1,120 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.ticket;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "绠$悊鍚庡彴 - 瀹夊叏鐢熶骇-浣滀笟绁� Response VO")
+@Data
+public class MesSafetyWorkTicketRespVO {
+
+ @Schema(description = "缂栧彿", example = "1024")
+ private Long id;
+
+ @Schema(description = "浣滀笟绁ㄥ彿", example = "ZY-2026-001")
+ private String code;
+
+ @Schema(description = "浣滀笟绫诲瀷", example = "1")
+ private Integer ticketType;
+
+ @Schema(description = "浣滀笟绾у埆", example = "2")
+ private Integer ticketLevel;
+
+ @Schema(description = "鍏宠仈椋庨櫓鍗曞厓缂栧彿", example = "1")
+ private Long unitId;
+
+ @Schema(description = "鍏宠仈椋庨櫓鍗曞厓鍚嶇О")
+ private String unitName;
+
+ @Schema(description = "鎵�灞炶溅闂寸紪鍙�", example = "7")
+ private Long workshopId;
+
+ @Schema(description = "鎵�灞炶溅闂村悕绉�")
+ private String workshopName;
+
+ @Schema(description = "浣滀笟鍦扮偣")
+ private String workLocation;
+
+ @Schema(description = "浣滀笟鍐呭")
+ private String workContent;
+
+ @Schema(description = "璁″垝寮�濮嬫椂闂�")
+ private LocalDateTime planStartTime;
+
+ @Schema(description = "璁″垝缁撴潫鏃堕棿")
+ private LocalDateTime planEndTime;
+
+ @Schema(description = "瀹為檯寮�濮嬫椂闂�")
+ private LocalDateTime actualStartTime;
+
+ @Schema(description = "瀹為檯缁撴潫鏃堕棿")
+ private LocalDateTime actualEndTime;
+
+ @Schema(description = "鐢宠浜虹紪鍙�", example = "1")
+ private Long applicantUserId;
+
+ @Schema(description = "鐢宠浜哄鍚�")
+ private String applicantUserName;
+
+ @Schema(description = "鐢宠閮ㄩ棬缂栧彿", example = "120")
+ private Long applicantDeptId;
+
+ @Schema(description = "鏂藉伐鍗曚綅 / 鎵垮寘鍟�")
+ private String contractor;
+
+ @Schema(description = "浣滀笟浜哄憳")
+ private String workerNames;
+
+ @Schema(description = "鐩戞姢浜虹紪鍙�", example = "1")
+ private Long guardianUserId;
+
+ @Schema(description = "鐩戞姢浜哄鍚�")
+ private String guardianUserName;
+
+ @Schema(description = "鐩戞姢浜烘槸鍚﹀凡纭")
+ private Boolean guardianConfirm;
+
+ @Schema(description = "瀹夊叏鎺柦")
+ private String safetyMeasures;
+
+ @Schema(description = "瀹夊叏浜ゅ簳 / 妫�鏌ョ粨鏋�")
+ private String safetyCheckResult;
+
+ @Schema(description = "瀹℃壒浜虹紪鍙�", example = "1")
+ private Long approverUserId;
+
+ @Schema(description = "瀹℃壒浜哄鍚�")
+ private String approverUserName;
+
+ @Schema(description = "瀹℃壒鏃堕棿")
+ private LocalDateTime approveTime;
+
+ @Schema(description = "瀹℃壒鎰忚")
+ private String approveComment;
+
+ @Schema(description = "椹冲洖鍘熷洜")
+ private String rejectReason;
+
+ @Schema(description = "鐘舵��", example = "0")
+ private Integer status;
+
+ @Schema(description = "鏄惁宸茶秴杩囪鍒掔粨鏉熸椂闂翠粛鏈畬宸�", example = "false")
+ private Boolean overdue;
+
+ @Schema(description = "褰掓。鏃堕棿")
+ private LocalDateTime closeTime;
+
+ @Schema(description = "褰掓。浜虹紪鍙�", example = "1")
+ private Long closeUserId;
+
+ @Schema(description = "瀹屽伐 / 褰掓。璇存槑")
+ private String closeRemark;
+
+ @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/ticket/MesSafetyWorkTicketSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/ticket/MesSafetyWorkTicketSaveReqVO.java
new file mode 100644
index 0000000..c378180
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/ticket/MesSafetyWorkTicketSaveReqVO.java
@@ -0,0 +1,72 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.ticket;
+
+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.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 MesSafetyWorkTicketSaveReqVO {
+
+ @Schema(description = "缂栧彿", example = "1024")
+ private Long id;
+
+ @Schema(description = "浣滀笟绁ㄥ彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "ZY-2026-001")
+ @NotEmpty(message = "浣滀笟绁ㄥ彿涓嶈兘涓虹┖")
+ private String code;
+
+ @Schema(description = "浣滀笟绫诲瀷", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+ @NotNull(message = "浣滀笟绫诲瀷涓嶈兘涓虹┖")
+ private Integer ticketType;
+
+ @Schema(description = "浣滀笟绾у埆", example = "2")
+ private Integer ticketLevel;
+
+ @Schema(description = "鍏宠仈椋庨櫓鍗曞厓缂栧彿", example = "1")
+ private Long unitId;
+
+ @Schema(description = "鎵�灞炶溅闂寸紪鍙�", example = "7")
+ private Long workshopId;
+
+ @Schema(description = "浣滀笟鍦扮偣", example = "閫犵焊杞﹂棿涓滀晶绠¢亾")
+ private String workLocation;
+
+ @Schema(description = "浣滀笟鍐呭", example = "绠¢亾鐒婃帴")
+ private String workContent;
+
+ @Schema(description = "璁″垝寮�濮嬫椂闂�")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+ private LocalDateTime planStartTime;
+
+ @Schema(description = "璁″垝缁撴潫鏃堕棿")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+ private LocalDateTime planEndTime;
+
+ @Schema(description = "鐢宠閮ㄩ棬缂栧彿", example = "120")
+ private Long applicantDeptId;
+
+ @Schema(description = "鏂藉伐鍗曚綅 / 鎵垮寘鍟�", example = "XX 瀹夎鍏徃")
+ private String contractor;
+
+ @Schema(description = "浣滀笟浜哄憳锛堝涓敤閫楀彿鍒嗛殧锛�", example = "寮犱笁,鏉庡洓")
+ private String workerNames;
+
+ @Schema(description = "鐩戞姢浜虹紪鍙�", example = "1")
+ private Long guardianUserId;
+
+ @Schema(description = "瀹夊叏鎺柦", example = "1.娓呯悊鍔ㄧ伀鐐瑰懆杈瑰彲鐕冪墿锛�2.閰嶅鐏伀鍣�")
+ private String safetyMeasures;
+
+ @Schema(description = "瀹夊叏浜ゅ簳 / 妫�鏌ョ粨鏋�")
+ private String safetyCheckResult;
+
+ @Schema(description = "澶囨敞")
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/MesSafetyWorkTicketDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/MesSafetyWorkTicketDO.java
new file mode 100644
index 0000000..8875d46
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/MesSafetyWorkTicketDO.java
@@ -0,0 +1,188 @@
+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.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鐗圭浣滀笟绁ㄨ瘉 DO
+ *
+ * 鐘舵�佹祦杞細
+ * 0 寰呭鎵� --瀹℃壒閫氳繃--> 10 宸叉壒鍑� --瀹屽伐鐧昏--> 20 宸插畬宸� --褰掓。--> 30 宸插綊妗�
+ * 鈹�--瀹℃壒椹冲洖--> 90 宸查┏鍥�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("mes_safety_work_ticket")
+@KeySequence("mes_safety_work_ticket_seq")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class MesSafetyWorkTicketDO extends BaseDO {
+
+ /** 鐘舵�侊細寰呭鎵� */
+ public static final Integer STATUS_PENDING = 0;
+ /** 鐘舵�侊細宸叉壒鍑嗭紙鍙綔涓氾級 */
+ public static final Integer STATUS_APPROVED = 10;
+ /** 鐘舵�侊細宸插畬宸� */
+ public static final Integer STATUS_FINISHED = 20;
+ /** 鐘舵�侊細宸插綊妗� */
+ public static final Integer STATUS_ARCHIVED = 30;
+ /** 鐘舵�侊細宸查┏鍥� */
+ public static final Integer STATUS_REJECTED = 90;
+
+ @TableId
+ private Long id;
+
+ /**
+ * 浣滀笟绁ㄥ彿
+ */
+ private String code;
+
+ /**
+ * 浣滀笟绫诲瀷
+ *
+ * 瀛楀吀 mes_safety_ticket_type锛�1鍔ㄧ伀 2鍙楅檺绌洪棿 3楂樺 4鍚婅 5涓存椂鐢ㄧ數 6鏂矾 7鐩叉澘鎶藉牭 8璁惧妫�淇�
+ */
+ private Integer ticketType;
+
+ /**
+ * 浣滀笟绾у埆
+ *
+ * 瀛楀吀 mes_safety_ticket_level锛�1鐗规畩 2涓�绾� 3浜岀骇 4涓夌骇
+ */
+ private Integer ticketLevel;
+
+ /**
+ * 鍏宠仈椋庨櫓鍗曞厓缂栧彿
+ */
+ private Long unitId;
+
+ /**
+ * 鎵�灞炶溅闂寸紪鍙�
+ */
+ private Long workshopId;
+
+ /**
+ * 浣滀笟鍦扮偣
+ */
+ private String workLocation;
+
+ /**
+ * 浣滀笟鍐呭
+ */
+ private String workContent;
+
+ /**
+ * 璁″垝寮�濮嬫椂闂�
+ */
+ private LocalDateTime planStartTime;
+
+ /**
+ * 璁″垝缁撴潫鏃堕棿
+ */
+ private LocalDateTime planEndTime;
+
+ /**
+ * 瀹為檯寮�濮嬫椂闂�
+ */
+ private LocalDateTime actualStartTime;
+
+ /**
+ * 瀹為檯缁撴潫鏃堕棿
+ */
+ private LocalDateTime actualEndTime;
+
+ /**
+ * 鐢宠浜虹紪鍙�
+ */
+ private Long applicantUserId;
+
+ /**
+ * 鐢宠閮ㄩ棬缂栧彿
+ */
+ private Long applicantDeptId;
+
+ /**
+ * 鏂藉伐鍗曚綅 / 鎵垮寘鍟�
+ */
+ private String contractor;
+
+ /**
+ * 浣滀笟浜哄憳锛堝涓敤閫楀彿鍒嗛殧锛�
+ */
+ private String workerNames;
+
+ /**
+ * 鐩戞姢浜虹紪鍙�
+ */
+ private Long guardianUserId;
+
+ /**
+ * 鐩戞姢浜烘槸鍚﹀凡纭
+ */
+ private Boolean guardianConfirm;
+
+ /**
+ * 瀹夊叏鎺柦
+ */
+ private String safetyMeasures;
+
+ /**
+ * 瀹夊叏浜ゅ簳 / 妫�鏌ョ粨鏋�
+ */
+ private String safetyCheckResult;
+
+ /**
+ * 瀹℃壒浜虹紪鍙�
+ */
+ private Long approverUserId;
+
+ /**
+ * 瀹℃壒鏃堕棿
+ */
+ private LocalDateTime approveTime;
+
+ /**
+ * 瀹℃壒鎰忚
+ */
+ private String approveComment;
+
+ /**
+ * 椹冲洖鍘熷洜
+ */
+ private String rejectReason;
+
+ /**
+ * 鐘舵�侊細0寰呭鎵� 10宸叉壒鍑� 20宸插畬宸� 30宸插綊妗� 90宸查┏鍥�
+ */
+ private Integer status;
+
+ /**
+ * 褰掓。鏃堕棿
+ */
+ private LocalDateTime closeTime;
+
+ /**
+ * 褰掓。浜虹紪鍙�
+ */
+ private Long closeUserId;
+
+ /**
+ * 瀹屽伐 / 褰掓。璇存槑
+ */
+ private String closeRemark;
+
+ /**
+ * 澶囨敞
+ */
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/MesSafetyWorkTicketMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/MesSafetyWorkTicketMapper.java
new file mode 100644
index 0000000..d59bc22
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/MesSafetyWorkTicketMapper.java
@@ -0,0 +1,64 @@
+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.ticket.MesSafetyWorkTicketPageReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.MesSafetyWorkTicketDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鐗圭浣滀笟绁ㄨ瘉 Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface MesSafetyWorkTicketMapper extends BaseMapperX<MesSafetyWorkTicketDO> {
+
+ default PageResult<MesSafetyWorkTicketDO> selectPage(MesSafetyWorkTicketPageReqVO reqVO) {
+ return selectPage(reqVO, new LambdaQueryWrapperX<MesSafetyWorkTicketDO>()
+ .likeIfPresent(MesSafetyWorkTicketDO::getCode, reqVO.getCode())
+ .eqIfPresent(MesSafetyWorkTicketDO::getTicketType, reqVO.getTicketType())
+ .eqIfPresent(MesSafetyWorkTicketDO::getTicketLevel, reqVO.getTicketLevel())
+ .eqIfPresent(MesSafetyWorkTicketDO::getStatus, reqVO.getStatus())
+ .eqIfPresent(MesSafetyWorkTicketDO::getWorkshopId, reqVO.getWorkshopId())
+ .eqIfPresent(MesSafetyWorkTicketDO::getApplicantUserId, reqVO.getApplicantUserId())
+ .likeIfPresent(MesSafetyWorkTicketDO::getWorkLocation, reqVO.getWorkLocation())
+ .geIfPresent(MesSafetyWorkTicketDO::getPlanStartTime, reqVO.getPlanStartTimeStart())
+ .leIfPresent(MesSafetyWorkTicketDO::getPlanStartTime, reqVO.getPlanStartTimeEnd())
+ .orderByDesc(MesSafetyWorkTicketDO::getId));
+ }
+
+ default MesSafetyWorkTicketDO selectByCode(String code) {
+ return selectOne(MesSafetyWorkTicketDO::getCode, code);
+ }
+
+ /**
+ * 鏌ヨ褰撳墠澶勪簬銆屽凡鎵瑰噯銆嶄絾宸茶秴杩囪鍒掔粨鏉熸椂闂寸殑浣滀笟绁紙鐢ㄤ簬瓒呮湡鏈畬宸ユ彁閱掞級
+ */
+ default List<MesSafetyWorkTicketDO> selectApprovedOverdueList(LocalDateTime now) {
+ return selectList(new LambdaQueryWrapperX<MesSafetyWorkTicketDO>()
+ .eq(MesSafetyWorkTicketDO::getStatus, MesSafetyWorkTicketDO.STATUS_APPROVED)
+ .lt(MesSafetyWorkTicketDO::getPlanEndTime, now)
+ .orderByAsc(MesSafetyWorkTicketDO::getPlanEndTime));
+ }
+
+ default Long selectCountByStatus(Integer status) {
+ return selectCount(new LambdaQueryWrapperX<MesSafetyWorkTicketDO>()
+ .eq(MesSafetyWorkTicketDO::getStatus, status));
+ }
+
+ default Long selectCountByUnitId(Long unitId) {
+ return selectCount(new LambdaQueryWrapperX<MesSafetyWorkTicketDO>()
+ .eq(MesSafetyWorkTicketDO::getUnitId, unitId));
+ }
+
+ default List<MesSafetyWorkTicketDO> selectAllList() {
+ return selectList(new LambdaQueryWrapperX<MesSafetyWorkTicketDO>()
+ .orderByDesc(MesSafetyWorkTicketDO::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 1bbc093..dc59111 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
@@ -130,4 +130,9 @@
String MES_SAFETY_HAZARD_SOURCE = "mes_safety_hazard_source"; // 闅愭偅鏉ユ簮
String MES_SAFETY_HAZARD_LEVEL = "mes_safety_hazard_level"; // 闅愭偅绛夌骇锛�1涓�鑸� 2閲嶅ぇ锛�
String MES_SAFETY_HAZARD_STATUS = "mes_safety_hazard_status"; // 闅愭偅鐘舵��
+
+ // 鐗圭浣滀笟绁ㄨ瘉
+ 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"; // 浣滀笟绁ㄧ姸鎬�
}
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 265d7fe..4b6b7a7 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
@@ -861,4 +861,12 @@
ErrorCode MES_SAFETY_HAZARD_REJECT_REASON_REQUIRED = new ErrorCode(1_040_905_003, "楠屾敹涓嶉�氳繃鏃跺繀椤诲~鍐欓┏鍥炲師鍥�");
ErrorCode MES_SAFETY_HAZARD_HAS_REFERENCE = new ErrorCode(1_040_905_004, "璇ヨ褰曞凡琚殣鎮e紩鐢紝鏃犳硶鍒犻櫎");
+ // ========== MES 瀹夊叏鐢熶骇 - 鐗圭浣滀笟绁ㄨ瘉锛�1-040-906-000锛� ==========
+ ErrorCode MES_SAFETY_TICKET_NOT_EXISTS = new ErrorCode(1_040_906_000, "浣滀笟绁ㄤ笉瀛樺湪");
+ ErrorCode MES_SAFETY_TICKET_CODE_DUPLICATE = new ErrorCode(1_040_906_001, "浣滀笟绁ㄥ彿宸插瓨鍦�");
+ ErrorCode MES_SAFETY_TICKET_STATUS_INVALID = new ErrorCode(1_040_906_002, "褰撳墠浣滀笟绁ㄧ姸鎬佷笉鍏佽璇ユ搷浣�");
+ ErrorCode MES_SAFETY_TICKET_TIME_INVALID = new ErrorCode(1_040_906_003, "璁″垝缁撴潫鏃堕棿蹇呴』鏅氫簬璁″垝寮�濮嬫椂闂�");
+ 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, "璇ヨ褰曞凡琚綔涓氱エ寮曠敤锛屾棤娉曞垹闄�");
+
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/MesSafetyRiskUnitServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/MesSafetyRiskUnitServiceImpl.java
index 43a7231..9655fc4 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/MesSafetyRiskUnitServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/MesSafetyRiskUnitServiceImpl.java
@@ -8,6 +8,7 @@
import cn.iocoder.yudao.module.mes.dal.mysql.safety.MesSafetyHazardMapper;
import cn.iocoder.yudao.module.mes.dal.mysql.safety.MesSafetyRiskMapper;
import cn.iocoder.yudao.module.mes.dal.mysql.safety.MesSafetyRiskUnitMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.safety.MesSafetyWorkTicketMapper;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
@@ -39,6 +40,9 @@
@Resource
private MesSafetyHazardMapper hazardMapper;
+
+ @Resource
+ private MesSafetyWorkTicketMapper ticketMapper;
@Override
public PageResult<MesSafetyRiskUnitDO> getRiskUnitPage(MesSafetyRiskUnitPageReqVO pageReqVO) {
@@ -80,6 +84,11 @@
if (hazardCount != null && hazardCount > 0) {
throw exception(MES_SAFETY_HAZARD_HAS_REFERENCE);
}
+ // 宸茶浣滀笟绁ㄥ紩鐢ㄧ殑鍗曞厓涔熶笉鍏佽鍒犻櫎
+ Long ticketCount = ticketMapper.selectCountByUnitId(id);
+ if (ticketCount != null && ticketCount > 0) {
+ throw exception(MES_SAFETY_TICKET_HAS_REFERENCE);
+ }
riskUnitMapper.deleteById(id);
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/MesSafetyWorkTicketService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/MesSafetyWorkTicketService.java
new file mode 100644
index 0000000..8e8e583
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/MesSafetyWorkTicketService.java
@@ -0,0 +1,45 @@
+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.ticket.MesSafetyWorkTicketApproveReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.ticket.MesSafetyWorkTicketCloseReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.ticket.MesSafetyWorkTicketPageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.ticket.MesSafetyWorkTicketSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.MesSafetyWorkTicketDO;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鐗圭浣滀笟绁ㄨ瘉 Service 鎺ュ彛
+ *
+ * 鐘舵�佹祦杞細0寰呭鎵� 鈫� 10宸叉壒鍑� 鈫� 20宸插畬宸� 鈫� 30宸插綊妗o紱0 鈫� 90宸查┏鍥�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+public interface MesSafetyWorkTicketService {
+
+ PageResult<MesSafetyWorkTicketDO> getTicketPage(MesSafetyWorkTicketPageReqVO pageReqVO);
+
+ MesSafetyWorkTicketDO getTicket(Long id);
+
+ Long createTicket(MesSafetyWorkTicketSaveReqVO createReqVO);
+
+ void updateTicket(MesSafetyWorkTicketSaveReqVO updateReqVO);
+
+ void deleteTicket(Long id);
+
+ /**
+ * 瀹℃壒锛�0寰呭鎵� 鈫� 10宸叉壒鍑嗭紝鎴� 鈫� 90宸查┏鍥�
+ *
+ * @param userId 瀹℃壒浜虹紪鍙�
+ */
+ void approveTicket(Long userId, MesSafetyWorkTicketApproveReqVO reqVO);
+
+ /**
+ * 瀹屽伐鐧昏 / 褰掓。锛�10宸叉壒鍑� 鈫� 20宸插畬宸ワ紝20宸插畬宸� 鈫� 30宸插綊妗�
+ *
+ * @param userId 鎿嶄綔浜虹紪鍙�
+ */
+ void closeTicket(Long userId, MesSafetyWorkTicketCloseReqVO reqVO);
+
+ MesSafetyWorkTicketDO validateTicketExists(Long id);
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/MesSafetyWorkTicketServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/MesSafetyWorkTicketServiceImpl.java
new file mode 100644
index 0000000..4bb8814
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/MesSafetyWorkTicketServiceImpl.java
@@ -0,0 +1,188 @@
+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.ticket.MesSafetyWorkTicketApproveReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.ticket.MesSafetyWorkTicketCloseReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.ticket.MesSafetyWorkTicketPageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.ticket.MesSafetyWorkTicketSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.MesSafetyWorkTicketDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.safety.MesSafetyWorkTicketMapper;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import java.time.LocalDateTime;
+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 MesSafetyWorkTicketServiceImpl implements MesSafetyWorkTicketService {
+
+ @Resource
+ private MesSafetyWorkTicketMapper ticketMapper;
+
+ @Override
+ public PageResult<MesSafetyWorkTicketDO> getTicketPage(MesSafetyWorkTicketPageReqVO pageReqVO) {
+ return ticketMapper.selectPage(pageReqVO);
+ }
+
+ @Override
+ public MesSafetyWorkTicketDO getTicket(Long id) {
+ return ticketMapper.selectById(id);
+ }
+
+ @Override
+ public Long createTicket(MesSafetyWorkTicketSaveReqVO createReqVO) {
+ validateCodeUnique(null, createReqVO.getCode());
+ validateTimeRange(createReqVO.getPlanStartTime(), createReqVO.getPlanEndTime());
+ MesSafetyWorkTicketDO ticket = BeanUtils.toBean(createReqVO, MesSafetyWorkTicketDO.class);
+ // 鏂板缓鍗冲緟瀹℃壒
+ ticket.setStatus(MesSafetyWorkTicketDO.STATUS_PENDING);
+ ticket.setGuardianConfirm(false);
+ ticketMapper.insert(ticket);
+ return ticket.getId();
+ }
+
+ @Override
+ public void updateTicket(MesSafetyWorkTicketSaveReqVO updateReqVO) {
+ MesSafetyWorkTicketDO exists = validateTicketExists(updateReqVO.getId());
+ // 瀹℃壒閫氳繃鍚庝笉鍏佽鍐嶆敼浣滀笟淇℃伅锛岄渶浣滃簾閲嶅紑
+ if (!MesSafetyWorkTicketDO.STATUS_PENDING.equals(exists.getStatus())
+ && !MesSafetyWorkTicketDO.STATUS_REJECTED.equals(exists.getStatus())) {
+ throw exception(MES_SAFETY_TICKET_STATUS_INVALID);
+ }
+ validateCodeUnique(updateReqVO.getId(), updateReqVO.getCode());
+ validateTimeRange(updateReqVO.getPlanStartTime(), updateReqVO.getPlanEndTime());
+ MesSafetyWorkTicketDO updateObj = BeanUtils.toBean(updateReqVO, MesSafetyWorkTicketDO.class);
+ // 鐘舵�佷笌瀹℃壒/褰掓。淇℃伅涓嶈蛋姝ゆ帴鍙�
+ updateObj.setStatus(null);
+ updateObj.setApproverUserId(null);
+ updateObj.setApproveTime(null);
+ updateObj.setApproveComment(null);
+ updateObj.setRejectReason(null);
+ updateObj.setCloseTime(null);
+ updateObj.setCloseUserId(null);
+ updateObj.setCloseRemark(null);
+ updateObj.setActualStartTime(null);
+ updateObj.setActualEndTime(null);
+ // 閲嶆柊鎻愪氦鏃舵竻绌洪┏鍥炲師鍥�
+ if (MesSafetyWorkTicketDO.STATUS_REJECTED.equals(exists.getStatus())) {
+ updateObj.setStatus(MesSafetyWorkTicketDO.STATUS_PENDING);
+ updateObj.setRejectReason("");
+ }
+ ticketMapper.updateById(updateObj);
+ }
+
+ @Override
+ public void deleteTicket(Long id) {
+ MesSafetyWorkTicketDO exists = validateTicketExists(id);
+ // 宸叉壒鍑嗗強涔嬪悗鐨勪綔涓氱エ涓嶅厑璁稿垹闄わ紙闇�淇濈暀杩芥函璁板綍锛�
+ if (MesSafetyWorkTicketDO.STATUS_APPROVED.equals(exists.getStatus())
+ || MesSafetyWorkTicketDO.STATUS_FINISHED.equals(exists.getStatus())
+ || MesSafetyWorkTicketDO.STATUS_ARCHIVED.equals(exists.getStatus())) {
+ throw exception(MES_SAFETY_TICKET_STATUS_INVALID);
+ }
+ ticketMapper.deleteById(id);
+ }
+
+ @Override
+ public void approveTicket(Long userId, MesSafetyWorkTicketApproveReqVO reqVO) {
+ MesSafetyWorkTicketDO ticket = validateTicketExists(reqVO.getId());
+ if (!MesSafetyWorkTicketDO.STATUS_PENDING.equals(ticket.getStatus())) {
+ throw exception(MES_SAFETY_TICKET_STATUS_INVALID);
+ }
+ MesSafetyWorkTicketDO updateObj = new MesSafetyWorkTicketDO();
+ updateObj.setId(reqVO.getId());
+ updateObj.setApproverUserId(userId);
+ updateObj.setApproveTime(LocalDateTime.now());
+ updateObj.setApproveComment(reqVO.getApproveComment());
+ if (Boolean.TRUE.equals(reqVO.getPass())) {
+ updateObj.setStatus(MesSafetyWorkTicketDO.STATUS_APPROVED);
+ updateObj.setRejectReason("");
+ } else {
+ if (reqVO.getRejectReason() == null || reqVO.getRejectReason().trim().isEmpty()) {
+ throw exception(MES_SAFETY_TICKET_REJECT_REASON_REQUIRED);
+ }
+ updateObj.setStatus(MesSafetyWorkTicketDO.STATUS_REJECTED);
+ updateObj.setRejectReason(reqVO.getRejectReason());
+ }
+ ticketMapper.updateById(updateObj);
+ }
+
+ @Override
+ public void closeTicket(Long userId, MesSafetyWorkTicketCloseReqVO reqVO) {
+ MesSafetyWorkTicketDO ticket = validateTicketExists(reqVO.getId());
+ Integer status = ticket.getStatus();
+ // 宸叉壒鍑� 鈫� 瀹屽伐锛涘凡瀹屽伐 鈫� 褰掓。
+ boolean canFinish = MesSafetyWorkTicketDO.STATUS_APPROVED.equals(status);
+ boolean canArchive = MesSafetyWorkTicketDO.STATUS_FINISHED.equals(status);
+ if (!canFinish && !canArchive) {
+ throw exception(MES_SAFETY_TICKET_STATUS_INVALID);
+ }
+ MesSafetyWorkTicketDO updateObj = new MesSafetyWorkTicketDO();
+ updateObj.setId(reqVO.getId());
+ updateObj.setActualStartTime(reqVO.getActualStartTime());
+ updateObj.setActualEndTime(reqVO.getActualEndTime());
+ if (reqVO.getCloseRemark() != null) {
+ updateObj.setCloseRemark(reqVO.getCloseRemark());
+ }
+ if (canFinish) {
+ // 瀹屽伐鐧昏锛涜嫢鍚屾椂閫夋嫨褰掓。鍒欑洿鎺ヨ繘鍏ュ凡褰掓。
+ boolean archiveNow = Boolean.TRUE.equals(reqVO.getArchive());
+ updateObj.setStatus(archiveNow
+ ? MesSafetyWorkTicketDO.STATUS_ARCHIVED
+ : MesSafetyWorkTicketDO.STATUS_FINISHED);
+ if (archiveNow) {
+ updateObj.setCloseTime(LocalDateTime.now());
+ updateObj.setCloseUserId(userId);
+ }
+ } else {
+ // 宸插畬宸� 鈫� 褰掓。
+ updateObj.setStatus(MesSafetyWorkTicketDO.STATUS_ARCHIVED);
+ updateObj.setCloseTime(LocalDateTime.now());
+ updateObj.setCloseUserId(userId);
+ }
+ ticketMapper.updateById(updateObj);
+ }
+
+ @Override
+ public MesSafetyWorkTicketDO validateTicketExists(Long id) {
+ if (id == null) {
+ throw exception(MES_SAFETY_TICKET_NOT_EXISTS);
+ }
+ MesSafetyWorkTicketDO ticket = ticketMapper.selectById(id);
+ if (ticket == null) {
+ throw exception(MES_SAFETY_TICKET_NOT_EXISTS);
+ }
+ return ticket;
+ }
+
+ /**
+ * 鏍¢獙璁″垝鏃堕棿鍖洪棿鍚堟硶
+ */
+ private void validateTimeRange(LocalDateTime start, LocalDateTime end) {
+ if (start != null && end != null && !end.isAfter(start)) {
+ throw exception(MES_SAFETY_TICKET_TIME_INVALID);
+ }
+ }
+
+ private void validateCodeUnique(Long id, String code) {
+ MesSafetyWorkTicketDO exists = ticketMapper.selectByCode(code);
+ if (exists == null) {
+ return;
+ }
+ if (id == null || !Objects.equals(exists.getId(), id)) {
+ throw exception(MES_SAFETY_TICKET_CODE_DUPLICATE);
+ }
+ }
+
+}
--
Gitblit v1.9.3