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

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
ialbert 2024-05-21 13:46:34 +03:00
commit 20bd9a0bb5
2 changed files with 32 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -48,6 +48,10 @@ public class KSRepCashRegisterSumsReport {
@CsvBindByPosition(position = 8)
private String operType;
@CsvBindByName(column = "CURRENCY")
@CsvBindByPosition(position = 9)
private String currency;
public String getFirmId() {
return firmId;
@ -120,4 +124,12 @@ public class KSRepCashRegisterSumsReport {
public void setOperType(String operType) {
this.operType = operType;
}
public String getCurrency() {
return currency;
}
public void setCurrency(String currency) {
this.currency = currency;
}
}

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

@ -107,7 +107,8 @@ public class KSRepCashRegisterSumsReportBuilder extends CSVReportBuilder<EmptyPa
pairRegistryPredicate
)
);
if (pairRegistries.isEmpty()) log.warn("Pair AM_T registry for registry (id = {}) not found", registry.getId());
if (pairRegistries.isEmpty())
log.warn("Pair AM_T registry for registry (id = {}) not found", registry.getId());
pairRegistry = pairRegistries.iterator().next();
if (pairRegistries.size() > 1) {
log.warn("For registry (id = {}) found > 1 AM_T registry, use first (id = {})",
@ -146,6 +147,7 @@ public class KSRepCashRegisterSumsReportBuilder extends CSVReportBuilder<EmptyPa
ksRepCashRegisterSumsReport.setAddTime(LocalTime.ofInstant(addTime, getReportZoneId()));
ksRepCashRegisterSumsReport.setAddDate(addDate);
ksRepCashRegisterSumsReport.setOperType(operType.getCode());
ksRepCashRegisterSumsReport.setCurrency(registry.getSecuritySymbol());
rows.add(ksRepCashRegisterSumsReport);
}
}