From 6678bdd59105458fbbba5fbb7cf6ce3614cc00b2 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 02 二月 2026 10:23:07 +0800
Subject: [PATCH] 危险作业审批导出接口404+隐患上报通知时，对应整改人通知消息中隐患类型展示信息有误
---
src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java | 2 +-
src/main/java/com/ruoyi/safe/service/impl/SafeHiddenServiceImpl.java | 14 ++++++++++----
src/main/java/com/ruoyi/collaborativeApproval/service/impl/MeetingServiceImpl.java | 4 ++--
src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java | 10 ++++++++++
4 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java b/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
index f44a3cd..7554ff4 100644
--- a/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
+++ b/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
@@ -182,4 +182,14 @@
ExcelUtil<ApproveProcess> util = new ExcelUtil<ApproveProcess>(ApproveProcess.class);
util.exportExcel(response, accountExpenses, "鍗忓悓瀹℃壒瀵煎嚭");
}
+
+ @ApiOperation(value = "鍗遍櫓浣滀笟瀹℃壒瀵煎嚭")
+ @PostMapping("/exportEight")
+ public void exportEight(HttpServletResponse response) {
+ List<ApproveProcess> accountExpenses = approveProcessService.list(new LambdaQueryWrapper<ApproveProcess>()
+ .eq(ApproveProcess::getApproveDelete, 0)
+ .eq(ApproveProcess::getApproveType, 8));
+ ExcelUtil<ApproveProcess> util = new ExcelUtil<ApproveProcess>(ApproveProcess.class);
+ util.exportExcel(response, accountExpenses, "鍗遍櫓浣滀笟瀹℃壒瀵煎嚭");
+ }
}
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java
index 9d2cb6f..bcfc20d 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java
@@ -43,7 +43,7 @@
sealApplicationManagementService.save(sealApplicationManagement);
//娑堟伅閫氱煡
sysNoticeService.simpleNoticeByUser("鐢ㄥ嵃瀹℃壒",
- "鐢宠缂栧彿锛�"+sealApplicationManagement.getApplicationNum()+"\n"
+ "鐢宠缂栧彿锛�"+sealApplicationManagement.getApplicationNum()+"\t"
+"鐢宠鏍囬锛�"+sealApplicationManagement.getTitle(),
Arrays.asList(sealApplicationManagement.getApproveUserId()),
"/collaborativeApproval/sealManagement?applicationNum="+sealApplicationManagement.getApplicationNum());
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/service/impl/MeetingServiceImpl.java b/src/main/java/com/ruoyi/collaborativeApproval/service/impl/MeetingServiceImpl.java
index 9fa232a..8bf7123 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/service/impl/MeetingServiceImpl.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/service/impl/MeetingServiceImpl.java
@@ -182,8 +182,8 @@
if (!userIds.isEmpty()) {
sysNoticeService.simpleNoticeByUser(
"浼氳閫氱煡",
- "浼氳涓婚锛�" + application.getTitle() + "\n" +
- "浼氳鏃堕棿锛�" + application.getStartTime() + "-" + application.getEndTime() + "\n" +
+ "浼氳涓婚锛�" + application.getTitle() + "\t" +
+ "浼氳鏃堕棿锛�" + application.getStartTime() + "-" + application.getEndTime() + "\t" +
"鍙戣捣浜猴細" + application.getApplicant(),
userIds,
""
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 6f928bc..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) {
@@ -51,12 +55,14 @@
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())),
"/safeProduction/dangerInvestigation?id=" + safeHidden.getId());
--
Gitblit v1.9.3