diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/SDFProcessService.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/SDFProcessService.java index 499505dec..49378d886 100644 --- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/SDFProcessService.java +++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/SDFProcessService.java @@ -102,6 +102,7 @@ public class SDFProcessService { newSdf.setAccName(sdf52.getAcc_name()); newSdf.setAccount(sdf52.getAccount()); newSdf.setDeal(sdf52.getDeal()); + newSdf.setDate(sdf52.getDate()); newSdf.setStatus(sdf52.getStatus()); newSdf.setResult(result); newSdf.setGenerationTime(now); diff --git a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF53_Converter.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF53_Converter.java index 91e1e7623..fd9bc59a4 100644 --- a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF53_Converter.java +++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF53_Converter.java @@ -14,8 +14,9 @@ public class S_DF53_Converter extends DFConverter { public Object[] toObjectArray(SDf53 entity) { List values = new LinkedList<>(); values.add(typeMatch(entity.getAccount())); - values.add(typeMatch(entity.getDeal())); values.add(typeMatch(entity.getAccName())); + values.add(typeMatch(entity.getDeal())); + values.add(typeMatch(entity.getDate())); values.add(typeMatch(entity.getStatus())); values.add(typeMatch(entity.getResult())); return values.toArray(Object[]::new); @@ -27,6 +28,7 @@ public class S_DF53_Converter extends DFConverter { dbfFields.add(new DBFField("ACCOUNT", DBFDataType.CHARACTER, 25)); dbfFields.add(new DBFField("ACC_NAME", DBFDataType.CHARACTER, 30)); dbfFields.add(new DBFField("DEAL", DBFDataType.CHARACTER, 4)); + dbfFields.add(new DBFField("DATE", DBFDataType.CHARACTER, 8)); dbfFields.add(new DBFField("STATUS", DBFDataType.NUMERIC, 1,0)); dbfFields.add(new DBFField("RESULT", DBFDataType.CHARACTER, 10)); return dbfFields.toArray(DBFField[]::new);