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 41b2116a..d8d5b3be 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 @@ -154,6 +154,9 @@ public class ImportUtil { if (!this.dictValid("standard_type", standardClass)) { log.error("第" + row + "列" + tag.getDbFieldTxt() + "填写错误 "); errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("填写错误 "); + } else if (!this.yearValid(yearNumber)) { + log.error("第" + row + "列" + tag.getDbFieldTxt() + "填写错误 "); + errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("填写错误 "); } else { String domesticStandardNumber = standardNumber + " " + standardClass + "-" + yearNumber; QueryWrapper domesticStandardQueryWrapper = new QueryWrapper<>(); @@ -379,7 +382,15 @@ public class ImportUtil { } // 多选标准弹框 if (FieldShowTypeEnum.MULTI_STANDARD_DIALOG.getValue().equals(tag.getFieldShowType())) { - if (!this.multiStandardValid(cellValue, tag.getIsModel())) { + // 需求更改 不校验 +// if (!this.multiStandardValid(cellValue, tag.getIsModel())) { +// log.error("第" + row + "列" + tag.getDbFieldTxt() + "填写错误 "); +// errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("填写错误 "); +// } + } + // 单选时间 + if (FieldShowTypeEnum.YEAR_SELECT.getValue().equals(tag.getFieldShowType())) { + if (!this.yearValid(cellValue)) { log.error("第" + row + "列" + tag.getDbFieldTxt() + "填写错误 "); errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("填写错误 "); } @@ -454,6 +465,11 @@ public class ImportUtil { } } + private boolean yearValid(String cellValue) { + // 用正则表达式限制为四位数字 + return cellValue.matches("^[0-9]{4}$"); + } + private String convertFileIds(String cellValue, Map fileMap) { String[] pathList = cellValue.split(","); StringBuilder fileIds = new StringBuilder();