From 1799f4a7988d52feb6230b6b140ef6ce1543b0f4 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期一, 11 九月 2023 14:19:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerLedgerController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerLedgerController.java b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerLedgerController.java
index 7c86821..4cf1c0b 100644
--- a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerLedgerController.java
+++ b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerLedgerController.java
@@ -165,7 +165,8 @@
} else if ("3".equals(hcp.getRiskType())) {
export.setRiskPointType("工艺节点清单");
}
-
+ // 隐患责任部门
+ export.setDangerDep(hcp.getRectifyDeptName()); // todo
//隐患名称
export.setDangerName(hcp.getDangerName());
@@ -190,8 +191,7 @@
} else {
export.setDangerSources("");
}
- // 隐患责任部门
- export.setDangerDep(hcp.getRectifyDeptName()); // todo
+
//整改状态
if (!StringUtils.isEmpty(hcp.getStage())) {
--
Gitblit v1.9.2