From fd25105fe8288b64d537661ca0aed275ca7cfe15 Mon Sep 17 00:00:00 2001
From: akulikov <akulikov@mfd.ru>
Date: Thu, 9 Nov 2023 17:12:59 +0300
Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-497

---
 .../builders/ks/KSCommissionTradesReportBuilder.java        | 6 +++---
 .../ks/KS_COMMISSION_TRADES_expected.csv                    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSCommissionTradesReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSCommissionTradesReportBuilder.java
index 74efb4bba..22491b270 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSCommissionTradesReportBuilder.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSCommissionTradesReportBuilder.java
@@ -124,10 +124,10 @@ public class KSCommissionTradesReportBuilder extends CSVReportBuilder<EmptyParam
 
                 String execStatus = "";
                 RegistryStatus registryStatus = IEnumKey.getEnumByKey(RegistryStatus.class, registry.getRegistryStatus());
-                if (registryStatus == RegistryStatus.CLRD) execStatus = "Исполнено";
-                else if (registryStatus == RegistryStatus.FAIL) execStatus = "Не исполнено";
+                if (registryStatus == RegistryStatus.CLRD) execStatus = "Исполнен";
+                else if (registryStatus == RegistryStatus.FAIL) execStatus = "Не исполнен";
                 else if (registryStatus == RegistryStatus.MNG || registryStatus == RegistryStatus.PROC)
-                    execStatus = "В ожидании";
+                    execStatus = "Срок исполнения не наступил";
 
                 String agreementNumber = registry.getContract();
                 if (agreementNumber != null && agreementNumber.contains("~"))
diff --git a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/ks/KS_COMMISSION_TRADES_expected.csv b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/ks/KS_COMMISSION_TRADES_expected.csv
index c36300aa3..50f4eabae 100644
--- a/clearing-parent/reports-service/src/test/resources/expected_reports_csv/ks/KS_COMMISSION_TRADES_expected.csv
+++ b/clearing-parent/reports-service/src/test/resources/expected_reports_csv/ks/KS_COMMISSION_TRADES_expected.csv
@@ -1,2 +1,2 @@
 "FIRM_ID","FIRM_ID_INITIATOR","SECCODE","CLASS_CODE","AGREEMENT_NUMBER","AGREEMENT_NUMBER_POSTFIX","AGREEMENT_DATE","SUM","REPAYM_DATE","EXEC_STATUS"
-"CLEARING_CODE","TRADING_CODE","CONT~RACT","market","CONT","CONT~RACT","01.01.1991","-77.78","05.09.2023","Исполнено"
+"CLEARING_CODE","TRADING_CODE","CONT~RACT","market","CONT","CONT~RACT","01.01.1991","-77.78","05.09.2023","Исполнен"