From 57855bd8b53eb92e1318feb32474e0befd22a147 Mon Sep 17 00:00:00 2001
From: AKurakin <akurakin@mfd.ru>
Date: Tue, 6 Feb 2024 12:43:19 +0300
Subject: [PATCH] =?UTF-8?q?registry-service=20ExecutionRegisterReport=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20+=20=D0=BD=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=BE=D0=B5=20=D0=BF=D0=BE=D0=BB=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reports/bean/ExecutionRegisterReport.java        | 12 ++++++++++++
 .../builders/ExecutionRegisterReportBuilder.java     |  9 +++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/bean/ExecutionRegisterReport.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/bean/ExecutionRegisterReport.java
index 657b69a56..a8dd7c7cb 100644
--- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/bean/ExecutionRegisterReport.java
+++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/bean/ExecutionRegisterReport.java
@@ -80,6 +80,10 @@ public class ExecutionRegisterReport implements FileReport {
     @CsvBindByPosition(position = 15)
     private String status;
 
+    @CsvBindByName(column = "Код режима")
+    @CsvBindByPosition(position = 16)
+    private String market;
+
 
     public String getClearingOrganization() {
         return clearingOrganization;
@@ -208,4 +212,12 @@ public class ExecutionRegisterReport implements FileReport {
     public void setStatus(String status) {
         this.status = status;
     }
+
+    public String getMarket() {
+        return market;
+    }
+
+    public void setMarket(String market) {
+        this.market = market;
+    }
 }
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 ecda2152b..488f17e55 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
@@ -80,9 +80,11 @@ public class ExecutionRegisterReportBuilder extends XLSXReportBuilder<ExecutionR
             Company companyByCompanyId = companyImdg.getSingleObjectByID(input.getCompanyId());
 
             if (Arrays.asList(Side.BUY.getKey(), MoneyFlowSide.BUY.getKey()).contains(input.getSide().toUpperCase())) {
+                if (companyByCompanyId != null) {
+                    entity.setBuyer(companyByCompanyId.getShortName());
+                }
                 if (companyByCounterPartyId != null) {
                     entity.setSeller(companyByCounterPartyId.getShortName());
-                    entity.setBuyer(companyByCounterPartyId.getShortName());
                 }
                 if (companySymbolsByCounterPartyId != null) {
                     entity.setSellerCode(companySymbolsByCounterPartyId.getCompanySymbolValue());
@@ -95,7 +97,9 @@ public class ExecutionRegisterReportBuilder extends XLSXReportBuilder<ExecutionR
             if (Arrays.asList(Side.SELL.getKey(), MoneyFlowSide.SELL.getKey()).contains(input.getSide().toUpperCase())) {
                 if (companyByCompanyId != null) {
                     entity.setSeller(companyByCompanyId.getShortName());
-                    entity.setBuyer(companyByCompanyId.getShortName());
+                }
+                if (companyByCounterPartyId != null) {
+                    entity.setBuyer(companyByCounterPartyId.getShortName());
                 }
                 if (companySymbolsByCompanyId != null) {
                     entity.setSellerCode(companySymbolsByCompanyId.getCompanySymbolValue());
@@ -128,6 +132,7 @@ public class ExecutionRegisterReportBuilder extends XLSXReportBuilder<ExecutionR
             );
             if (allowed != null) entity.setStatus(allowed.getName());
         }
+        entity.setMarket(input.getMarket());
 
         return entity;
     }