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

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

Browse source
This commit is contained in:
akulikov 2023-09-06 19:57:34 +03:00
parent e1df8110a7
commit 3ce2db798c
9 changed files with 10 additions and 9 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/reports/bean/KSRepDepoNettoReport.java
View file

@ -33,7 +33,7 @@ public class KSRepDepoNettoReport {
@CsvBindByName(column = "VALUE")
@CsvBindByPosition(position = 5)
@CsvNumber(value = "#0.00", writeFormat = "#0.00")
@CsvNumber(value = "#0", writeFormat = "#0")
private BigDecimal value;
@CsvBindByName(column = "DATE")

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

@ -32,7 +32,7 @@ public class KSRepDepoRegisterQuantitiesReport {
@CsvBindByName(column = "ADD_QUANTITY")
@CsvBindByPosition(position = 5)
@CsvNumber(value = "#0.00", writeFormat = "#0.00")
@CsvNumber(value = "#0", writeFormat = "#0")
private BigDecimal addQuantity;
@CsvBindByName(column = "ADD_TIME")

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

@ -38,7 +38,7 @@ public class KSRepTradesReport {
@CsvBindByName(column = "DEPO_LIABILITY")
@CsvBindByPosition(position = 6)
@CsvNumber(value = "#0.00", writeFormat = "#0.00")
@CsvNumber(value = "#0", writeFormat = "#0")
private BigDecimal depoLiability;
@CsvBindByName(column = "TRADE_NUM")

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

@ -178,7 +178,7 @@ public class KSCommissionTradesReportBuilder extends CSVReportBuilder<EmptyParam
pb = sTradesImdg.predicateBuilder();
Collection<STrades> sTradesList = sTradesImdg.getCollectionObjectsByPredicate(
pb.and(
pb.equals("tradeNum", tradeNum),
pb.equals("tradeNum", registry.getGroupId()),
pb.notNull("classCode")
)
);

2
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSSessionListReportBuilder.java
View file

@ -34,7 +34,7 @@ public class KSSessionListReportBuilder extends CSVReportBuilder<EmptyParams, KS
@Override
public ReportBuilderType getReportType() {
return ReportBuilderType.KS_REP_FIRM_DETAILS;
return ReportBuilderType.KS_SESSION_LIST;
}
@Override

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

@ -652,6 +652,7 @@ public class ReportServiceTest_KS {
registry.setTradingDate(LocalDate.of(1991, 1, 1));
registry.setContract("CONT~RACT");
registry.setClearingCode("CLEARING_CODE");
registry.setGroupId(23071812300L);
registryImdg.insert(registry);
Registry omtRegistry = new Registry();
@ -664,7 +665,7 @@ public class ReportServiceTest_KS {
registryImdg.insert(omtRegistry);
STrades sTrades = new STrades();
sTrades.setTradeNum(123L);
sTrades.setTradeNum(23071812300L);
sTrades.setClassCode("CLASS_CODE");
sTradesImdg.insert(sTrades);

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

@ -1,2 +1,2 @@
"FIRMID","SESSION_ID","SESSION_DATE","ACCOUNT","SECURITYID","VALUE","DATE"
"TRADING_CODE","2","19.01.1970T23:49:58","ACCOUNT","SECURITY_SYMBOL","22.22","07.07.2023"
"TRADING_CODE","2","19.01.1970T23:49:58","ACCOUNT","SECURITY_SYMBOL","22","07.07.2023"

1 FIRMID SESSION_ID SESSION_DATE ACCOUNT SECURITYID VALUE DATE
2 TRADING_CODE 2 19.01.1970T23:49:58 ACCOUNT SECURITY_SYMBOL 22.22 22 07.07.2023

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

@ -1,2 +1,2 @@
"FIRMID","ACCOUNT","TKR","SECURITYID","REGISTER_CODE","ADD_QUANTITY","ADD_TIME","ADD_DATE","TRADE_NUM"
"1","ACCOUNT","TRADING_CLEARING_REGISTRY","value","AS_T","7777.78","15:52:33","01.08.2023",""
"1","ACCOUNT","TRADING_CLEARING_REGISTRY","value","AS_T","7778","15:52:33","01.08.2023",""

1 FIRMID ACCOUNT TKR SECURITYID REGISTER_CODE ADD_QUANTITY ADD_TIME ADD_DATE TRADE_NUM
2 1 ACCOUNT TRADING_CLEARING_REGISTRY value AS_T 7777.78 7778 15:52:33 01.08.2023

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

@ -1,3 +1,3 @@
"SESSION_ID","SESSION_DATE","TR_ID","FIRM_ID","TKR","CASH_LIABILITY","DEPO_LIABILITY","TRADE_NUM","CLASS_CODE","TRADE_DATE","STATUS"
"4","20.01.1970T04:09:07","8","TRADING_CODE","TKR","8888.89","","222",3333,"19.01.1970T23:49:58","3"
"3","20.01.1970T12:54:43","5","TRADING_CODE","TKR","8888.89","123.46","222",3333,"19.01.1970T23:49:58","1"
"3","20.01.1970T12:54:43","5","TRADING_CODE","TKR","8888.89","123","222",3333,"19.01.1970T23:49:58","1"

1 SESSION_ID SESSION_DATE TR_ID FIRM_ID TKR CASH_LIABILITY DEPO_LIABILITY TRADE_NUM CLASS_CODE TRADE_DATE STATUS
2 4 20.01.1970T04:09:07 8 TRADING_CODE TKR 8888.89 222 3333 19.01.1970T23:49:58 3
3 3 20.01.1970T12:54:43 5 TRADING_CODE TKR 8888.89 123.46 123 222 3333 19.01.1970T23:49:58 1