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

fix(文档拆分): 导入模板顺序变更

Browse Source
This commit is contained in:
yjz
2024-08-12 10:28:59 +08:00
parent 1d9e13db31
commit db68b820a2
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
+5 -5
View File
@@ -1372,7 +1372,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
//此处需要做各种验证，数据库操作 //此处需要做各种验证，数据库操作
try { try {
// 查询全部字段列表 // 查询全部字段列表
List<LawsTag> fieldLists = lawsCommonMapper.getFieldList(TableNameEnum.DOCUMENT_SPLIT_IMPORT.getTableName()); List<LawsTag> fieldLists = lawsCommonMapper.getFieldList(TableNameEnum.DOCUMENT_SPLIT.getTableName());
// 列表展示字段 // 列表展示字段
List<LawsTag> fieldListSelect = fieldLists.stream().filter(v -> YesOrNoEnum.YES.getValue() List<LawsTag> fieldListSelect = fieldLists.stream().filter(v -> YesOrNoEnum.YES.getValue()
.equals(String.valueOf(v.getIsShowList()))).collect(Collectors.toList()); .equals(String.valueOf(v.getIsShowList()))).collect(Collectors.toList());
@@ -1940,9 +1940,9 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
//删除原上传文件 //删除原上传文件
FileUnZip.deleteDir(saveDirectory); FileUnZip.deleteDir(saveDirectory);
if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())){ if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())){
resultMsg = "压缩包内不存在文件夹"; resultMsg = "读取失败，压缩包内需要把所有导入文件放入一个父级文件夹下";
}else{ }else{
resultMsg = "No folder exists in the compressed package"; resultMsg = "The data fails to be read. In the compressed package, all imported files need to be placed in a parent folder";
} }
return Result.error(1, resultMsg); return Result.error(1, resultMsg);
} }
@@ -3698,7 +3698,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
private List<Map<String, Object>> getImportOnlField(String flag, String cut) { private List<Map<String, Object>> getImportOnlField(String flag, String cut) {
// List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(flag); // List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(flag);
// 查询全部字段列表 // 查询全部字段列表
List<LawsTag> fieldList = lawsCommonMapper.getFieldList(TableNameEnum.DOCUMENT_SPLIT_IMPORT.getTableName()); List<LawsTag> fieldList = lawsCommonMapper.getFieldList(TableNameEnum.DOCUMENT_SPLIT.getTableName());
// 列表展示字段 // 列表展示字段
fieldList = fieldList.stream().filter(v -> YesOrNoEnum.YES.getValue() fieldList = fieldList.stream().filter(v -> YesOrNoEnum.YES.getValue()
.equals(String.valueOf(v.getIsShowList()))).collect(Collectors.toList()); .equals(String.valueOf(v.getIsShowList()))).collect(Collectors.toList());
@@ -4402,7 +4402,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
// 查询全部字段列表 // 查询全部字段列表
List<LawsTag> fieldList = lawsCommonMapper.getFieldList(TableNameEnum.DOCUMENT_SPLIT_IMPORT.getTableName()); List<LawsTag> fieldList = lawsCommonMapper.getFieldList(TableNameEnum.DOCUMENT_SPLIT.getTableName());
// 列表展示字段 // 列表展示字段
List<String> fieldListSelect = fieldList.stream().filter(v -> YesOrNoEnum.YES.getValue() List<String> fieldListSelect = fieldList.stream().filter(v -> YesOrNoEnum.YES.getValue()
.equals(String.valueOf(v.getIsShowList()))).map(LawsTag::getDbFieldName).collect(Collectors.toList()); .equals(String.valueOf(v.getIsShowList()))).map(LawsTag::getDbFieldName).collect(Collectors.toList());
laws-modules/src/main/java/com/jero/modules/tag/enums/TableNameEnum.java
+1 -2
View File
@@ -13,8 +13,7 @@ public enum TableNameEnum {
DOMESTIC_REGULATIONS("外部标准","laws_domestic_standard","1"), DOMESTIC_REGULATIONS("外部标准","laws_domestic_standard","1"),
ENTERPRISE_STANDARDS("企业标准","laws_enterprise_standard","3"), ENTERPRISE_STANDARDS("企业标准","laws_enterprise_standard","3"),
DOCUMENT_SPLIT("条款拆分","laws_document_split","4"), DOCUMENT_SPLIT("条款拆分","laws_document_split","4"),
HOME_SEARCH("高级搜索（全部）","home_search","5"), HOME_SEARCH("高级搜索（全部）","home_search","5")
DOCUMENT_SPLIT_IMPORT("条款拆分_导入用","laws_document_split_import",""),
; ;
String name; String name;