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

reports-service поправил CLS-25

Browse source
This commit is contained in:
AKurakin 2023-01-10 16:52:07 +03:00
parent 801b1d88f7
commit 552fbe26d0
2 changed files with 16 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420315_Collector.java → clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420315_P1_Collector.java
View file

@ -25,7 +25,7 @@ import java.time.LocalDate;
import java.util.*; import java.util.*;
@Component @Component
public class ReportBR_0420315_Collector extends ReportWithPeriodCollector<ReportBR_0420315_P1> { public class ReportBR_0420315_P1_Collector extends ReportWithPeriodCollector<ReportBR_0420315_P1> {
protected static final List<String> ALLOW_CLEARING_MEMBER_CATEGORY = Arrays.asList(ClearingCategory.I.getKey(), ClearingCategory.V.getKey()); protected static final List<String> ALLOW_CLEARING_MEMBER_CATEGORY = Arrays.asList(ClearingCategory.I.getKey(), ClearingCategory.V.getKey());
private Imdg<Company> companyImdg; private Imdg<Company> companyImdg;
@ -35,7 +35,7 @@ public class ReportBR_0420315_Collector extends ReportWithPeriodCollector<Report
private Imdg<Listing> listingImdg; private Imdg<Listing> listingImdg;
@Autowired @Autowired
public ReportBR_0420315_Collector(ImdgProvider imdgProvider) { public ReportBR_0420315_P1_Collector(ImdgProvider imdgProvider) {
companyImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, Company.class); companyImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, Company.class);
liabilitiesClaimsAssetsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesClaimsAssets, LiabilitiesClaimsAssets.class); liabilitiesClaimsAssetsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesClaimsAssets, LiabilitiesClaimsAssets.class);
clearingMemberCategoryImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_ClearingMemberCategory, ClearingMemberCategory.class); clearingMemberCategoryImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_ClearingMemberCategory, ClearingMemberCategory.class);
@ -99,7 +99,7 @@ public class ReportBR_0420315_Collector extends ReportWithPeriodCollector<Report
long contractorQty; long contractorQty;
BigDecimal liabilitiesAmount = BigDecimal.ZERO; BigDecimal liabilitiesAmount = BigDecimal.ZERO;
{ {
HashSet<String> collectedToSum = new HashSet<>(); // чтобы дважды не посчитать 1 и тот же контракт HashSet<String> collectedContract = new HashSet<>();
HashSet<Long> onMarketSecurity = new HashSet<>(); HashSet<Long> onMarketSecurity = new HashSet<>();
for (LiabilitiesClaimsAssets lContract : liabilitiesOfCompany) { for (LiabilitiesClaimsAssets lContract : liabilitiesOfCompany) {
if (!onMarketSecurity.contains(lContract.getSecurityId())) { if (!onMarketSecurity.contains(lContract.getSecurityId())) {
@ -109,13 +109,12 @@ public class ReportBR_0420315_Collector extends ReportWithPeriodCollector<Report
} }
onMarketSecurity.add(lContract.getSecurityId()); onMarketSecurity.add(lContract.getSecurityId());
} }
if (lContract.getLiabilitiesQuantity() != null && StringUtils.isNotEmpty(lContract.getContract()) if (lContract.getLiabilitiesQuantity() != null && StringUtils.isNotEmpty(lContract.getContract())) {
&& !collectedToSum.contains(lContract.getContract())) { collectedContract.add(lContract.getContract());
collectedToSum.add(lContract.getContract());
liabilitiesAmount = liabilitiesAmount.add(lContract.getLiabilitiesQuantity()); liabilitiesAmount = liabilitiesAmount.add(lContract.getLiabilitiesQuantity());
} }
} }
contractorQty = collectedToSum.size(); contractorQty = collectedContract.size();
} }
String onMarketString = StringUtils.join(onMarket, ","); String onMarketString = StringUtils.join(onMarket, ",");
if (onMarket.size() != 1) { // Сейчас по коду ожидается один listing.market="MKRS" но потом могут быть несколько if (onMarket.size() != 1) { // Сейчас по коду ожидается один listing.market="MKRS" но потом могут быть несколько

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

@ -12,6 +12,7 @@ import ru.spcex.platform.imdg.api.ImdgProvider;
import ru.spcex.platform.imdg.api.predicate.ImdgPredicate; import ru.spcex.platform.imdg.api.predicate.ImdgPredicate;
import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder; import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
import java.math.BigDecimal;
import java.time.Instant; import java.time.Instant;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.Collection; import java.util.Collection;
@ -43,27 +44,24 @@ public class ReportBR_0420315_P2_collector extends ReportWithPeriodCollector<Rep
validateDateRange(startDate, endDate); validateDateRange(startDate, endDate);
Collection<LiabilitiesClaimsAssets> liabilities = searchLiabilitiesClaimsAssets(startDate, endDate); Collection<LiabilitiesClaimsAssets> liabilities = searchLiabilitiesClaimsAssets(startDate, endDate);
long contractorQty; long liabilitiesAmount;
double liabilitiesAmount = 0; BigDecimal contractorQty = BigDecimal.ZERO;
{ {
HashSet<String> collectedToSumm = new HashSet<>(); HashSet<String> collectedToSumm = new HashSet<>();
for (LiabilitiesClaimsAssets lContract : liabilities) { for (LiabilitiesClaimsAssets lContract : liabilities) {
if (lContract.getLiabilitiesQuantity() != null && StringUtils.isNotEmpty(lContract.getContract()) if (lContract.getLiabilitiesQuantity() != null && StringUtils.isNotEmpty(lContract.getContract())) {
&& !collectedToSumm.contains(lContract.getContract())) {
collectedToSumm.add(lContract.getContract()); collectedToSumm.add(lContract.getContract());
liabilitiesAmount += lContract.getLiabilitiesQuantity().doubleValue(); contractorQty = contractorQty.add(lContract.getLiabilitiesQuantity());
} }
} }
contractorQty = collectedToSumm.size(); liabilitiesAmount = collectedToSumm.size();
} }
// ReportBR_0420315_P2 reportBR_0420315_p2 = new ReportBR_0420315_P2(startDate, endDate, ReportBR_0420315_P2 reportBR_0420315_p2 = new ReportBR_0420315_P2(startDate, endDate);
// "BR", reportBR_0420315_p2.setRows(new ReportBR_0420315_P2.Info_0420315_P2(toString(contractorQty),
// toString(contractorQty), toString(liabilitiesAmount)));
// toString(liabilitiesAmount));
// return reportBR_0420315_p2; return reportBR_0420315_p2;
return null;
} }
@Override @Override