From 48916121661ecac6836f528b2ff00042914b13ec Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期四, 25 四月 2024 10:41:19 +0800
Subject: [PATCH] 保留备注字段（不使用），调整错误返回信息
---
src/main/java/com/ruoyi/project/tr/riskList/domain/ImportDataRespBO.java | 3 +++
src/main/java/com/ruoyi/project/tr/riskList/controller/BaseRiskController.java | 6 +++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/tr/riskList/controller/BaseRiskController.java b/src/main/java/com/ruoyi/project/tr/riskList/controller/BaseRiskController.java
index 375e4d9..2d8c061 100644
--- a/src/main/java/com/ruoyi/project/tr/riskList/controller/BaseRiskController.java
+++ b/src/main/java/com/ruoyi/project/tr/riskList/controller/BaseRiskController.java
@@ -204,13 +204,13 @@
judgeDataBlean = Boolean.FALSE;
errorMessage +=
StringUtils.isEmpty(errorMessage)?
- "第" + (i + 1) + "行,该[基础清单名称]不能为空" :"<br/> 第" + (i + 1) + "行,该[检查内容]不能为空";
+ "第" + (i + 1) + "行,该[基础清单名称]不能为空" :"<br/> 第" + (i + 1) + "行,该[基础清单名称]不能为空";
}
if (StringUtil.isEmpty(importData.getCheckType())) {
judgeDataBlean = Boolean.FALSE;
errorMessage +=
StringUtils.isEmpty(errorMessage)?
- "第" + (i + 1) + "行,该[检查类别]不能为空" :"<br/> 第" + (i + 1) + "行,该[检查内容]不能为空";
+ "第" + (i + 1) + "行,该[检查类别]不能为空" :"<br/> 第" + (i + 1) + "行,该[检查类别]不能为空";
}
if (StringUtil.isEmpty(importData.getCheckContent())) {
judgeDataBlean = Boolean.FALSE;
@@ -222,7 +222,7 @@
judgeDataBlean = Boolean.FALSE;
errorMessage +=
StringUtils.isEmpty(errorMessage)?
- "第" + (i + 1) + "行,该[管控措施编号]不能为空" :"<br/> 第" + (i + 1) + "行,该[检查内容]不能为空";
+ "第" + (i + 1) + "行,该[管控措施编号]不能为空" :"<br/> 第" + (i + 1) + "行,该[管控措施编号]不能为空";
}
}
diff --git a/src/main/java/com/ruoyi/project/tr/riskList/domain/ImportDataRespBO.java b/src/main/java/com/ruoyi/project/tr/riskList/domain/ImportDataRespBO.java
index 1fa413e..8d1389e 100644
--- a/src/main/java/com/ruoyi/project/tr/riskList/domain/ImportDataRespBO.java
+++ b/src/main/java/com/ruoyi/project/tr/riskList/domain/ImportDataRespBO.java
@@ -17,6 +17,9 @@
@Excel(name = "基础清单")
private String riskListName;
+ @Excel(name = "备注")
+ private String note;
+
@Excel(name = "检查类别")
private String checkType;
--
Gitblit v1.9.2