diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf16.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf16.java index 755552aca..9ee5665ef 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf16.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf16.java @@ -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() { diff --git a/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/tables/SDf16Table.java b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/tables/SDf16Table.java index 9be1b54e6..aaeda1047 100644 --- a/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/tables/SDf16Table.java +++ b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/tables/SDf16Table.java @@ -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 { 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()); diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf16MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf16MapStore.java index 69fa4b308..23dbfe7c0 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf16MapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf16MapStore.java @@ -43,9 +43,9 @@ public class SDf16MapStore extends TemplateMapStore { 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 { 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()),