diff --git a/clearing-parent/backend-api/src/main/resources/meta.xml b/clearing-parent/backend-api/src/main/resources/meta.xml index aa9c77218..9ccc59fe3 100644 --- a/clearing-parent/backend-api/src/main/resources/meta.xml +++ b/clearing-parent/backend-api/src/main/resources/meta.xml @@ -855,7 +855,7 @@ - + diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf08.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf08.java index d77d09890..5e207e210 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf08.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf08.java @@ -15,7 +15,7 @@ public class SDf08 extends SpcexObjectBase { private static final long serialVersionUID = ConstSerializable.serialVersionUID; private BigDecimal number; - private BigDecimal datetime; + private Instant datetime; private String fileName; private Instant generationTime; private Long generationId; @@ -28,11 +28,11 @@ public class SDf08 extends SpcexObjectBase { this.number = value; } - public BigDecimal getDatetime() { + public Instant getDatetime() { return datetime; } - public void setDatetime(BigDecimal value) { + public void setDatetime(Instant value) { this.datetime = value; } diff --git a/clearing-parent/db-scripts/src/main/resources/db/DDL.sql b/clearing-parent/db-scripts/src/main/resources/db/DDL.sql index 7e7ddb7dd..c2bf88582 100644 --- a/clearing-parent/db-scripts/src/main/resources/db/DDL.sql +++ b/clearing-parent/db-scripts/src/main/resources/db/DDL.sql @@ -1856,7 +1856,7 @@ COMMENT ON COLUMN S_DF02.GENERATION_TIME IS 'Дата и время обрабо COMMENT ON COLUMN S_DF02.GENERATION_ID IS 'Идентификатор взаимодействия'; -- sDf08 - ДФ-08 Запрос остатков по всем счетам -CREATE TABLE IF NOT EXISTS S_DF08(ID bigint PRIMARY KEY, NUMBER numeric(72,18), DATETIME numeric(72,18), FILE_NAME varchar(255), GENERATION_TIME timestamp, GENERATION_ID bigint); +CREATE TABLE IF NOT EXISTS S_DF08(ID bigint PRIMARY KEY, NUMBER numeric(72,18), DATETIME timestamp, FILE_NAME varchar(255), GENERATION_TIME timestamp, GENERATION_ID bigint); COMMENT ON TABLE S_DF08 IS 'ДФ-08 Запрос остатков по всем счетам'; COMMENT ON COLUMN S_DF08.ID IS 'Идентификатор записи'; diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf08MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf08MapStore.java index bda47a79c..a699f0396 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf08MapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf08MapStore.java @@ -42,7 +42,7 @@ public class SDf08MapStore extends TemplateMapStore { SDf08 object = new SDf08(); object.setId(resultSet.getObject("ID", Long.class)); object.setNumber(resultSet.getObject("NUMBER", BigDecimal.class)); - object.setDatetime(resultSet.getObject("DATETIME", BigDecimal.class)); + object.setDatetime(getInstantFromTimestamp(resultSet,"DATETIME")); object.setFileName(resultSet.getObject("FILE_NAME", String.class)); object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); @@ -54,7 +54,7 @@ public class SDf08MapStore extends TemplateMapStore { Object[] args = new Object[]{ object.getId(), object.getNumber(), - object.getDatetime(), + TimeUtil.fromInstant(object.getDatetime()), object.getFileName(), TimeUtil.fromInstant(object.getGenerationTime()), object.getGenerationId()