diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/DepoPaymentInstructionRegisterReportBuilder.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/DepoPaymentInstructionRegisterReportBuilder.java index 544a682e7..6d3e4bbdb 100644 --- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/DepoPaymentInstructionRegisterReportBuilder.java +++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/DepoPaymentInstructionRegisterReportBuilder.java @@ -41,7 +41,10 @@ public class DepoPaymentInstructionRegisterReportBuilder extends XLSXReportBuild protected DepoPaymentInstructionRegisterReport toRow(PaymentInstruction input) { DepoPaymentInstructionRegisterReport entity = new DepoPaymentInstructionRegisterReport(); - entity.setNumber(input.getId()); + if (input.getSessionId() == null) + entity.setNumber(input.getId()); + else + entity.setNumber(input.getSessionId()); entity.setDate(input.getClearingDate()); if (input.getCreated() != null) entity.setTime(LocalDateTime.from(input.getCreated().atZone(ZoneId.systemDefault()))); diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/ExecutionRegisterReportBuilder.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/ExecutionRegisterReportBuilder.java index 17d07d660..ecda2152b 100644 --- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/ExecutionRegisterReportBuilder.java +++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/ExecutionRegisterReportBuilder.java @@ -14,6 +14,7 @@ import ru.spcex.platform.enumeration.MoneyFlowSide; import ru.spcex.platform.enumeration.Side; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; +import ru.spcex.platform.utils.number.BigDecimalUtil; import java.time.LocalDateTime; import java.time.ZoneId; @@ -117,7 +118,7 @@ public class ExecutionRegisterReportBuilder extends XLSXReportBuilder