From 7e8edd4b59fb22146b90d01ca38f75148f3fd774 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 20 四月 2026 17:57:18 +0800
Subject: [PATCH] feat(bom): 添加BOM管理功能模块,工序 管理,基础 - 新增CustomerPrivatePoolMapper.xml实现客户私池映射 - 添加SysLoginController支持登录验证和用户信息获取 - 创建TechnologyBomController提供BOM的增删改查接口 - 定义TechnologyBomDto数据传输对象 - 实现TechnologyBomMapper和相关XML映射文件 - 开发TechnologyBomService业务逻辑层 - 添加TechnologyBomStructure结构管理功能 - 集成Excel导入导出BOM数据功能 - 实现BOM结构树形展示和维护功能

---
 src/main/java/com/ruoyi/safe/service/impl/SafeHiddenServiceImpl.java |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/ruoyi/safe/service/impl/SafeHiddenServiceImpl.java b/src/main/java/com/ruoyi/safe/service/impl/SafeHiddenServiceImpl.java
index 993556e..460c1d3 100644
--- a/src/main/java/com/ruoyi/safe/service/impl/SafeHiddenServiceImpl.java
+++ b/src/main/java/com/ruoyi/safe/service/impl/SafeHiddenServiceImpl.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.project.system.domain.SysNotice;
 import com.ruoyi.project.system.mapper.SysNoticeMapper;
+import com.ruoyi.project.system.service.ISysDictDataService;
 import com.ruoyi.project.system.service.ISysNoticeService;
 import com.ruoyi.project.system.service.impl.SysNoticeServiceImpl;
 import com.ruoyi.safe.dto.SafeHiddenDto;
@@ -38,6 +39,9 @@
     @Autowired
     private ISysNoticeService sysNoticeService;
 
+    @Autowired
+    private ISysDictDataService sysDictDataService;
+
 
     @Override
     public IPage<SafeHiddenDto> pageSafeHidden(Page page, SafeHiddenDto safeHiddenDto) {
@@ -47,19 +51,21 @@
     @Override
     public int add(SafeHidden safeHidden) {
         safeHiddenMapper.insert(safeHidden);
-        String datePrefix = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+        String datePrefix = LocalDate.now().format(DateTimeFormatter.ofPattern("yyMMdd"));
         String no = "YH" + String.format("%s%03d", datePrefix, safeHidden.getId());
         safeHidden.setHiddenCode(no);
         safeHiddenMapper.updateById(safeHidden);
+        //鑾峰彇闅愭偅绫诲瀷鐨勫瓧鍏�
+        String type = sysDictDataService.selectDictLabel("hidden_danger_type", safeHidden.getType());
         //娑堟伅閫氱煡
         sysNoticeService.simpleNoticeByUser("闅愭偅鎺掓煡涓婃姤鏁存敼",
-                "闅愭偅绫诲瀷锛�"+safeHidden.getType()+"\n"+
-                        "闅愭偅椋庨櫓绛夌骇锛�"+safeHidden.getRiskLevel()+"\n"+
-                        "闅愭偅鍏蜂綋浣嶇疆锛�"+safeHidden.getLocation()+"\n"+
-                        "闅愭偅鎻忚堪锛�"+safeHidden.getHiddenDesc()+"\n"+
+                "闅愭偅绫诲瀷锛�"+type+"\t"+
+                        "闅愭偅椋庨櫓绛夌骇锛�"+safeHidden.getRiskLevel()+"\t"+
+                        "闅愭偅鍏蜂綋浣嶇疆锛�"+safeHidden.getLocation()+"\t"+
+                        "闅愭偅鎻忚堪锛�"+safeHidden.getHiddenDesc()+"\t"+
                         "鏁存敼瀹屾垚鏈熼檺(鏃ユ湡)锛�"+safeHidden.getRectifyTime(),
                 Arrays.asList(Long.valueOf(safeHidden.getRectifyUserId())),
-                "/collaborativeApproval/approvalProcess?id=" + safeHidden.getId());
+                "/safeProduction/dangerInvestigation?id=" + safeHidden.getId());
         return 0;
     }
 

--
Gitblit v1.9.3