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

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

Browse source
This commit is contained in:
etreschenkov 2022-10-31 11:27:28 +03:00
parent 927b033763
commit 1dbc26f20a
3 changed files with 24 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf16.java
View file

@ -18,9 +18,9 @@ public class SDf16 extends SpcexObjectBase {
private BigDecimal sum;
private String market;
private String type;
private BigDecimal INN;
private BigDecimal BIC;
private String SPEC;
private BigDecimal inn;
private BigDecimal bic;
private String spec;
private BigDecimal number;
private String fileName;
private Instant generationTime;
@ -58,28 +58,28 @@ public class SDf16 extends SpcexObjectBase {
this.type = value;
}
public BigDecimal getINN() {
return INN;
public BigDecimal getInn() {
return inn;
}
public void setINN(BigDecimal value) {
this.INN = value;
public void setInn(BigDecimal value) {
this.inn = value;
}
public BigDecimal getBIC() {
return BIC;
public BigDecimal getBic() {
return bic;
}
public void setBIC(BigDecimal value) {
this.BIC = value;
public void setBic(BigDecimal value) {
this.bic = value;
}
public String getSPEC() {
return SPEC;
public String getSpec() {
return spec;
}
public void setSPEC(String value) {
this.SPEC = value;
public void setSpec(String value) {
this.spec = value;
}
public BigDecimal getNumber() {

7
clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/tables/SDf16Table.java
View file

@ -3,7 +3,6 @@ package ru.spcex.clearing.dbf.importer.logic.data.tables;
import ru.clearing.classes.statics.data.sdf.SDf16;
import ru.spcex.clearing.dbf.importer.logic.data.enums.ETable;
import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.platform.utils.time.TimeUtil;
import java.math.BigDecimal;
import java.time.Instant;
@ -26,9 +25,9 @@ public class SDf16Table extends AbstractTable<SDf16> {
result.setSum((BigDecimal) entity[2]);
result.setMarket((String) entity[3]);
result.setType((String) entity[4]);
result.setINN((BigDecimal) entity[5]);
result.setBIC((BigDecimal) entity[6]);
result.setSPEC((String) entity[7]);
result.setInn((BigDecimal) entity[5]);
result.setBic((BigDecimal) entity[6]);
result.setSpec((String) entity[7]);
result.setNumber((BigDecimal) entity[8]);
result.setFileName(filename);
result.setGenerationTime(Instant.now());

12
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf16MapStore.java
View file

@ -43,9 +43,9 @@ public class SDf16MapStore extends TemplateMapStore<SDf16> {
object.setSum(resultSet.getObject("SUM", BigDecimal.class));
object.setMarket(resultSet.getObject("MARKET", String.class));
object.setType(resultSet.getObject("TYPE", String.class));
object.setINN(resultSet.getObject("_I_N_N", BigDecimal.class));
object.setBIC(resultSet.getObject("_B_I_C", BigDecimal.class));
object.setSPEC(resultSet.getObject("_S_P_E_C", String.class));
object.setInn(resultSet.getObject("_I_N_N", BigDecimal.class));
object.setBic(resultSet.getObject("_B_I_C", BigDecimal.class));
object.setSpec(resultSet.getObject("_S_P_E_C", String.class));
object.setNumber(resultSet.getObject("NUMBER", BigDecimal.class));
object.setFileName(resultSet.getObject("FILE_NAME", String.class));
object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME"));
@ -61,9 +61,9 @@ public class SDf16MapStore extends TemplateMapStore<SDf16> {
object.getSum(),
object.getMarket(),
object.getType(),
object.getINN(),
object.getBIC(),
object.getSPEC(),
object.getInn(),
object.getBic(),
object.getSpec(),
object.getNumber(),
object.getFileName(),
TimeUtil.toDateFromInstant(object.getGenerationTime()),