ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 海外标准导入报错

Browse Source
This commit is contained in:
mzaxd
2023-11-06 14:22:28 +08:00
parent 093a1e19d8
commit ecc3c31d79
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java
+1
View File
@@ -149,5 +149,6 @@ public class FieldCommon {
public static final String FILE_DRAFT_FOR_COMMENT = "draft_for_comment"; public static final String FILE_DRAFT_FOR_COMMENT = "draft_for_comment";
// 草案 // 草案
public static final String FILE_DRAFT = "draft"; public static final String FILE_DRAFT = "draft";
public static final String DEL_FLAG = "del_flag";
} }
laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java
+8
View File
@@ -119,6 +119,12 @@ public class ImportUtil {
} }
try { try {
standardNumber = cell.toString().trim(); standardNumber = cell.toString().trim();
// 必须是数字
if (!standardNumber.matches("^[0-9]*$")) {
log.error("第" + row + "列" + tag.getDbFieldTxt() + "填写错误，标准号必须为数字 ");
errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("填写错误，标准号必须为数字 ");
break;
}
} catch (Exception e) { } catch (Exception e) {
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("填写错误 ");
@@ -153,6 +159,7 @@ public class ImportUtil {
String domesticStandardNumber = standardNumber + " " + standardClass + "-" + yearNumber; String domesticStandardNumber = standardNumber + " " + standardClass + "-" + yearNumber;
QueryWrapper<LawsDomesticStandard> domesticStandardQueryWrapper = new QueryWrapper<>(); QueryWrapper<LawsDomesticStandard> domesticStandardQueryWrapper = new QueryWrapper<>();
domesticStandardQueryWrapper.eq(FieldCommon.STANDARD_NUMBER, domesticStandardNumber); domesticStandardQueryWrapper.eq(FieldCommon.STANDARD_NUMBER, domesticStandardNumber);
domesticStandardQueryWrapper.eq(FieldCommon.DEL_FLAG, YesOrNoEnum.NO.getValue());
LawsDomesticStandard lawsDomesticStandard = lawsDomeStandardService.getOne(domesticStandardQueryWrapper); LawsDomesticStandard lawsDomesticStandard = lawsDomeStandardService.getOne(domesticStandardQueryWrapper);
standardValidFlag = true; standardValidFlag = true;
if (lawsDomesticStandard != null) { if (lawsDomesticStandard != null) {
@@ -172,6 +179,7 @@ public class ImportUtil {
String foreignStandardNumber = standardNumber + " " + standardClass + "-" + yearNumber; String foreignStandardNumber = standardNumber + " " + standardClass + "-" + yearNumber;
QueryWrapper<LawsOverseasStandard> domesticStandardQueryWrapper = new QueryWrapper<>(); QueryWrapper<LawsOverseasStandard> domesticStandardQueryWrapper = new QueryWrapper<>();
domesticStandardQueryWrapper.eq(FieldCommon.STANDARD_NUMBER, foreignStandardNumber); domesticStandardQueryWrapper.eq(FieldCommon.STANDARD_NUMBER, foreignStandardNumber);
domesticStandardQueryWrapper.eq(FieldCommon.DEL_FLAG, YesOrNoEnum.NO.getValue());
LawsOverseasStandard lawsOverseasStandard = overseasStandardService.getOne(domesticStandardQueryWrapper); LawsOverseasStandard lawsOverseasStandard = overseasStandardService.getOne(domesticStandardQueryWrapper);
standardValidFlag = true; standardValidFlag = true;
if (lawsOverseasStandard != null) { if (lawsOverseasStandard != null) {