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

fix: 88604 外来标准法规文本库--导入极限值失败

Browse Source 
(cherry picked from commit b545bf0215)
This commit is contained in:
mzaxd
2024-08-16 18:59:38 +08:00
parent 6b06363227
commit 56486d9d84
1 changed files with 22 additions and 26 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
+22 -26
View File
@@ -135,32 +135,27 @@ public class ImportUtil {
// 校验标准号
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("填写错误 ");
String domesticStandardNumber = standardNumberTemp;
if (!yearNumber.equals("BLANK")) {
domesticStandardNumber = standardNumberTemp + "—" + yearNumber;
parameterMap.put(FieldCommon.STANDARD_NUMBER, domesticStandardNumber);
}
QueryWrapper<LawsDomesticStandard> domesticStandardQueryWrapper = new QueryWrapper<>();
domesticStandardQueryWrapper.eq(FieldCommon.STANDARD_NUMBER, domesticStandardNumber);
domesticStandardQueryWrapper.eq(FieldCommon.DEL_FLAG, YesOrNoEnum.NO.getValue());
LawsDomesticStandard lawsDomesticStandard = lawsDomeStandardService.getOne(domesticStandardQueryWrapper);
standardValidFlag = true;
if (lawsDomesticStandard != null) {
log.error("第" + line + "行的标准编号已存在 ");
errMsg.append("拼接后的标准编号已存在于库中");
break;
}
// 判断是否有重复数据
if (keyMap.containsKey(domesticStandardNumber)) {
errMsgList.add("第" + keyMap.get(domesticStandardNumber) + "行'标准编号'与第" + line + "行数据重复。");
} else {
String domesticStandardNumber = standardNumberTemp;
if (!yearNumber.equals("BLANK")) {
domesticStandardNumber = standardNumberTemp + "—" + yearNumber;
parameterMap.put(FieldCommon.STANDARD_NUMBER, domesticStandardNumber);
}
QueryWrapper<LawsDomesticStandard> domesticStandardQueryWrapper = new QueryWrapper<>();
domesticStandardQueryWrapper.eq(FieldCommon.STANDARD_NUMBER, domesticStandardNumber);
domesticStandardQueryWrapper.eq(FieldCommon.DEL_FLAG, YesOrNoEnum.NO.getValue());
LawsDomesticStandard lawsDomesticStandard = lawsDomeStandardService.getOne(domesticStandardQueryWrapper);
standardValidFlag = true;
if (lawsDomesticStandard != null) {
log.error("第" + line + "行的标准编号已存在 ");
errMsg.append("拼接后的标准编号已存在于库中");
break;
}
// 判断是否有重复数据
if (keyMap.containsKey(domesticStandardNumber)) {
errMsgList.add("第" + keyMap.get(domesticStandardNumber) + "行'标准编号'与第" + line + "行数据重复。");
} else {
// 5. 如果不存在，则将 GradeName 和其行号添加到 HashMap 中
keyMap.put(domesticStandardNumber, line);
}
// 5. 如果不存在，则将 GradeName 和其行号添加到 HashMap 中
keyMap.put(domesticStandardNumber, line);
}
}
// 将转好的值加入Map
@@ -238,7 +233,8 @@ public class ImportUtil {
// 字段长度校验
if (FieldShowTypeEnum.TEXT_BOX.getValue().equals(tag.getFieldShowType()) &&
!FieldCommon.STANDARD_ENGLISH_NAME.equals(tag.getDbFieldName())) {
!FieldCommon.STANDARD_ENGLISH_NAME.equals(tag.getDbFieldName()) &&
!FieldCommon.STANDARD_NAME.equals(tag.getDbFieldName())) {
if (cellValue.length() > 50) {
log.error("第" + row + "列输入的" + tag.getDbFieldTxt() + "超过50字 ");
errMsg.append("第").append(row).append("列输入的").append(tag.getDbFieldTxt()).append("超过50字 ");