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

backend-api classes http://jira.mfd.msk:8088/browse/CLS-639 поправил created/updated

Browse source
This commit is contained in:
AKurakin 2024-02-09 11:44:30 +03:00
parent 1f2f70d301
commit 8ee172b075
6 changed files with 13 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clearing-parent/backend-api/src/main/resources/meta/meta.json
View file

@ -1,6 +1,6 @@
{
"version": "3.10.0.74",
"version": "3.10.0.75",
"enums": {

2
clearing-parent/backend-api/src/main/resources/meta/meta.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--?xml-stylesheet type="text/xsl" href="\..\corp-reports\src\data\meta\meta.server.xslt"?-->
<meta version="3.10.0.74">
<meta version="3.10.0.75">
<!-- _xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" _xsi:noNamespaceSchemaLocation="file:///E:/d/projects/meta/from/meta.xsd" -->
<!--Здесь словари-->
<enums>

2
clearing-parent/backend-api/src/test/resources/meta.json
View file

@ -1,6 +1,6 @@
{
"version": "3.10.0.74",
"version": "3.10.0.75",
"enums": {

19
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/SCrossRate.java
View file

@ -1,6 +1,7 @@
package ru.clearing.classes.statics.data.misc;
import ru.clearing.classes.ConstSerializable;
import ru.clearing.classes.objects.BusinessObject;
import ru.spcex.platform.classes.base.SpcexObjectBase;
import ru.clearing.classes.ConstSerializable;
@ -15,7 +16,7 @@ import java.time.LocalDate;
*
* DB table: S_CROSS_RATE
**/
public class SCrossRate extends SpcexObjectBase {
public class SCrossRate extends BusinessObject {
private static final long serialVersionUID = ConstSerializable.serialVersionUID;
// (in parent) private Long id;
@ -27,8 +28,6 @@ public class SCrossRate extends SpcexObjectBase {
private BigDecimal unitRate;
private Instant generationTime;
private Long generationId;
private Instant createdAt;
private Instant updatedAt;
public LocalDate getDate() {
return date;
@ -86,18 +85,4 @@ public class SCrossRate extends SpcexObjectBase {
this.generationId=value;
}
public Instant getCreatedAt() {
return createdAt;
}
public void setCreatedAt(Instant value) {
this.createdAt=value;
}
public Instant getUpdatedAt() {
return updatedAt;
}
public void setUpdatedAt(Instant value) {
this.updatedAt=value;
}
}

8
clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/services/ExtDBImporterService.java
View file

@ -73,8 +73,8 @@ public class ExtDBImporterService {
if (sCrossRate != null && byCommand) {
// Обновление всех полей объекта из БД
crossRateDb.setId(sCrossRate.getId());
crossRateDb.setCreatedAt(sCrossRate.getCreatedAt());
crossRateDb.setUpdatedAt(currentInstant);
crossRateDb.setCreated(sCrossRate.getCreated());
crossRateDb.setUpdated(currentInstant);
// В extDb нет таких полей, оставляем как есть:
crossRateDb.setGenerationTime(sCrossRate.getGenerationTime());
crossRateDb.setGenerationId(sCrossRate.getGenerationId());
@ -82,8 +82,8 @@ public class ExtDBImporterService {
updated++;
} else if (sCrossRate == null) {
// Создание объекта из БД
crossRateDb.setCreatedAt(currentInstant);
crossRateDb.setUpdatedAt(currentInstant);
crossRateDb.setCreated(currentInstant);
crossRateDb.setUpdated(currentInstant);
sCrossRateImdg.insert(crossRateDb);
created++;
}

8
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SCrossRateMapStore.java
View file

@ -48,8 +48,8 @@ public class SCrossRateMapStore extends TemplateMapStore<SCrossRate> {
object.setUnitRate(resultSet.getObject("UNIT_RATE", BigDecimal.class));
object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME"));
object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class));
object.setCreatedAt(getInstantFromTimestamp(resultSet, "CREATED_AT"));
object.setUpdatedAt(getInstantFromTimestamp(resultSet, "UPDATED_AT"));
object.setCreated(getInstantFromTimestamp(resultSet, "CREATED_AT"));
object.setUpdated(getInstantFromTimestamp(resultSet, "UPDATED_AT"));
return object;
}
@ -65,8 +65,8 @@ public class SCrossRateMapStore extends TemplateMapStore<SCrossRate> {
object.getUnitRate(),
TimeUtil.toDateFromInstant(object.getGenerationTime()),
object.getGenerationId(),
TimeUtil.toDateFromInstant(object.getCreatedAt()),
TimeUtil.toDateFromInstant(object.getUpdatedAt())
TimeUtil.toDateFromInstant(object.getCreated()),
TimeUtil.toDateFromInstant(object.getUpdated())
};
return args;
}