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

report-service revert

Browse source
This commit is contained in:
akulikov 2024-06-25 08:34:46 +03:00
parent 70aa7b9748
commit ca3e353e86
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepCashNettoReportBuilder.java
View file

@ -226,12 +226,12 @@ public class KSRepCashNettoReportBuilder extends CSVReportBuilder<SessionIdParam
SessionType sessionType = IEnumKey.getEnumByKey(SessionType.class, cmtRegistry.getSessionType()); SessionType sessionType = IEnumKey.getEnumByKey(SessionType.class, cmtRegistry.getSessionType());
Section section = IEnumKey.getEnumByKey(Section.class, cmtRegistry.getSection()); Section section = IEnumKey.getEnumByKey(Section.class, cmtRegistry.getSection());
if (sessionType == null || section == null) continue; if (sessionType == null || section == null) continue;
if (section == Section.FOND || sessionTypeForValue.contains(sessionType)) { if (sessionTypeForValue.contains(sessionType)) {
cmtBalance = cmtBalance.add(cmtRegistry.getBalance()); cmtBalance = cmtBalance.add(cmtRegistry.getBalance());
if (sessionType == SessionType.UNIT && section == Section.CURR) forUnitSession = true; if (sessionType == SessionType.UNIT && section == Section.CURR) forUnitSession = true;
else withValue = true; else withValue = true;
} }
if (section == Section.MKR || sessionTypeForOblReqValue.contains(sessionType)) { if (sessionTypeForOblReqValue.contains(sessionType)) {
reqValue = reqValue.add(cmtRegistry.getBalance()); reqValue = reqValue.add(cmtRegistry.getBalance());
if (sessionType == SessionType.UNIT && section == Section.CURR) forUnitSession = true; if (sessionType == SessionType.UNIT && section == Section.CURR) forUnitSession = true;
else withOblReqValue = true; else withOblReqValue = true;
@ -243,14 +243,14 @@ public class KSRepCashNettoReportBuilder extends CSVReportBuilder<SessionIdParam
SessionType sessionType = IEnumKey.getEnumByKey(SessionType.class, lmtRegistry.getSessionType()); SessionType sessionType = IEnumKey.getEnumByKey(SessionType.class, lmtRegistry.getSessionType());
Section section = IEnumKey.getEnumByKey(Section.class, lmtRegistry.getSection()); Section section = IEnumKey.getEnumByKey(Section.class, lmtRegistry.getSection());
if (sessionType == null) continue; if (sessionType == null) continue;
if (section == Section.FOND || sessionTypeForValue.contains(sessionType)) { if (sessionTypeForValue.contains(sessionType)) {
lmtBalance = lmtBalance.add(lmtRegistry.getBalance()); lmtBalance = lmtBalance.add(lmtRegistry.getBalance());
if (sessionType == SessionType.UNIT && section == Section.CURR) forUnitSession = true; if (section == Section.CURR) forUnitSession = true;
else withValue = true; else withValue = true;
} }
if (section == Section.MKR || sessionTypeForOblReqValue.contains(sessionType)) { if (sessionTypeForOblReqValue.contains(sessionType)) {
oblValue = oblValue.add(lmtRegistry.getBalance()); oblValue = oblValue.add(lmtRegistry.getBalance());
if (sessionType == SessionType.UNIT && section == Section.CURR) forUnitSession = true; if (section == Section.CURR) forUnitSession = true;
else withOblReqValue = true; else withOblReqValue = true;
} }
} }