diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepCashNettoReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepCashNettoReportBuilder.java index eb7660b14..8f6e33288 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepCashNettoReportBuilder.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepCashNettoReportBuilder.java @@ -21,7 +21,6 @@ import ru.spcex.clearing.reports.builders.CSVReportBuilder; import ru.spcex.clearing.reports.builders.PairRegistryId; import ru.spcex.clearing.reports.builders.SessionIdParam; import ru.spcex.clearing.reports.builders.bean.KSRepCashNettoReport; -import ru.spcex.clearing.reports.config.ReportConst; import ru.spcex.platform.enumeration.AccountType; import ru.spcex.platform.enumeration.RegistryDesignation; import ru.spcex.platform.enumeration.RegistryTradingParams; @@ -127,8 +126,6 @@ public class KSRepCashNettoReportBuilder extends CSVReportBuilder sessionTypeForValue = Set.of( SessionType.IPOT, SessionType.TRDT, SessionType.LIQU, SessionType.IPOB, - SessionType.IPO0, - SessionType.UNIT + SessionType.IPO0 ); Set sessionTypeForOblReqValue = Set.of( SessionType.FINL, SessionType.MEDM, - SessionType.XDEP, - SessionType.UNIT + SessionType.XDEP ); for (Registry cmtRegistry : cmtRegistries) { if (cmtRegistry.getBalance() != null) { SessionType sessionType = IEnumKey.getEnumByKey(SessionType.class, cmtRegistry.getSessionType()); Section section = IEnumKey.getEnumByKey(Section.class, cmtRegistry.getSection()); - if (sessionType == null || section == null) continue; - if (sessionTypeForValue.contains(sessionType)) { + if (section == Section.FOND || sessionTypeForValue.contains(sessionType)) { cmtBalance = cmtBalance.add(cmtRegistry.getBalance()); - if (sessionType == SessionType.UNIT && section == Section.CURR) forUnitSession = true; - else withValue = true; + withValue = true; } - if (sessionTypeForOblReqValue.contains(sessionType)) { + if (section == Section.MKR || sessionTypeForOblReqValue.contains(sessionType)) { reqValue = reqValue.add(cmtRegistry.getBalance()); - if (sessionType == SessionType.UNIT && section == Section.CURR) forUnitSession = true; - else withOblReqValue = true; + withOblReqValue = true; + } + if (section == Section.CURR || sessionType == SessionType.CURR) { + cmtCurrencyNetto = cmtCurrencyNetto.add(cmtRegistry.getBalance()); + withCurrencyNetto = true; } } } @@ -242,16 +234,17 @@ public class KSRepCashNettoReportBuilder extends CSVReportBuilder