QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 87541 外来标准法规文本库--导入--多层文件夹/多个excel文件提示语建议调整

Browse Source
This commit is contained in:
mzaxd
2024-08-06 20:19:41 +08:00
parent 5885c9bba6
commit 941bf5179e
5 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-base/laws-base-core/src/main/java/com/jero/common/api/vo/ResultCommon.java
+5
View File
@@ -207,4 +207,9 @@ public class ResultCommon {
public static final String FILE_EMPTY_IMPORT_ERROR = "file.empty.import.error";
// 行大小太大
public static final String ROW_SIZE_TOO_LARGE = "row.size.too.large";
public static final String CAN_NOT_FIND_TEMPLATE_FILE = "can_not_find_template_file";
public static final String CAN_NOT_FIND_FIELD = "can_not_find_field";
}
laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
+3 -3
View File
@@ -1743,7 +1743,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
// 检查Excel的文件名
if (!excelName.contains("企业标准法规导入模板.xls") && !excelName.contains("xlsm")) {
FileUnZip.deleteDir(saveDirectory);
throw new JeroBootException(MessageUtils.getMessage(ResultCommon.IMPORT_TEMPLATE_ERROR));
throw new JeroBootException(MessageUtils.getMessage(ResultCommon.CAN_NOT_FIND_TEMPLATE_FILE, "企业标准法规导入模板"));
}
moduleCode = TableNameEnum.ENTERPRISE_STANDARDS.getValue();
}
@@ -1751,7 +1751,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
// 检查Excel的文件名
if (!excelName.contains("外来标准法规导入模板.xls") && !excelName.contains("xlsm")) {
FileUnZip.deleteDir(saveDirectory);
throw new JeroBootException(MessageUtils.getMessage(ResultCommon.IMPORT_TEMPLATE_ERROR));
throw new JeroBootException(MessageUtils.getMessage(ResultCommon.CAN_NOT_FIND_TEMPLATE_FILE, "外来标准法规导入模板"));
}
moduleCode = TableNameEnum.DOMESTIC_REGULATIONS.getValue();
}
@@ -1801,7 +1801,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
if (tag == null && !cell.toString().equals("监察内容")) {
FileUnZip.deleteDir(saveDirectory);
log.error("找不到" + cell + "对应的字段");
throw new JeroBootException(MessageUtils.getMessage(ResultCommon.IMPORT_TEMPLATE_ERROR));
throw new JeroBootException(MessageUtils.getMessage(ResultCommon.CAN_NOT_FIND_FIELD, cell.toString()));
} else {
headerList.add(tag);
}
laws-single-startup/src/main/resources/i18n/messages.properties
+2
View File
@@ -84,3 +84,5 @@ split.import.template.error=\u5206\u89E3\u5355\u4E0A\u4F20\u6A21\u677F\u9519\u8B
model.import.template.error=\u8F66\u578B\u9879\u76EE\u6587\u4EF6\u4E0A\u4F20\u6A21\u677F\u9519\u8BEF\uFF0C\u8BF7\u68C0\u67E5\u540E\u91CD\u8BD5
model.import.data.error=\u8F66\u578B\u9879\u76EE\u6587\u4EF6\u4E0A\u4F20\u6570\u636E\u9519\u8BEF\u3002{0}
file.empty.import.error=\u6587\u4EF6\u4E3A\u7A7A\uFF0C\u8BF7\u68C0\u67E5\u540E\u91CD\u8BD5
can_not_find_template_file=\u627E\u4E0D\u5230\u540D\u4E3A{0}\u7684\u6A21\u677F\u6587\u4EF6
can_not_find_field=\u627E\u4E0D\u5230\u540D\u4E3A{0}\u7684\u5B57\u6BB5
laws-single-startup/src/main/resources/i18n/messages_en.properties
+2
View File
@@ -101,3 +101,5 @@ model.import.template.error=Model import template error
model.import.data.error=Model import data error.{0}
file.empty.import.error=The file is empty, please upload again
row.size.too.large=Row size too large
can_not_find_template_file=Can not find template file name {0}
can_not_find_field=Can not find field {0}
laws-single-startup/src/main/resources/i18n/messages_zh.properties
+2
View File
@@ -100,3 +100,5 @@ model.import.template.error=\u8F66\u578B\u9879\u76EE\u6587\u4EF6\u4E0A\u4F20\u6A
model.import.data.error=\u8F66\u578B\u9879\u76EE\u6587\u4EF6\u4E0A\u4F20\u6570\u636E\u9519\u8BEF\u3002{0}
file.empty.import.error=\u6587\u4EF6\u4E3A\u7A7A\uFF0C\u8BF7\u68C0\u67E5\u540E\u91CD\u8BD5
row.size.too.large=\u884C\u5927\u5C0F\u592A\u5927
can_not_find_template_file=\u627E\u4E0D\u5230\u540D\u4E3A{0}\u7684\u6A21\u677F\u6587\u4EF6
can_not_find_field=\u627E\u4E0D\u5230\u540D\u4E3A{0}\u7684\u5B57\u6BB5