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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zer0Black
2023-10-12 12:02:25 +08:00
parent 020acbb35e 4511e38251
commit 2404f95605
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java
+11 -11
View File
@@ -273,17 +273,17 @@ public class SarFileSplitInfoServiceImpl extends ServiceImpl<SarFileSplitInfoMap
} }
} }
if (LanguageEnum.CN.getValue().equals(cut)) { // if (LanguageEnum.CN.getValue().equals(cut)) {
Map<String, String> cnMap = dictItemListAll.stream() // Map<String, String> cnMap = dictItemListAll.stream()
.filter(e-> e.getItemValue().equals(splitInfoEO.getSplitResult())) // .filter(e-> e.getItemValue().equals(splitInfoEO.getSplitResult()))
.collect(Collectors.toMap(SysDictItem::getItemValue, SysDictItem::getItemText)); // 优化 // .collect(Collectors.toMap(SysDictItem::getItemValue, SysDictItem::getItemText)); // 优化
splitInfoEO.setSplitResult(cnMap.get(splitInfoEO.getSplitResult())); // splitInfoEO.setSplitResult(cnMap.get(splitInfoEO.getSplitResult()));
} else { // } else {
Map<String, String> enMap = dictItemListAll.stream() // Map<String, String> enMap = dictItemListAll.stream()
.filter(e-> e.getItemValue().equals(splitInfoEO.getSplitResult())) // .filter(e-> e.getItemValue().equals(splitInfoEO.getSplitResult()))
.collect(Collectors.toMap(SysDictItem::getItemValue, SysDictItem::getEnName)); // 优化 // .collect(Collectors.toMap(SysDictItem::getItemValue, SysDictItem::getEnName)); // 优化
splitInfoEO.setSplitResult(enMap.get(splitInfoEO.getSplitResult())); // splitInfoEO.setSplitResult(enMap.get(splitInfoEO.getSplitResult()));
} // }
splitInfoEO.setFileType(fileType); splitInfoEO.setFileType(fileType);
// 处理文档库id字段 根据编号和标题查询 // 处理文档库id字段 根据编号和标题查询
// List<Map<String, Object>> bussDocumentLibraryEOList = bussDocumentLibraryEOService.getListBySerialNumber(splitInfoEO.getSerialNumber()); // List<Map<String, Object>> bussDocumentLibraryEOList = bussDocumentLibraryEOService.getListBySerialNumber(splitInfoEO.getSerialNumber());