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

http://jira.mfd.msk:8088/browse/CLS-497 some big decimal fixes

Browse source
This commit is contained in:
akulikov 2023-09-06 11:46:52 +03:00
parent 21df705094
commit e4c8fc8278
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepCashRegistersReportBuilder.java
View file

@ -110,17 +110,13 @@ public class KSRepCashRegistersReportBuilder extends CSVReportBuilder<EmptyParam
RegistryCodeDictionary registryCodeDictionary = registryCodeDictionaryImdg.getFirstObjectByFieldValues(Map.of("code", registry.getRegistryCode()));
if (registryCodeDictionary != null) ksRepCashRegistersReport.setRegisterName(registryCodeDictionary.getName());
if (registry.getSettledCredit() != null) {
if (registry.getSettledDebit() != null)
ksRepCashRegistersReport.setChangeBalance(registry.getSettledCredit().subtract(registry.getSettledDebit()));
else ksRepCashRegistersReport.setChangeBalance(registry.getSettledCredit());
}
BigDecimal settleCredit = registry.getSettledCredit() != null ? registry.getSettledCredit() : BigDecimal.ZERO;
BigDecimal settleDebit = registry.getSettledDebit() != null ? registry.getSettledDebit() : BigDecimal.ZERO;
ksRepCashRegistersReport.setChangeBalance(settleCredit.subtract(settleDebit));
if (registry.getCredit() != null) {
if (registry.getDebit() != null)
ksRepCashRegistersReport.setAddWithdraw(registry.getCredit().subtract(registry.getDebit()));
else ksRepCashRegistersReport.setAddWithdraw(registry.getCredit());
}
BigDecimal credit = registry.getCredit() != null ? registry.getSettledCredit() : BigDecimal.ZERO;
BigDecimal debit = registry.getDebit() != null ? registry.getSettledDebit() : BigDecimal.ZERO;
ksRepCashRegistersReport.setAddWithdraw(credit.subtract(debit));
rows.add(ksRepCashRegistersReport);
} catch (Throwable e) {