From 520b28eeabbc21b61218b56785439691accd8d17 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Thu, 7 Dec 2023 10:26:58 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20UAT=E5=8F=98=E6=9B=B4=20=E6=A0=87?= =?UTF-8?q?=E5=87=86=E7=8A=B6=E6=80=81=E4=B8=BA=E8=B5=B7=E8=8D=89=E3=80=81?= =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81=E3=80=81=E6=8A=A5=E6=89=B9?= =?UTF-8?q?=E7=AD=89=E7=8A=B6=E6=80=81=E6=97=B6=E5=8F=91=E5=B8=83=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E3=80=81=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F=E4=B8=8D?= =?UTF-8?q?=E5=BA=94=E6=98=AF=E5=BF=85=E5=A1=AB=E9=A1=B9=EF=BC=88=E5=9B=BD?= =?UTF-8?q?=E6=A0=87=E5=A4=96=E8=A1=A8=E5=AF=BC=E5=85=A5=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../laws/common/constant/FieldCommon.java | 4 +++ .../modules/laws/common/util/ImportUtil.java | 27 ++++++++++++++++--- 2 files changed, 27 insertions(+), 4 deletions(-) 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 af837d5e..0c77ede1 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 @@ -178,7 +178,11 @@ public class FieldCommon { public static final String DEL_FLAG = "del_flag"; public static final String TRY_FLAG = "try_flag"; public static final String RELEASE_DATE = "release_date"; + public static final String IMPLEMENTATION_DATE = "implementation_date"; public static final String TRIAL_PERIOD = "trial_period"; // 关联文件 public static final String ASSOCIATED_FILE = "associated_file"; + + public static final String STANDARD_STATE = "standard_state"; + } 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 5494711b..93e973f5 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 @@ -97,6 +97,8 @@ public class ImportUtil { Date implementationDate = null; String implementationDateRow = ""; StringBuilder errMsg = new StringBuilder("第" + line + "行"); + boolean isGbFbNeedValidDate = false; + List doNotValidDateStandardStateList = Arrays.asList("起草", "征求意见", "报批"); Map parameterMap = new HashMap<>(); boolean standardValidFlag = false; // 跳过空行 @@ -236,10 +238,17 @@ public class ImportUtil { // 必填验证 if (YesOrNoEnum.YES.getValue().equals(tag.getFieldMustInput())) { - if (!this.mustInputValid(cell)) { - log.error("第" + row + "列" + tag.getDbFieldTxt() + "为必填 "); - errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("为必填 "); - continue; + // 国内标准 标准状态为起草 征求意见 报批 状态的发布日期实施日期不是必填项 + if (!((TableNameEnum.DOMESTIC_REGULATIONS.getValue().equals(tag.getIsModel()) || + TableNameEnum.FOREIGN_REGULATIONS.getValue().equals(tag.getIsModel())) && + !isGbFbNeedValidDate && + (FieldCommon.RELEASE_DATE.equals(tag.getDbFieldName()) || + FieldCommon.IMPLEMENTATION_DATE.equals(tag.getDbFieldName())))) { + if (!this.mustInputValid(cell)) { + log.error("第" + row + "列" + tag.getDbFieldTxt() + "为必填 "); + errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("为必填 "); + continue; + } } } // 获取当前单元格内容 @@ -309,6 +318,7 @@ public class ImportUtil { errMsg.append("第").append(row).append("列输入的").append(tag.getDbFieldTxt()).append("超过50字 "); } } + if (FieldShowTypeEnum.MULTI_TEXT.getValue().equals(tag.getFieldShowType())) { if (cellValue.length() > 500) { log.error("第" + row + "列字段" + tag.getDbFieldTxt() + "超过500字 "); @@ -322,6 +332,15 @@ public class ImportUtil { log.error("第" + row + "列" + tag.getDbFieldTxt() + "填写错误 "); errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("填写错误 "); } else { + // 如果是国标 + if (TableNameEnum.DOMESTIC_REGULATIONS.getValue().equals(tag.getIsModel()) || + TableNameEnum.FOREIGN_REGULATIONS.getValue().equals(tag.getIsModel())) { + // 标准状态 + if (FieldCommon.STANDARD_STATE.equals(tag.getDbFieldName())) { + // 设置是否需要校验发布日期 实施日期 + isGbFbNeedValidDate = !doNotValidDateStandardStateList.contains(cellValue); + } + } // 转为value cellValue = this.convertDictValue(tag.getDictField(), cellValue); }