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

fix: 78200

Browse Source 
企标--导入--标签管理新增的字段没有格式校验
This commit is contained in:
mzaxd
2023-11-07 11:26:03 +08:00
parent 44f6fd2d62
commit 8b9647d257
1 changed files with 17 additions and 1 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
+17 -1
View File
@@ -154,6 +154,9 @@ public class ImportUtil {
if (!this.dictValid("standard_type", standardClass)) { if (!this.dictValid("standard_type", standardClass)) {
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("填写错误 ");
} else if (!this.yearValid(yearNumber)) {
log.error("第" + row + "列" + tag.getDbFieldTxt() + "填写错误 ");
errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("填写错误 ");
} else { } else {
String domesticStandardNumber = standardNumber + " " + standardClass + "-" + yearNumber; String domesticStandardNumber = standardNumber + " " + standardClass + "-" + yearNumber;
QueryWrapper<LawsDomesticStandard> domesticStandardQueryWrapper = new QueryWrapper<>(); QueryWrapper<LawsDomesticStandard> domesticStandardQueryWrapper = new QueryWrapper<>();
@@ -379,7 +382,15 @@ public class ImportUtil {
} }
// 多选标准弹框 // 多选标准弹框
if (FieldShowTypeEnum.MULTI_STANDARD_DIALOG.getValue().equals(tag.getFieldShowType())) { 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() + "填写错误 "); log.error("第" + row + "列" + tag.getDbFieldTxt() + "填写错误 ");
errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("填写错误 "); 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<String, File> fileMap) { private String convertFileIds(String cellValue, Map<String, File> fileMap) {
String[] pathList = cellValue.split(","); String[] pathList = cellValue.split(",");
StringBuilder fileIds = new StringBuilder(); StringBuilder fileIds = new StringBuilder();