From ecc3c31d799e6c66d50e3c813e31e4aa5306474a Mon Sep 17 00:00:00 2001 From: caihaohan Date: Mon, 6 Nov 2023 14:15:11 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/laws/common/constant/FieldCommon.java | 1 + .../com/jero/modules/laws/common/util/ImportUtil.java | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java index 1397dfe9..2f8510f2 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java @@ -149,5 +149,6 @@ public class FieldCommon { public static final String FILE_DRAFT_FOR_COMMENT = "draft_for_comment"; // 草案 public static final String FILE_DRAFT = "draft"; + public static final String DEL_FLAG = "del_flag"; } 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 e310a851..de93a997 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 @@ -119,6 +119,12 @@ public class ImportUtil { } try { 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) { log.error("第" + row + "列" + tag.getDbFieldTxt() + "填写错误 "); errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("填写错误 "); @@ -153,6 +159,7 @@ public class ImportUtil { String domesticStandardNumber = standardNumber + " " + standardClass + "-" + yearNumber; QueryWrapper 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) { @@ -172,6 +179,7 @@ public class ImportUtil { String foreignStandardNumber = standardNumber + " " + standardClass + "-" + yearNumber; QueryWrapper domesticStandardQueryWrapper = new QueryWrapper<>(); domesticStandardQueryWrapper.eq(FieldCommon.STANDARD_NUMBER, foreignStandardNumber); + domesticStandardQueryWrapper.eq(FieldCommon.DEL_FLAG, YesOrNoEnum.NO.getValue()); LawsOverseasStandard lawsOverseasStandard = overseasStandardService.getOne(domesticStandardQueryWrapper); standardValidFlag = true; if (lawsOverseasStandard != null) {