From cffed2a393ab56471dab54c73b6aac21496cb1f8 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期四, 09 五月 2024 14:23:01 +0800
Subject: [PATCH] 导入功能调整
---
src/main/java/com/ruoyi/project/tr/riskList/controller/BaseRiskController.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 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 2d8c061..e0e306d 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,25 +204,25 @@
judgeDataBlean = Boolean.FALSE;
errorMessage +=
StringUtils.isEmpty(errorMessage)?
- "第" + (i + 1) + "行,该[基础清单名称]不能为空" :"<br/> 第" + (i + 1) + "行,该[基础清单名称]不能为空";
+ "第" + (i + 2) + "行,该[基础清单名称]不能为空" :"<br/> 第" + (i + 1) + "行,该[基础清单名称]不能为空";
}
if (StringUtil.isEmpty(importData.getCheckType())) {
judgeDataBlean = Boolean.FALSE;
errorMessage +=
StringUtils.isEmpty(errorMessage)?
- "第" + (i + 1) + "行,该[检查类别]不能为空" :"<br/> 第" + (i + 1) + "行,该[检查类别]不能为空";
+ "第" + (i + 2) + "行,该[检查类别]不能为空" :"<br/> 第" + (i + 1) + "行,该[检查类别]不能为空";
}
if (StringUtil.isEmpty(importData.getCheckContent())) {
judgeDataBlean = Boolean.FALSE;
errorMessage +=
StringUtils.isEmpty(errorMessage)?
- "第" + (i + 1) + "行,该[检查内容]不能为空" :"<br/> 第" + (i + 1) + "行,该[检查内容]不能为空";
+ "第" + (i + 2) + "行,该[检查内容]不能为空" :"<br/> 第" + (i + 1) + "行,该[检查内容]不能为空";
}
if (StringUtil.isEmpty(importData.getControlMeasureCode())) {
judgeDataBlean = Boolean.FALSE;
errorMessage +=
StringUtils.isEmpty(errorMessage)?
- "第" + (i + 1) + "行,该[管控措施编号]不能为空" :"<br/> 第" + (i + 1) + "行,该[管控措施编号]不能为空";
+ "第" + (i + 2) + "行,该[管控措施编号]不能为空" :"<br/> 第" + (i + 1) + "行,该[管控措施编号]不能为空";
}
}
@@ -250,7 +250,7 @@
riskList.setCompanyId(getSysUser().getCompanyId());
int resultRiskList = riskListService.insertRiskList(riskList);
if (resultRiskList < 1){ //todo 需要检查是否收到标题行影响
- return AjaxResult.error("第" + i + "行基础清单插入错误，导入失败");
+ throw new RuntimeException("第" + (i+2) + "行基础清单插入错误，导入失败");
}
}else {
riskList.setRiskListId(infoByRiskListName.getRiskListId());
@@ -266,20 +266,20 @@
}
int resultBaseCheckPoint = baseCheckPointService.insertBaseCheckPoint(baseCheckPoint);
if (resultBaseCheckPoint < 1){
- return AjaxResult.error("第" + i + "行风险点插入错误，导入失败");
+ throw new RuntimeException("第" + (i+2) + "行风险点插入错误，导入失败");
}
//3.preventRiskCheckUnit
PreventRiskControlMeasure controlMeasure =
riskControlMeasureService.getPreventRiskControlMeasureByControlMeasureCode(importData.getControlMeasureCode());
if (ObjectUtils.isEmpty(controlMeasure)){
- return AjaxResult.error("第" + i + "行管控措施不存在，导入失败");
+ throw new RuntimeException("第" + (i+2) + "行管控措施不存在，导入失败");
}
preventPointAndMeasureParams.setRiskId(riskList.getRiskListId());
preventPointAndMeasureParams.setBaseCheckPointId(baseCheckPoint.getCheckPointId());
preventPointAndMeasureParams.setControlMeasureId(controlMeasure.getId());
int result = riskService.insertPointAndMeasure(preventPointAndMeasureParams);
- if (ObjectUtils.isEmpty(controlMeasure)){
- return AjaxResult.error("第" + i + "行风险点与管控措施关联关系保持出错，导入失败");
+ if (result < 1){
+ throw new RuntimeException("第" + (i+2) + "行风险点与管控措施关联关系保持出错，导入失败");
}
}
--
Gitblit v1.9.2