fix: 88041 企业标准-导入 监察内容填写错误时,提示信息需修改

This commit is contained in:
2024-08-02 16:36:15 +08:00
parent 999e1f1ea9
commit c9a1b705df
2 changed files with 4 additions and 2 deletions
@@ -1811,7 +1811,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
// 如果是企标的话手动添加稽查内容字段
if (TableNameEnum.ENTERPRISE_STANDARDS.getTableName().equals(tableName)) {
LawsTag inspectContentTag = new LawsTag();
inspectContentTag.setDbFieldTxt("稽查内容");
inspectContentTag.setDbFieldTxt("监察内容");
inspectContentTag.setFieldShowType(FieldShowTypeEnum.INSPECT_CONTENT_FILE_UPLOAD.getValue());
inspectContentTag.setDbFieldName(FieldCommon.CHECK_LIST);
inspectContentTag.setFieldMustInput(YesOrNoEnum.NO.getValue());
@@ -184,7 +184,7 @@ public class ImportUtil {
if (FieldCommon.STANDARD_NUMBER.equals(tag.getDbFieldName())) {
if (TableNameEnum.ENTERPRISE_STANDARDS.getValue().equals(tag.getIsModel())) {
// 使用正则表达式进行基础的格式验证
if (!cellValue.matches("^[A-Z]{1,2}/[A-Z]{2,} [A-Z]\\d+-\\d{3}-\\d{4}$")) {
if (!cellValue.matches("^[A-Z]{1,2}/[A-Z]{2,} [A-Z]\\d?-\\d+-\\d{3}-\\d{4}$")) {
log.error("" + row + "列输入的" + tag.getDbFieldTxt() + "格式不正确 ");
errMsg.append("").append(row).append("列输入的").append(tag.getDbFieldTxt()).append("格式不正确 ");
} else {
@@ -398,6 +398,8 @@ public class ImportUtil {
String nodeId = treeNodePathMap.get(value);
return StrUtil.isNotBlank(nodeId);
}
} else {
return false;
}
}
return true;