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

http://jira.mfd.msk:8088/browse/CLS-497

Browse source
This commit is contained in:
akulikov 2023-11-09 17:12:59 +03:00
parent 858e02084b
commit fd25105fe8
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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("~"))

2
clearing-parent/reports-service/src/test/resources/expected_reports_csv/ks/KS_COMMISSION_TRADES_expected.csv
View file

@ -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","Исполнен"

1 FIRM_ID FIRM_ID_INITIATOR SECCODE CLASS_CODE AGREEMENT_NUMBER AGREEMENT_NUMBER_POSTFIX AGREEMENT_DATE SUM REPAYM_DATE EXEC_STATUS
2 CLEARING_CODE TRADING_CODE CONT~RACT market CONT CONT~RACT 01.01.1991 -77.78 05.09.2023 Исполнено Исполнен