diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java b/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java index 85b74fd7..78078d8b 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java @@ -85,7 +85,7 @@ public class ImportUtil { for (int i = 3; i < sheet.getPhysicalNumberOfRows(); i++) { int line = i + 1; String standardNumber = ""; - String standardClass = ""; + String standardNumberTemp = ""; String yearNumber = ""; StringBuilder errMsg = new StringBuilder("第" + line + "行"); Map parameterMap = new HashMap<>(); @@ -120,6 +120,8 @@ public class ImportUtil { log.error("第" + row + "列" + tag.getDbFieldTxt() + "为必填 "); errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("为必填 "); break; + } else { + standardNumberTemp = cell.toString().trim(); } } 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 (!yearNumber.equals("BLANK") && !this.yearValid(yearNumber)) { log.error("第" + row + "列" + tag.getDbFieldTxt() + "填写错误 "); errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("填写错误 "); } else { - String domesticStandardNumber = standardNumber; + String domesticStandardNumber = standardNumberTemp; if (!yearNumber.equals("BLANK")) { - domesticStandardNumber = standardNumber + "——" + yearNumber; + domesticStandardNumber = standardNumberTemp + "—" + yearNumber; + parameterMap.put(FieldCommon.STANDARD_NUMBER, domesticStandardNumber); } QueryWrapper domesticStandardQueryWrapper = new QueryWrapper<>(); domesticStandardQueryWrapper.eq(FieldCommon.STANDARD_NUMBER, domesticStandardNumber); @@ -152,7 +155,7 @@ public class ImportUtil { standardValidFlag = true; if (lawsDomesticStandard != null) { log.error("第" + line + "行的标准编号已存在 "); - errMsg.append("第").append(line).append("行的标准编号已存在"); + errMsg.append("拼接后的标准编号已存在于库中"); break; } // 判断是否有重复数据 @@ -165,7 +168,7 @@ public class ImportUtil { } } // 将转好的值加入Map - parameterMap.put(FieldCommon.STANDARD_NUMBER_TEMP, standardNumber); + parameterMap.put(FieldCommon.STANDARD_NUMBER_TEMP, standardNumberTemp); parameterMap.put(FieldCommon.YEAR_NUMBER, yearNumber); } }