From 9a1a878513c9e8b25d8420dd6324365f03583d81 Mon Sep 17 00:00:00 2001 From: etreshenkov Date: Thu, 8 Jun 2023 16:36:23 +0300 Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-313 --- .../logic/data/tables/SDf52Table.java | 6 +- .../logic/data/tables/SDf55Table.java | 72 ++++++++++--------- 2 files changed, 41 insertions(+), 37 deletions(-) diff --git a/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/tables/SDf52Table.java b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/tables/SDf52Table.java index 730c518a8..f0a6f994a 100644 --- a/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/tables/SDf52Table.java +++ b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/tables/SDf52Table.java @@ -4,13 +4,14 @@ import ru.clearing.classes.statics.data.sdf.SDf52; import ru.spcex.clearing.dbf.importer.logic.data.enums.ETable; import ru.spcex.clearing.imdg.IMDGDistributedNames; +import java.math.BigDecimal; import java.time.Instant; public class SDf52Table extends AbstractTable { private static final String PREFIX = ETable.DF_52.name(); private static final Class CLAZZ = SDf52.class; - private static final String NAME_OF_HZ_MAP = IMDGDistributedNames.Map_SDf57; + private static final String NAME_OF_HZ_MAP = IMDGDistributedNames.Map_SDf52; public SDf52Table() { super(PREFIX, CLAZZ, NAME_OF_HZ_MAP); @@ -23,7 +24,8 @@ public class SDf52Table extends AbstractTable { result.setAcc_name((String) entity[1]); result.setDeal((String) entity[2]); result.setDate((String) entity[3]); - result.setStatus((Long) entity[4]); + BigDecimal status = (BigDecimal) entity[4]; + result.setStatus(status != null ? status.longValue() : null); result.setFileName(filename); result.setGenerationTime(Instant.now()); result.setGenerationId(fileId); diff --git a/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/tables/SDf55Table.java b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/tables/SDf55Table.java index daed9eafb..d1e11037b 100644 --- a/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/tables/SDf55Table.java +++ b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/tables/SDf55Table.java @@ -10,7 +10,7 @@ public class SDf55Table extends AbstractTable { private static final String PREFIX = ETable.DF_55.name(); private static final Class CLAZZ = SDf55.class; - private static final String NAME_OF_HZ_MAP = IMDGDistributedNames.Map_SDf57; + private static final String NAME_OF_HZ_MAP = IMDGDistributedNames.Map_SDf55; public SDf55Table() { super(PREFIX, CLAZZ, NAME_OF_HZ_MAP); @@ -22,41 +22,43 @@ public class SDf55Table extends AbstractTable { result.setSeg_type((String) entity[0]); result.setDoc_type((String) entity[1]); result.setDocnm_ref((String) entity[2]); - result.setDocnmprev((String) entity[4]); - result.setSbankcode((String) entity[5]); - result.setC_acc_deb((String) entity[6]); - result.setSbanknam1((String) entity[7]); - result.setSbanknam2((String) entity[8]); - result.setSbanknam3((String) entity[9]); - result.setSbanknam4((String) entity[10]); - result.setSbanknam5((String) entity[11]); - result.setRbankcode((String) entity[12]); - result.setC_acc_cred((String) entity[13]); - result.setRbanknam1((String) entity[14]); - result.setRbanknam2((String) entity[15]); - result.setRbanknam3((String) entity[16]); - result.setRbanknam4((String) entity[17]); - result.setRbanknam5((String) entity[18]); - result.setOp_type((String) entity[19]); + result.setDocnmprev((String) entity[3]); + result.setSbankcode((String) entity[4]); + result.setC_acc_deb((String) entity[5]); + result.setSbanknam1((String) entity[6]); + result.setSbanknam2((String) entity[7]); + result.setSbanknam3((String) entity[8]); + result.setSbanknam4((String) entity[9]); + result.setSbanknam5((String) entity[10]); + result.setRbankcode((String) entity[11]); + result.setC_acc_cred((String) entity[12]); + result.setRbanknam1((String) entity[13]); + result.setRbanknam2((String) entity[14]); + result.setRbanknam3((String) entity[15]); + result.setRbanknam4((String) entity[16]); + result.setRbanknam5((String) entity[17]); + result.setOp_type((String) entity[18]); + result.setOp_order((String) entity[19]); result.setPay_date((String) entity[20]); -// result.setExt_date((String) entity[21]); - result.setPay_val((String) entity[22]); - result.setSum_deb((String) entity[23]); - result.setSclientn1((String) entity[24]); - result.setSclientn2((String) entity[25]); - result.setSclientn3((String) entity[26]); - result.setSclientn4((String) entity[27]); - result.setInn_deb((String) entity[28]); - result.setKpp_deb((String) entity[29]); - result.setAcc_deb((String) entity[30]); - result.setRclientn1((String) entity[31]); - result.setRclientn2((String) entity[32]); - result.setRclientn3((String) entity[33]); - result.setRclientn4((String) entity[34]); -// result.setInn_cred((String) entity[]); -// result.setKpp_cred((String) entity[]); -// result.setAcc_kr((String) entity[]); -// result.setSpecif((String) entity[36]); + result.setPay_val((String) entity[21]); + result.setSum_deb((String) entity[22]); + result.setSclientn1((String) entity[23]); + result.setSclientn2((String) entity[24]); + result.setSclientn3((String) entity[25]); + result.setSclientn4((String) entity[26]); + result.setInn_deb((String) entity[27]); + result.setKpp_deb((String) entity[28]); + result.setAcc_deb((String) entity[29]); + result.setRclientn1((String) entity[30]); + result.setRclientn2((String) entity[31]); + result.setRclientn3((String) entity[32]); + result.setRclientn4((String) entity[33]); + result.setInn_cred((String) entity[34]); + result.setKpp_cred((String) entity[35]); + result.setAcc_kr_1((String) entity[36]); + result.setSpecif_1((String) entity[37]); + result.setSend_type((String) entity[38]); + result.setDoc_result((String) entity[39]); result.setFileName(filename); result.setGenerationTime(Instant.now()); result.setGenerationId(fileId);