From 4b58259239b0b3a5dad9aaf4e758ec42b98374df Mon Sep 17 00:00:00 2001 From: AKurakin Date: Mon, 29 May 2023 19:59:23 +0300 Subject: [PATCH] =?UTF-8?q?meta=203.5.0.30=20http://jira.mfd.msk:8088/brow?= =?UTF-8?q?se/CLS-344=20=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../account/service/AccountService.java | 3 ++ .../data/execution/ExecutionDeposit.java | 9 +++++ .../classes/statics/data/sdf/SDf05.java | 6 ++-- .../classes/statics/data/sdf/SDf09.java | 6 ++-- .../classes/statics/data/sdf/SDf11.java | 6 ++-- .../classes/statics/data/sdf/SDf12.java | 33 +++++++++++++++++-- .../classes/statics/data/sdf/SDf13.java | 6 ++-- .../classes/statics/data/sdf/SDf14.java | 6 ++-- .../classes/statics/data/sdf/SDf53.java | 6 ++-- .../session/stage/impl/FinishingSession.java | 2 +- .../dbf/exporter/services/S_DF05_Test.java | 2 +- .../dbf/exporter/services/S_DF53_Test.java | 2 +- .../imdg/object/ExecutionDepositMapStore.java | 4 ++- .../clearing/imdg/object/SDf05MapStore.java | 4 +-- .../clearing/imdg/object/SDf09MapStore.java | 2 +- .../clearing/imdg/object/SDf11MapStore.java | 2 +- .../clearing/imdg/object/SDf12MapStore.java | 10 ++++-- .../clearing/imdg/object/SDf13MapStore.java | 2 +- .../clearing/imdg/object/SDf14MapStore.java | 2 +- .../clearing/imdg/object/SDf53MapStore.java | 2 +- 20 files changed, 81 insertions(+), 34 deletions(-) diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/AccountService.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/AccountService.java index 5f8e34be3..5a2cefa95 100644 --- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/AccountService.java +++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/AccountService.java @@ -268,6 +268,9 @@ public class AccountService extends QueueConsumer implements InitializingBean { log.warn("Relation for consumerId {} contains multiply elements, use first", companyId); Relation relation = relations.iterator().next(); account.setRelationId(relation.getId()); + if (account.getCompanyId() == null) { + account.setCompanyId(relation.getConsumerId()); + } return null; } diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/execution/ExecutionDeposit.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/execution/ExecutionDeposit.java index eba4989d0..55dfef39c 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/execution/ExecutionDeposit.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/execution/ExecutionDeposit.java @@ -16,6 +16,7 @@ public class ExecutionDeposit extends ExecutionCommon { private String firstLegSettlementCode; private String secondLegSettlementCode; private String contract; + private String securityCode; @Override public ExecutionType type() { @@ -77,4 +78,12 @@ public class ExecutionDeposit extends ExecutionCommon { public void setContract(String contract) { this.contract = contract; } + + public String getSecurityCode() { + return securityCode; + } + + public void setSecurityCode(String securityCode) { + this.securityCode = securityCode; + } } diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf05.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf05.java index d27372237..0812649c4 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf05.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf05.java @@ -18,7 +18,7 @@ public class SDf05 extends SpcexObjectBase { private BigDecimal tp; private LocalDate dt; - private LocalTime tm; + private String tm; private String pr; private Instant generationTime; private Long generationId; @@ -39,11 +39,11 @@ public class SDf05 extends SpcexObjectBase { this.dt = dt; } - public LocalTime getTm() { + public String getTm() { return tm; } - public void setTm(LocalTime tm) { + public void setTm(String tm) { this.tm = tm; } diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf09.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf09.java index 27bcae5dd..d227c2850 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf09.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf09.java @@ -20,7 +20,7 @@ public class SDf09 extends SpcexObjectBase { private String quantity; private String securityCode; private String clientName; - private BigDecimal result; + private String result; private Instant generationTime; private Long generationId; @@ -72,11 +72,11 @@ public class SDf09 extends SpcexObjectBase { this.clientName = clientName; } - public BigDecimal getResult() { + public String getResult() { return result; } - public void setResult(BigDecimal result) { + public void setResult(String result) { this.result = result; } diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf11.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf11.java index ec4b1c75f..1911ddbd9 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf11.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf11.java @@ -20,7 +20,7 @@ public class SDf11 extends SpcexObjectBase { private String quantity; private String securityCode; private String clientName; - private BigDecimal result; + private String result; private Instant generationTime; private Long generationId; @@ -72,11 +72,11 @@ public class SDf11 extends SpcexObjectBase { this.clientName = clientName; } - public BigDecimal getResult() { + public String getResult() { return result; } - public void setResult(BigDecimal result) { + public void setResult(String result) { this.result = result; } diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf12.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf12.java index 99073a3be..fbd878a88 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf12.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf12.java @@ -15,11 +15,14 @@ public class SDf12 extends SpcexObjectBase { private static final long serialVersionUID = ConstSerializable.serialVersionUID; private String outDocument; + private String direction; private String quantity; private String securityCode; private String depoCodeSender; private String depoCodeAdressee; - private BigDecimal result; + private String transactionNumber; + private String transactionQuantity; + private String result; private Instant generationTime; private Long generationId; @@ -31,6 +34,14 @@ public class SDf12 extends SpcexObjectBase { this.outDocument = outDocument; } + public String getDirection() { + return direction; + } + + public void setDirection(String direction) { + this.direction = direction; + } + public String getQuantity() { return quantity; } @@ -63,11 +74,27 @@ public class SDf12 extends SpcexObjectBase { this.depoCodeAdressee = depoCodeAdressee; } - public BigDecimal getResult() { + public String getTransactionNumber() { + return transactionNumber; + } + + public void setTransactionNumber(String transactionNumber) { + this.transactionNumber = transactionNumber; + } + + public String getTransactionQuantity() { + return transactionQuantity; + } + + public void setTransactionQuantity(String transactionQuantity) { + this.transactionQuantity = transactionQuantity; + } + + public String getResult() { return result; } - public void setResult(BigDecimal result) { + public void setResult(String result) { this.result = result; } diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf13.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf13.java index 15b14ef97..0dcef4a72 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf13.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf13.java @@ -16,7 +16,7 @@ public class SDf13 extends SpcexObjectBase { private String outDocument; private String inDocument; - private BigDecimal result; + private String result; private String textError; private String fileName; private Instant generationTime; @@ -38,11 +38,11 @@ public class SDf13 extends SpcexObjectBase { this.inDocument = inDocument; } - public BigDecimal getResult() { + public String getResult() { return result; } - public void setResult(BigDecimal result) { + public void setResult(String result) { this.result = result; } diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf14.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf14.java index ef977149f..40a86c01e 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf14.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf14.java @@ -15,7 +15,7 @@ public class SDf14 extends SpcexObjectBase { private static final long serialVersionUID = ConstSerializable.serialVersionUID; private String outDocument; - private BigDecimal result; + private String result; private Instant generationTime; private Long generationId; @@ -27,11 +27,11 @@ public class SDf14 extends SpcexObjectBase { this.outDocument = value; } - public BigDecimal getResult() { + public String getResult() { return result; } - public void setResult(BigDecimal value) { + public void setResult(String value) { this.result = value; } diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf53.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf53.java index 5f51902de..3f833bb8a 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf53.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf53.java @@ -17,7 +17,7 @@ public class SDf53 extends SpcexObjectBase { private String account; private String deal; private Long status; - private BigDecimal result; + private String result; private Instant generationTime; private Long generationId; private Long inSDfId; @@ -46,11 +46,11 @@ public class SDf53 extends SpcexObjectBase { this.status = value; } - public BigDecimal getResult() { + public String getResult() { return result; } - public void setResult(BigDecimal value) { + public void setResult(String value) { this.result = value; } diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FinishingSession.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FinishingSession.java index a1154e5d8..9aafe82d0 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FinishingSession.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FinishingSession.java @@ -141,7 +141,7 @@ public class FinishingSession implements ISessionStage { sdf05.setId(imdgProvider.getImdgIdGenerator().nextId()); sdf05.setTp(BigDecimal.valueOf(753)); sdf05.setDt(LocalDate.now()); - sdf05.setTm(LocalTime.now()); + sdf05.setTm(LocalTime.now().toString()); // todo уточнить формат для sdf05 sdf05.setPr("3"); sdf05.setGenerationTime(Instant.now()); sdf05.setGenerationId(imdgProvider.getImdgIdGenerator().nextId()); diff --git a/clearing-parent/dbf-exporter/src/test/java/ru/spcex/clearing/dbf/exporter/services/S_DF05_Test.java b/clearing-parent/dbf-exporter/src/test/java/ru/spcex/clearing/dbf/exporter/services/S_DF05_Test.java index 6f305c0ba..6cd675cd1 100644 --- a/clearing-parent/dbf-exporter/src/test/java/ru/spcex/clearing/dbf/exporter/services/S_DF05_Test.java +++ b/clearing-parent/dbf-exporter/src/test/java/ru/spcex/clearing/dbf/exporter/services/S_DF05_Test.java @@ -43,7 +43,7 @@ class S_DF05_Test extends AbstractServiceTest { sDf05.setGenerationId(generationId); sDf05.setTp(new BigDecimal(32)); sDf05.setDt(LocalDate.now()); - sDf05.setTm(LocalTime.now()); + sDf05.setTm(LocalTime.now().toString()); sDf05.setPr("deal"); map.insert(sDf05); SdfClearingRequest sdfClearingRequest = new SdfClearingRequest(); diff --git a/clearing-parent/dbf-exporter/src/test/java/ru/spcex/clearing/dbf/exporter/services/S_DF53_Test.java b/clearing-parent/dbf-exporter/src/test/java/ru/spcex/clearing/dbf/exporter/services/S_DF53_Test.java index 03fac5a52..08e27f5dd 100644 --- a/clearing-parent/dbf-exporter/src/test/java/ru/spcex/clearing/dbf/exporter/services/S_DF53_Test.java +++ b/clearing-parent/dbf-exporter/src/test/java/ru/spcex/clearing/dbf/exporter/services/S_DF53_Test.java @@ -42,7 +42,7 @@ class S_DF53_Test extends AbstractServiceTest { sDf53.setAccount("curr_code"); sDf53.setDeal("245367"); sDf53.setStatus(12345L); - sDf53.setResult(new BigDecimal(2345)); + sDf53.setResult("OK"); map.insert(sDf53); SdfClearingRequest sdfClearingRequest = new SdfClearingRequest(); sdfClearingRequest.setGroupId(generationId); diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/ExecutionDepositMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/ExecutionDepositMapStore.java index b6909d23b..d59b6e4b2 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/ExecutionDepositMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/ExecutionDepositMapStore.java @@ -39,7 +39,7 @@ public class ExecutionDepositMapStore extends TemplateMapStore "MARKET", "PRICE", "LOTS", "QUANTITY", "FIRST_LEG_AMOUNT", "SECOND_LEG_AMOUNT", "INTEREST_AMOUNT", "SIDE", "SETTLEMENT_CURRENCY", "COMPANY_ID", "DURATION", "FIRST_LEG_SETTLEMENT_DATE", "SECOND_LEG_SETTLEMENT_DATE", "FIRST_LEG_SETTLEMENT_CODE", "SECOND_LEG_SETTLEMENT_CODE", "SECURITY_FULL_NAME", "SECURITY_SYMBOL", - "SECURITY_ID", "CONTRACT", "COUNTER_PARTY_ID", "COVERAGE_STATUS", "SESSION_ID", "CLEARING_DATE" + "SECURITY_CODE", "SECURITY_ID", "CONTRACT", "COUNTER_PARTY_ID", "COVERAGE_STATUS", "SESSION_ID", "CLEARING_DATE" }; } @@ -70,6 +70,7 @@ public class ExecutionDepositMapStore extends TemplateMapStore object.setSecondLegSettlementCode(resultSet.getObject("SECOND_LEG_SETTLEMENT_CODE", String.class)); object.setSecurityFullName(resultSet.getObject("SECURITY_FULL_NAME", String.class)); object.setSecuritySymbol(resultSet.getObject("SECURITY_SYMBOL", String.class)); + object.setSecurityCode(resultSet.getObject("SECURITY_CODE", String.class)); object.setSecurityId(resultSet.getObject("SECURITY_ID", Long.class)); object.setContract(resultSet.getObject("CONTRACT", String.class)); object.setCounterPartyId(resultSet.getObject("COUNTER_PARTY_ID", Long.class)); @@ -106,6 +107,7 @@ public class ExecutionDepositMapStore extends TemplateMapStore object.getSecondLegSettlementCode(), object.getSecurityFullName(), object.getSecuritySymbol(), + object.getSecurityCode(), object.getSecurityId(), object.getContract(), object.getCounterPartyId(), diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf05MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf05MapStore.java index 88c86a7cd..47bdfa02b 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf05MapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf05MapStore.java @@ -41,7 +41,7 @@ public class SDf05MapStore extends TemplateMapStore { object.setId(resultSet.getObject("ID", Long.class)); object.setTp(resultSet.getObject("TP", BigDecimal.class)); object.setDt(getLocalDateFromSqlDate(resultSet, "DT")); - object.setTm(getLocalTimeFromSqlTime(resultSet, "TM")); + object.setTm(resultSet.getObject("TM", String.class)); object.setPr(resultSet.getObject("PR", String.class)); object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); @@ -54,7 +54,7 @@ public class SDf05MapStore extends TemplateMapStore { object.getId(), object.getTp(), TimeUtil.toDateFromLocalDate(object.getDt()), - TimeUtil.toDateFromLocalTime(object.getTm()), + object.getTm(), object.getPr(), TimeUtil.toDateFromInstant(object.getGenerationTime()), object.getGenerationId() diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf09MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf09MapStore.java index d704935e2..f29d05c01 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf09MapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf09MapStore.java @@ -45,7 +45,7 @@ public class SDf09MapStore extends TemplateMapStore { object.setQuantity(resultSet.getObject("QUANTITY", String.class)); object.setSecurityCode(resultSet.getObject("SECURITY_CODE", String.class)); object.setClientName(resultSet.getObject("CLIENT_NAME", String.class)); - object.setResult(resultSet.getObject("RESULT", BigDecimal.class)); + object.setResult(resultSet.getObject("RESULT", String.class)); object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); return object; diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf11MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf11MapStore.java index 67c69a293..eed66accc 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf11MapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf11MapStore.java @@ -45,7 +45,7 @@ public class SDf11MapStore extends TemplateMapStore { object.setQuantity(resultSet.getObject("QUANTITY", String.class)); object.setSecurityCode(resultSet.getObject("SECURITY_CODE", String.class)); object.setClientName(resultSet.getObject("CLIENT_NAME", String.class)); - object.setResult(resultSet.getObject("RESULT", BigDecimal.class)); + object.setResult(resultSet.getObject("RESULT", String.class)); object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); return object; diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf12MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf12MapStore.java index 8a0d1ec01..469d211c6 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf12MapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf12MapStore.java @@ -33,7 +33,7 @@ public class SDf12MapStore extends TemplateMapStore { @Override public String[] getFields() { return new String[]{ - "ID", "OUT_DOCUMENT", "QUANTITY", "SECURITY_CODE", "DEPO_CODE_SENDER", "DEPO_CODE_ADRESSEE", "RESULT", "GENERATION_TIME", "GENERATION_ID" + "ID", "OUT_DOCUMENT", "DIRECTION", "QUANTITY", "SECURITY_CODE", "DEPO_CODE_SENDER", "DEPO_CODE_ADRESSEE", "TRANSACTION_NUMBER", "TRANSACTION_QUANTITY", "RESULT", "GENERATION_TIME", "GENERATION_ID" }; } @@ -42,11 +42,14 @@ public class SDf12MapStore extends TemplateMapStore { SDf12 object = new SDf12(); object.setId(resultSet.getObject("ID", Long.class)); object.setOutDocument(resultSet.getObject("OUT_DOCUMENT", String.class)); + object.setDirection(resultSet.getObject("DIRECTION", String.class)); object.setQuantity(resultSet.getObject("QUANTITY", String.class)); object.setSecurityCode(resultSet.getObject("SECURITY_CODE", String.class)); object.setDepoCodeSender(resultSet.getObject("DEPO_CODE_SENDER", String.class)); object.setDepoCodeAdressee(resultSet.getObject("DEPO_CODE_ADRESSEE", String.class)); - object.setResult(resultSet.getObject("RESULT", BigDecimal.class)); + object.setTransactionNumber(resultSet.getObject("TRANSACTION_NUMBER", String.class)); + object.setTransactionQuantity(resultSet.getObject("TRANSACTION_QUANTITY", String.class)); + object.setResult(resultSet.getObject("RESULT", String.class)); object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); return object; @@ -57,10 +60,13 @@ public class SDf12MapStore extends TemplateMapStore { Object[] args = new Object[]{ object.getId(), object.getOutDocument(), + object.getDirection(), object.getQuantity(), object.getSecurityCode(), object.getDepoCodeSender(), object.getDepoCodeAdressee(), + object.getTransactionNumber(), + object.getTransactionQuantity(), object.getResult(), TimeUtil.toDateFromInstant(object.getGenerationTime()), object.getGenerationId() diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf13MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf13MapStore.java index a89719ba5..25c1abc6c 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf13MapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf13MapStore.java @@ -41,7 +41,7 @@ public class SDf13MapStore extends TemplateMapStore { object.setId(resultSet.getObject("ID", Long.class)); object.setOutDocument(resultSet.getObject("OUT_DOCUMENT", String.class)); object.setInDocument(resultSet.getObject("IN_DOCUMENT", String.class)); - object.setResult(resultSet.getObject("RESULT", BigDecimal.class)); + object.setResult(resultSet.getObject("RESULT", String.class)); object.setTextError(resultSet.getObject("TEXT_ERROR", String.class)); object.setFileName(resultSet.getObject("FILE_NAME", String.class)); object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf14MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf14MapStore.java index ab6c22e91..bb88f2dc4 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf14MapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf14MapStore.java @@ -40,7 +40,7 @@ public class SDf14MapStore extends TemplateMapStore { SDf14 object = new SDf14(); object.setId(resultSet.getObject("ID", Long.class)); object.setOutDocument(resultSet.getObject("OUT_DOCUMENT", String.class)); - object.setResult(resultSet.getObject("RESULT", BigDecimal.class)); + object.setResult(resultSet.getObject("RESULT", String.class)); object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); return object; diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf53MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf53MapStore.java index 4a7a16413..973539f4f 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf53MapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf53MapStore.java @@ -43,7 +43,7 @@ public class SDf53MapStore extends TemplateMapStore { object.setAccount(resultSet.getObject("ACCOUNT", String.class)); object.setDeal(resultSet.getObject("DEAL", String.class)); object.setStatus(resultSet.getObject("STATUS", Long.class)); - object.setResult(resultSet.getObject("RESULT", BigDecimal.class)); + object.setResult(resultSet.getObject("RESULT", String.class)); object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); object.setInSDfId(resultSet.getObject("IN_S_DF_ID", Long.class));