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

http://jira.mfd.msk:8088/browse/CLS-767 fixes

Browse source
This commit is contained in:
akulikov 2024-10-03 16:54:08 +03:00
parent 27c44fa262
commit fa76a3b137
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bean/KSRepLccNettoReport.java
View file

@ -39,7 +39,7 @@ public class KSRepLccNettoReport {
@CsvNumber(value = "#0.00", writeFormat = "#0.00") @CsvNumber(value = "#0.00", writeFormat = "#0.00")
private BigDecimal debit; private BigDecimal debit;
@CsvBindByName(column = "NETTO_SUM") @CsvBindByName(column = "CREDIT")
@CsvBindByPosition(position = 7) @CsvBindByPosition(position = 7)
@CsvNumber(value = "#0.00", writeFormat = "#0.00") @CsvNumber(value = "#0.00", writeFormat = "#0.00")
private BigDecimal credit; private BigDecimal credit;

2
clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest_KS.java
View file

@ -1422,7 +1422,7 @@ public class ReportServiceTest_KS {
File outFile = outFolder.listFiles()[0]; File outFile = outFolder.listFiles()[0];
File expectedFile = new File(getClass().getClassLoader().getResource("expected_reports_csv/ks/KS_REP_LCC_TRADES_expected.csv").getFile()); File expectedFile = new File(getClass().getClassLoader().getResource("expected_reports_csv/ks/KS_REP_LCC_TRADES_expected.csv").getFile());
compareCSVFiles(expectedFile, outFile, Arrays.asList("SESSION_DATE", "TRADE_DATE", "SETTLE_DATE")); compareCSVFiles(expectedFile, outFile, Arrays.asList("SESSION_DATE", "TRADE_DATE", "SETTLEDATE"));
accountImdg.delete(account_11); accountImdg.delete(account_11);
accountImdg.delete(account_1); accountImdg.delete(account_1);

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

@ -1,4 +1,4 @@
"FIRM_ID","TKR","CURRENCYID","DATE","NETTO_SUM","DATA_TYPE","DEBIT","NETTO_SUM" "FIRM_ID","TKR","CURRENCYID","DATE","NETTO_SUM","DATA_TYPE","DEBIT","CREDIT"
"AMT_1_TRADING_CODE","TKR_AMT_1","SEC_SYMBOL_AMT_1","2024-10-02","0","FX_OBLIG","0.00","0.00" "AMT_1_TRADING_CODE","TKR_AMT_1","SEC_SYMBOL_AMT_1","2024-10-02","0","FX_OBLIG","0.00","0.00"
"AMT_1_TRADING_CODE","TKR_AMT_1","SEC_SYMBOL_AMT_1","2024-10-02","0","PR_NETTOSUM","0.00","0.00" "AMT_1_TRADING_CODE","TKR_AMT_1","SEC_SYMBOL_AMT_1","2024-10-02","0","PR_NETTOSUM","0.00","0.00"
"AMT_1_TRADING_CODE","TKR_AMT_1","SEC_SYMBOL_AMT_1","2024-10-02","10","FX_DEBT","-10.00","0.00" "AMT_1_TRADING_CODE","TKR_AMT_1","SEC_SYMBOL_AMT_1","2024-10-02","10","FX_DEBT","-10.00","0.00"

1 FIRM_ID TKR CURRENCYID DATE NETTO_SUM DATA_TYPE DEBIT NETTO_SUM CREDIT
2 AMT_1_TRADING_CODE TKR_AMT_1 SEC_SYMBOL_AMT_1 2024-10-02 0 FX_OBLIG 0.00 0.00
3 AMT_1_TRADING_CODE TKR_AMT_1 SEC_SYMBOL_AMT_1 2024-10-02 0 PR_NETTOSUM 0.00 0.00
4 AMT_1_TRADING_CODE TKR_AMT_1 SEC_SYMBOL_AMT_1 2024-10-02 10 FX_DEBT -10.00 0.00