treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

reports-service http://jira.mfd.msk:8088/browse/CLS-25 refactoring

Browse source
This commit is contained in:
AKurakin 2022-12-26 16:23:55 +03:00
parent 6a3433c26f
commit 3f0fe1d901
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_1_P1_collector.java
View file

@ -61,20 +61,19 @@ public class Bt17_1_P1_collector extends ReportDataCollector<ReportBR_0420315_P1
} }
List<ReportBR_0420315_P1> result = new ArrayList<>(); List<ReportBR_0420315_P1> result = new ArrayList<>();
String ql = String.format("'%s' <= refundDate and refundDate <= '%s'", startDate, endDate);
Collection<LiabilitiesClaimsAssets> liabilities = liabilitiesClaimsAssetsImdg.getCollectionObjectsBySQL(ql);
ClearingStatusDictionary allowClearingStatus = clearingStatusDictionaryImdg.getSingleObjectByFieldValues(Map.of("code", ALLOW_CLEARING_STATUS)); ClearingStatusDictionary allowClearingStatus = clearingStatusDictionaryImdg.getSingleObjectByFieldValues(Map.of("code", ALLOW_CLEARING_STATUS));
if (allowClearingStatus == null) { if (allowClearingStatus == null) {
throw new IllegalStateException("ClearingStatusDictionary with code=\"" + ALLOW_CLEARING_STATUS + "\" not fount"); throw new IllegalStateException("ClearingStatusDictionary with code=\"" + ALLOW_CLEARING_STATUS + "\" not fount");
} }
final Long allowClearingStatusId = allowClearingStatus.getId(); // "OK" final Long allowClearingStatusId = allowClearingStatus.getId(); // "OK"
Collection<LiabilitiesClaimsAssets> filteredLiabilities = liabilities.stream()
.filter(liability -> allowClearingStatusId.equals(liability.getClearingStatus()))
.collect(Collectors.toList());
Map<Long, List<LiabilitiesClaimsAssets>> indexByCompany = MapUtil.indexList(filteredLiabilities, LiabilitiesClaimsAssets::getCompanyId);
for (LiabilitiesClaimsAssets liability : filteredLiabilities) { String ql = String.format("'%s' <= refundDate and refundDate <= '%s' and clearingStatus=",
startDate, endDate, allowClearingStatusId);
Collection<LiabilitiesClaimsAssets> liabilities = liabilitiesClaimsAssetsImdg.getCollectionObjectsBySQL(ql);
Map<Long, List<LiabilitiesClaimsAssets>> indexByCompany = MapUtil.indexList(liabilities, LiabilitiesClaimsAssets::getCompanyId);
for (LiabilitiesClaimsAssets liability : liabilities) {
final Long companyId = liability.getCompanyId(); final Long companyId = liability.getCompanyId();
Company company = companyImdg.getSingleObjectByID(companyId); Company company = companyImdg.getSingleObjectByID(companyId);
if (company != null) { if (company != null) {

1
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_1_P2_collector.java
View file

@ -3,7 +3,6 @@ package ru.spcex.clearing.reports.services.collector;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import ru.clearing.classes.statics.data.company.Company;
import ru.clearing.classes.transaction.data.execution.LiabilitiesClaimsAssets; import ru.clearing.classes.transaction.data.execution.LiabilitiesClaimsAssets;
import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.clearing.reports.reports.bt_17_1.ReportBR_0420315_P2; import ru.spcex.clearing.reports.reports.bt_17_1.ReportBR_0420315_P2;