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

fix(文档对比): 拆分已入库文本查询问题修复

Browse Source
This commit is contained in:
yjz
2023-10-20 17:58:03 +08:00
parent a9e7668a61
commit 9c7dd6d297
1 changed files with 6 additions and 1 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
+6 -1
View File
@@ -372,12 +372,14 @@ public class SarFileSplitInfoServiceImpl extends ServiceImpl<SarFileSplitInfoMap
return new Page<>();
}
}
List<String> collect3 = new ArrayList<>();
String standardNumber = param.getStandardNumber();
if (StringUtils.isNotBlank(standardNumber)){
List<String> collect1 = lawsDomesticStandards.stream().filter(LawsDomesticStandard -> LawsDomesticStandard.getStandardNumber().contains(standardNumber)).map(LawsDomesticStandard::getId).collect(Collectors.toList());
wrapper.in(!collect1.isEmpty(), OSSFile::getStandardId, collect1);
List<String> collect2 = lawsEnterpriseStandards.stream().filter(LawsEnterpriseStandard -> LawsEnterpriseStandard.getStandardNumber().contains(standardNumber)).map(LawsEnterpriseStandard::getId).collect(Collectors.toList());
wrapper.in(!collect2.isEmpty(), OSSFile::getStandardId, collect2);
collect3.addAll(collect1);
collect3.addAll(collect2);
}
String standardName = param.getStandardName();
if (StringUtils.isNotBlank(standardName)){
@@ -385,7 +387,10 @@ public class SarFileSplitInfoServiceImpl extends ServiceImpl<SarFileSplitInfoMap
wrapper.in(!collect1.isEmpty(), OSSFile::getStandardId, collect1);
List<String> collect2 = lawsEnterpriseStandards.stream().filter(LawsEnterpriseStandard -> LawsEnterpriseStandard.getStandardName().contains(standardName)).map(LawsEnterpriseStandard::getId).collect(Collectors.toList());
wrapper.in(!collect2.isEmpty(), OSSFile::getStandardId, collect2);
collect3.addAll(collect1);
collect3.addAll(collect2);
}
wrapper.in(!collect3.isEmpty(), OSSFile::getStandardId, collect3.stream().distinct().collect(Collectors.toList()));
wrapper.eq(StringUtils.isNotBlank(param.getStandardFileType()), OSSFile::getStandardFileType, param.getStandardFileType());
//限制process_manuscript字典，standardFileType值只限制在process_manuscript集合中
List<DictModel> process_manuscript = sysDictService.queryDictItemsByCode("process_manuscript");