QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 88352 外来标准法规文本库--导入--建议导入数据存在重复编号的能够提供行号标准号

Browse Source
This commit is contained in:
mzaxd
2024-08-09 20:13:21 +08:00
parent 9b795e79dc
commit b4cb901063
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java
+9 -6
View File
@@ -85,7 +85,7 @@ public class ImportUtil {
for (int i = 3; i < sheet.getPhysicalNumberOfRows(); i++) { for (int i = 3; i < sheet.getPhysicalNumberOfRows(); i++) {
int line = i + 1; int line = i + 1;
String standardNumber = ""; String standardNumber = "";
String standardClass = ""; String standardNumberTemp = "";
String yearNumber = ""; String yearNumber = "";
StringBuilder errMsg = new StringBuilder("第" + line + "行"); StringBuilder errMsg = new StringBuilder("第" + line + "行");
Map<String, Object> parameterMap = new HashMap<>(); Map<String, Object> parameterMap = new HashMap<>();
@@ -120,6 +120,8 @@ public class ImportUtil {
log.error("第" + row + "列" + tag.getDbFieldTxt() + "为必填 "); log.error("第" + row + "列" + tag.getDbFieldTxt() + "为必填 ");
errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("为必填 "); errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("为必填 ");
break; break;
} else {
standardNumberTemp = cell.toString().trim();
} }
} }
if (FieldCommon.YEAR_NUMBER.equals(tag.getDbFieldName())) { if (FieldCommon.YEAR_NUMBER.equals(tag.getDbFieldName())) {
@@ -135,15 +137,16 @@ public class ImportUtil {
} }
} }
// 校验标准号 // 校验标准号
if (StrUtil.isNotBlank(standardNumber) && StrUtil.isNotBlank(yearNumber)) { if (StrUtil.isNotBlank(standardNumberTemp) && StrUtil.isNotBlank(yearNumber)) {
if ((TableNameEnum.DOMESTIC_REGULATIONS.getValue().equals(tag.getIsModel()))) { if ((TableNameEnum.DOMESTIC_REGULATIONS.getValue().equals(tag.getIsModel()))) {
if (!yearNumber.equals("BLANK") && !this.yearValid(yearNumber)) { if (!yearNumber.equals("BLANK") && !this.yearValid(yearNumber)) {
log.error("第" + row + "列" + tag.getDbFieldTxt() + "填写错误 "); log.error("第" + row + "列" + tag.getDbFieldTxt() + "填写错误 ");
errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("填写错误 "); errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("填写错误 ");
} else { } else {
String domesticStandardNumber = standardNumber; String domesticStandardNumber = standardNumberTemp;
if (!yearNumber.equals("BLANK")) { if (!yearNumber.equals("BLANK")) {
domesticStandardNumber = standardNumber + "——" + yearNumber; domesticStandardNumber = standardNumberTemp + "—" + yearNumber;
parameterMap.put(FieldCommon.STANDARD_NUMBER, domesticStandardNumber);
} }
QueryWrapper<LawsDomesticStandard> domesticStandardQueryWrapper = new QueryWrapper<>(); QueryWrapper<LawsDomesticStandard> domesticStandardQueryWrapper = new QueryWrapper<>();
domesticStandardQueryWrapper.eq(FieldCommon.STANDARD_NUMBER, domesticStandardNumber); domesticStandardQueryWrapper.eq(FieldCommon.STANDARD_NUMBER, domesticStandardNumber);
@@ -152,7 +155,7 @@ public class ImportUtil {
standardValidFlag = true; standardValidFlag = true;
if (lawsDomesticStandard != null) { if (lawsDomesticStandard != null) {
log.error("第" + line + "行的标准编号已存在 "); log.error("第" + line + "行的标准编号已存在 ");
errMsg.append("第").append(line).append("行的标准编号已存在"); errMsg.append("拼接后的标准编号已存在于库中");
break; break;
} }
// 判断是否有重复数据 // 判断是否有重复数据
@@ -165,7 +168,7 @@ public class ImportUtil {
} }
} }
// 将转好的值加入Map // 将转好的值加入Map
parameterMap.put(FieldCommon.STANDARD_NUMBER_TEMP, standardNumber); parameterMap.put(FieldCommon.STANDARD_NUMBER_TEMP, standardNumberTemp);
parameterMap.put(FieldCommon.YEAR_NUMBER, yearNumber); parameterMap.put(FieldCommon.YEAR_NUMBER, yearNumber);
} }
} }