http://jira.mfd.msk:8088/browse/CLS-874 xml-exporter DBF string splitting bug fixed
This commit is contained in:
Ivan Nikolaev-Axenov
parent
404cd991fd
commit
e3e8683c10
7 changed files with 111 additions and 330 deletions
|
|
@ -1,7 +1,6 @@
|
|||
package ru.spcex.clearing.xml.exporter.logic.data.tags.objects;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
|
||||
import java.time.LocalDate;
|
||||
|
|
@ -33,15 +32,7 @@ public class DF03ObjectTag extends ObjectTag<SDf03> {
|
|||
|
||||
@JacksonXmlProperty(isAttribute = true, localName = "SBANKNAM")
|
||||
@JsonSerialize(nullsUsing = NullSerializer.class)
|
||||
private String sbanknam1;
|
||||
@JsonIgnore
|
||||
private String sbanknam2;
|
||||
@JsonIgnore
|
||||
private String sbanknam3;
|
||||
@JsonIgnore
|
||||
private String sbanknam4;
|
||||
@JsonIgnore
|
||||
private String sbanknam5;
|
||||
private String sbanknam;
|
||||
|
||||
@JacksonXmlProperty(isAttribute = true, localName = "C_ACC_CRED")
|
||||
@JsonSerialize(nullsUsing = NullSerializer.class)
|
||||
|
|
@ -49,15 +40,7 @@ public class DF03ObjectTag extends ObjectTag<SDf03> {
|
|||
|
||||
@JacksonXmlProperty(isAttribute = true, localName = "RBANKNAM")
|
||||
@JsonSerialize(nullsUsing = NullSerializer.class)
|
||||
private String rbanknam1;
|
||||
@JsonIgnore
|
||||
private String rbanknam2;
|
||||
@JsonIgnore
|
||||
private String rbanknam3;
|
||||
@JsonIgnore
|
||||
private String rbanknam4;
|
||||
@JsonIgnore
|
||||
private String rbanknam5;
|
||||
private String rbanknam;
|
||||
|
||||
@JacksonXmlProperty(isAttribute = true, localName = "PAY_DATE")
|
||||
@JsonSerialize(nullsUsing = NullSerializer.class)
|
||||
|
|
@ -93,17 +76,17 @@ public class DF03ObjectTag extends ObjectTag<SDf03> {
|
|||
this.docnmRef = entity.getDocnm_ref();
|
||||
this.docnmprev = entity.getDocnmprev();
|
||||
this.cAccDeb = entity.getC_acc_deb();
|
||||
this.sbanknam1 = entity.getSbanknam1();
|
||||
this.sbanknam2 = entity.getSbanknam2();
|
||||
this.sbanknam3 = entity.getSbanknam3();
|
||||
this.sbanknam4 = entity.getSbanknam4();
|
||||
this.sbanknam5 = entity.getSbanknam5();
|
||||
this.sbanknam = getOrEmptyString(entity.getSbanknam1()) +
|
||||
getOrEmptyString(entity.getSbanknam2()) +
|
||||
getOrEmptyString(entity.getSbanknam3()) +
|
||||
getOrEmptyString(entity.getSbanknam4()) +
|
||||
getOrEmptyString(entity.getSbanknam5());
|
||||
this.cAccCred = entity.getC_acc_cred();
|
||||
this.rbanknam1 = entity.getRbanknam1();
|
||||
this.rbanknam2 = entity.getRbanknam2();
|
||||
this.rbanknam3 = entity.getRbanknam3();
|
||||
this.rbanknam4 = entity.getRbanknam4();
|
||||
this.rbanknam5 = entity.getRbanknam5();
|
||||
this.rbanknam = getOrEmptyString(entity.getRbanknam1()) +
|
||||
getOrEmptyString(entity.getRbanknam2()) +
|
||||
getOrEmptyString(entity.getRbanknam3()) +
|
||||
getOrEmptyString(entity.getRbanknam4()) +
|
||||
getOrEmptyString(entity.getRbanknam5());
|
||||
this.payDate = entity.getPay_date() != null ? LocalDate.parse(entity.getPay_date(), dtf) : null;
|
||||
this.payVal = entity.getPay_val();
|
||||
this.sumDeb = entity.getSum_deb();
|
||||
|
|
@ -156,44 +139,12 @@ public class DF03ObjectTag extends ObjectTag<SDf03> {
|
|||
this.cAccDeb = cAccDeb;
|
||||
}
|
||||
|
||||
public String getSbanknam1() {
|
||||
return sbanknam1;
|
||||
public String getSbanknam() {
|
||||
return sbanknam;
|
||||
}
|
||||
|
||||
public void setSbanknam1(String sbanknam1) {
|
||||
this.sbanknam1 = sbanknam1;
|
||||
}
|
||||
|
||||
public String getSbanknam2() {
|
||||
return sbanknam2;
|
||||
}
|
||||
|
||||
public void setSbanknam2(String sbanknam2) {
|
||||
this.sbanknam2 = sbanknam2;
|
||||
}
|
||||
|
||||
public String getSbanknam3() {
|
||||
return sbanknam3;
|
||||
}
|
||||
|
||||
public void setSbanknam3(String sbanknam3) {
|
||||
this.sbanknam3 = sbanknam3;
|
||||
}
|
||||
|
||||
public String getSbanknam4() {
|
||||
return sbanknam4;
|
||||
}
|
||||
|
||||
public void setSbanknam4(String sbanknam4) {
|
||||
this.sbanknam4 = sbanknam4;
|
||||
}
|
||||
|
||||
public String getSbanknam5() {
|
||||
return sbanknam5;
|
||||
}
|
||||
|
||||
public void setSbanknam5(String sbanknam5) {
|
||||
this.sbanknam5 = sbanknam5;
|
||||
public void setSbanknam(String sbanknam) {
|
||||
this.sbanknam = sbanknam;
|
||||
}
|
||||
|
||||
public String getcAccCred() {
|
||||
|
|
@ -204,44 +155,12 @@ public class DF03ObjectTag extends ObjectTag<SDf03> {
|
|||
this.cAccCred = cAccCred;
|
||||
}
|
||||
|
||||
public String getRbanknam1() {
|
||||
return rbanknam1;
|
||||
public String getRbanknam() {
|
||||
return rbanknam;
|
||||
}
|
||||
|
||||
public void setRbanknam1(String rbanknam1) {
|
||||
this.rbanknam1 = rbanknam1;
|
||||
}
|
||||
|
||||
public String getRbanknam2() {
|
||||
return rbanknam2;
|
||||
}
|
||||
|
||||
public void setRbanknam2(String rbanknam2) {
|
||||
this.rbanknam2 = rbanknam2;
|
||||
}
|
||||
|
||||
public String getRbanknam3() {
|
||||
return rbanknam3;
|
||||
}
|
||||
|
||||
public void setRbanknam3(String rbanknam3) {
|
||||
this.rbanknam3 = rbanknam3;
|
||||
}
|
||||
|
||||
public String getRbanknam4() {
|
||||
return rbanknam4;
|
||||
}
|
||||
|
||||
public void setRbanknam4(String rbanknam4) {
|
||||
this.rbanknam4 = rbanknam4;
|
||||
}
|
||||
|
||||
public String getRbanknam5() {
|
||||
return rbanknam5;
|
||||
}
|
||||
|
||||
public void setRbanknam5(String rbanknam5) {
|
||||
this.rbanknam5 = rbanknam5;
|
||||
public void setRbanknam(String rbanknam) {
|
||||
this.rbanknam = rbanknam;
|
||||
}
|
||||
|
||||
public LocalDate getPayDate() {
|
||||
|
|
@ -286,15 +205,14 @@ public class DF03ObjectTag extends ObjectTag<SDf03> {
|
|||
|
||||
@Override
|
||||
public boolean equals(Object o) {
|
||||
if (this == o) return true;
|
||||
if (o == null || getClass() != o.getClass()) return false;
|
||||
DF03ObjectTag that = (DF03ObjectTag) o;
|
||||
return Objects.equals(segType, that.segType) && Objects.equals(docType, that.docType) && Objects.equals(docnmRef, that.docnmRef) && Objects.equals(docnmprev, that.docnmprev) && Objects.equals(cAccDeb, that.cAccDeb) && Objects.equals(sbanknam1, that.sbanknam1) && Objects.equals(sbanknam2, that.sbanknam2) && Objects.equals(sbanknam3, that.sbanknam3) && Objects.equals(sbanknam4, that.sbanknam4) && Objects.equals(sbanknam5, that.sbanknam5) && Objects.equals(cAccCred, that.cAccCred) && Objects.equals(rbanknam1, that.rbanknam1) && Objects.equals(rbanknam2, that.rbanknam2) && Objects.equals(rbanknam3, that.rbanknam3) && Objects.equals(rbanknam4, that.rbanknam4) && Objects.equals(rbanknam5, that.rbanknam5) && Objects.equals(payDate, that.payDate) && Objects.equals(payVal, that.payVal) && Objects.equals(sumDeb, that.sumDeb) && Objects.equals(specif1, that.specif1) && Objects.equals(impResult, that.impResult);
|
||||
return Objects.equals(segType, that.segType) && Objects.equals(docType, that.docType) && Objects.equals(docnmRef, that.docnmRef) && Objects.equals(docnmprev, that.docnmprev) && Objects.equals(cAccDeb, that.cAccDeb) && Objects.equals(sbanknam, that.sbanknam) && Objects.equals(cAccCred, that.cAccCred) && Objects.equals(rbanknam, that.rbanknam) && Objects.equals(payDate, that.payDate) && Objects.equals(payVal, that.payVal) && Objects.equals(sumDeb, that.sumDeb) && Objects.equals(specif1, that.specif1) && Objects.equals(impResult, that.impResult);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return Objects.hash(segType, docType, docnmRef, docnmprev, cAccDeb, sbanknam1, sbanknam2, sbanknam3, sbanknam4, sbanknam5, cAccCred, rbanknam1, rbanknam2, rbanknam3, rbanknam4, rbanknam5, payDate, payVal, sumDeb, specif1, impResult);
|
||||
return Objects.hash(segType, docType, docnmRef, docnmprev, cAccDeb, sbanknam, cAccCred, rbanknam, payDate, payVal, sumDeb, specif1, impResult);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -305,17 +223,9 @@ public class DF03ObjectTag extends ObjectTag<SDf03> {
|
|||
", docnmRef='" + docnmRef + '\'' +
|
||||
", docnmprev='" + docnmprev + '\'' +
|
||||
", cAccDeb='" + cAccDeb + '\'' +
|
||||
", sbanknam1='" + sbanknam1 + '\'' +
|
||||
", sbanknam2='" + sbanknam2 + '\'' +
|
||||
", sbanknam3='" + sbanknam3 + '\'' +
|
||||
", sbanknam4='" + sbanknam4 + '\'' +
|
||||
", sbanknam5='" + sbanknam5 + '\'' +
|
||||
", sbanknam='" + sbanknam + '\'' +
|
||||
", cAccCred='" + cAccCred + '\'' +
|
||||
", rbanknam1='" + rbanknam1 + '\'' +
|
||||
", rbanknam2='" + rbanknam2 + '\'' +
|
||||
", rbanknam3='" + rbanknam3 + '\'' +
|
||||
", rbanknam4='" + rbanknam4 + '\'' +
|
||||
", rbanknam5='" + rbanknam5 + '\'' +
|
||||
", rbanknam='" + rbanknam + '\'' +
|
||||
", payDate=" + payDate +
|
||||
", payVal='" + payVal + '\'' +
|
||||
", sumDeb='" + sumDeb + '\'' +
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
package ru.spcex.clearing.xml.exporter.logic.data.tags.objects;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
|
||||
import java.time.LocalDate;
|
||||
|
|
@ -37,15 +36,7 @@ public class DF54ObjectTag extends ObjectTag<SDf54> {
|
|||
|
||||
@JacksonXmlProperty(isAttribute = true, localName = "SBANKNAM")
|
||||
@JsonSerialize(nullsUsing = NullSerializer.class)
|
||||
private String sbanknam1;
|
||||
@JsonIgnore
|
||||
private String sbanknam2;
|
||||
@JsonIgnore
|
||||
private String sbanknam3;
|
||||
@JsonIgnore
|
||||
private String sbanknam4;
|
||||
@JsonIgnore
|
||||
private String sbanknam5;
|
||||
private String sbanknam;
|
||||
|
||||
@JacksonXmlProperty(isAttribute = true, localName = "RBANKCODE")
|
||||
@JsonSerialize(nullsUsing = NullSerializer.class)
|
||||
|
|
@ -57,15 +48,7 @@ public class DF54ObjectTag extends ObjectTag<SDf54> {
|
|||
|
||||
@JacksonXmlProperty(isAttribute = true, localName = "RBANKNAM")
|
||||
@JsonSerialize(nullsUsing = NullSerializer.class)
|
||||
private String rbanknam1;
|
||||
@JsonIgnore
|
||||
private String rbanknam2;
|
||||
@JsonIgnore
|
||||
private String rbanknam3;
|
||||
@JsonIgnore
|
||||
private String rbanknam4;
|
||||
@JsonIgnore
|
||||
private String rbanknam5;
|
||||
private String rbanknam;
|
||||
|
||||
@JacksonXmlProperty(isAttribute = true, localName = "OP_TYPE")
|
||||
@JsonSerialize(nullsUsing = NullSerializer.class)
|
||||
|
|
@ -90,13 +73,7 @@ public class DF54ObjectTag extends ObjectTag<SDf54> {
|
|||
|
||||
@JacksonXmlProperty(isAttribute = true, localName = "SCLIENTN")
|
||||
@JsonSerialize(nullsUsing = NullSerializer.class)
|
||||
private String sclientn1;
|
||||
@JsonIgnore
|
||||
private String sclientn2;
|
||||
@JsonIgnore
|
||||
private String sclientn3;
|
||||
@JsonIgnore
|
||||
private String sclientn4;
|
||||
private String sclientn;
|
||||
|
||||
@JacksonXmlProperty(isAttribute = true, localName = "INN_DEB")
|
||||
@JsonSerialize(nullsUsing = NullSerializer.class)
|
||||
|
|
@ -112,13 +89,7 @@ public class DF54ObjectTag extends ObjectTag<SDf54> {
|
|||
|
||||
@JacksonXmlProperty(isAttribute = true, localName = "RCLIENTN")
|
||||
@JsonSerialize(nullsUsing = NullSerializer.class)
|
||||
private String rclientn1;
|
||||
@JsonIgnore
|
||||
private String rclientn2;
|
||||
@JsonIgnore
|
||||
private String rclientn3;
|
||||
@JsonIgnore
|
||||
private String rclientn4;
|
||||
private String rclientn;
|
||||
|
||||
@JacksonXmlProperty(isAttribute = true, localName = "INN_CRED")
|
||||
@JsonSerialize(nullsUsing = NullSerializer.class)
|
||||
|
|
@ -179,34 +150,34 @@ public class DF54ObjectTag extends ObjectTag<SDf54> {
|
|||
this.docnmprev = entity.getDocnmprev();
|
||||
this.sbankcode = entity.getSbankcode();
|
||||
this.cAccDeb = entity.getC_acc_deb();
|
||||
this.sbanknam1 = entity.getSbanknam1();
|
||||
this.sbanknam2 = entity.getSbanknam2();
|
||||
this.sbanknam3 = entity.getSbanknam3();
|
||||
this.sbanknam4 = entity.getSbanknam4();
|
||||
this.sbanknam5 = entity.getSbanknam5();
|
||||
this.sbanknam = getOrEmptyString(entity.getSbanknam1()) +
|
||||
getOrEmptyString(entity.getSbanknam2()) +
|
||||
getOrEmptyString(entity.getSbanknam3()) +
|
||||
getOrEmptyString(entity.getSbanknam4()) +
|
||||
getOrEmptyString(entity.getSbanknam5());
|
||||
this.rbankcode = entity.getRbankcode();
|
||||
this.cAccCred = entity.getC_acc_cred();
|
||||
this.rbanknam1 = entity.getRbanknam1();
|
||||
this.rbanknam2 = entity.getRbanknam2();
|
||||
this.rbanknam3 = entity.getRbanknam3();
|
||||
this.rbanknam4 = entity.getRbanknam4();
|
||||
this.rbanknam5 = entity.getRbanknam5();
|
||||
this.rbanknam = getOrEmptyString(entity.getRbanknam1()) +
|
||||
getOrEmptyString(entity.getRbanknam2()) +
|
||||
getOrEmptyString(entity.getRbanknam3()) +
|
||||
getOrEmptyString(entity.getRbanknam4()) +
|
||||
getOrEmptyString(entity.getRbanknam5());
|
||||
this.opType = entity.getOp_type();
|
||||
this.opOrder = entity.getOp_order();
|
||||
this.payDate = entity.getPay_date() != null ? LocalDate.parse(entity.getPay_date(), dtf) : null;
|
||||
this.payVal = entity.getPay_val();
|
||||
this.sumDeb = entity.getSum_deb();
|
||||
this.sclientn1 = entity.getSclientn1();
|
||||
this.sclientn2 = entity.getSclientn2();
|
||||
this.sclientn3 = entity.getSclientn3();
|
||||
this.sclientn4 = entity.getSclientn4();
|
||||
this.sclientn = getOrEmptyString(entity.getSclientn1()) +
|
||||
getOrEmptyString(entity.getSclientn2()) +
|
||||
getOrEmptyString(entity.getSclientn3()) +
|
||||
getOrEmptyString(entity.getSclientn4());
|
||||
this.innDeb = entity.getInn_deb();
|
||||
this.kppDeb = entity.getKpp_deb();
|
||||
this.accDeb = entity.getAcc_deb();
|
||||
this.rclientn1 = entity.getRclientn1();
|
||||
this.rclientn2 = entity.getRclientn2();
|
||||
this.rclientn3 = entity.getRclientn3();
|
||||
this.rclientn4 = entity.getRclientn4();
|
||||
this.rclientn = getOrEmptyString(entity.getRclientn1()) +
|
||||
getOrEmptyString(entity.getRclientn2()) +
|
||||
getOrEmptyString(entity.getRclientn3()) +
|
||||
getOrEmptyString(entity.getRclientn4());
|
||||
this.innCred = entity.getInn_cred();
|
||||
this.kppCred = entity.getKpp_cred();
|
||||
this.accKr1 = entity.getAcc_kr_1();
|
||||
|
|
@ -273,44 +244,12 @@ public class DF54ObjectTag extends ObjectTag<SDf54> {
|
|||
this.cAccDeb = cAccDeb;
|
||||
}
|
||||
|
||||
public String getSbanknam1() {
|
||||
return sbanknam1;
|
||||
public String getSbanknam() {
|
||||
return sbanknam;
|
||||
}
|
||||
|
||||
public void setSbanknam1(String sbanknam1) {
|
||||
this.sbanknam1 = sbanknam1;
|
||||
}
|
||||
|
||||
public String getSbanknam2() {
|
||||
return sbanknam2;
|
||||
}
|
||||
|
||||
public void setSbanknam2(String sbanknam2) {
|
||||
this.sbanknam2 = sbanknam2;
|
||||
}
|
||||
|
||||
public String getSbanknam3() {
|
||||
return sbanknam3;
|
||||
}
|
||||
|
||||
public void setSbanknam3(String sbanknam3) {
|
||||
this.sbanknam3 = sbanknam3;
|
||||
}
|
||||
|
||||
public String getSbanknam4() {
|
||||
return sbanknam4;
|
||||
}
|
||||
|
||||
public void setSbanknam4(String sbanknam4) {
|
||||
this.sbanknam4 = sbanknam4;
|
||||
}
|
||||
|
||||
public String getSbanknam5() {
|
||||
return sbanknam5;
|
||||
}
|
||||
|
||||
public void setSbanknam5(String sbanknam5) {
|
||||
this.sbanknam5 = sbanknam5;
|
||||
public void setSbanknam(String sbanknam) {
|
||||
this.sbanknam = sbanknam;
|
||||
}
|
||||
|
||||
public String getRbankcode() {
|
||||
|
|
@ -329,44 +268,12 @@ public class DF54ObjectTag extends ObjectTag<SDf54> {
|
|||
this.cAccCred = cAccCred;
|
||||
}
|
||||
|
||||
public String getRbanknam1() {
|
||||
return rbanknam1;
|
||||
public String getRbanknam() {
|
||||
return rbanknam;
|
||||
}
|
||||
|
||||
public void setRbanknam1(String rbanknam1) {
|
||||
this.rbanknam1 = rbanknam1;
|
||||
}
|
||||
|
||||
public String getRbanknam2() {
|
||||
return rbanknam2;
|
||||
}
|
||||
|
||||
public void setRbanknam2(String rbanknam2) {
|
||||
this.rbanknam2 = rbanknam2;
|
||||
}
|
||||
|
||||
public String getRbanknam3() {
|
||||
return rbanknam3;
|
||||
}
|
||||
|
||||
public void setRbanknam3(String rbanknam3) {
|
||||
this.rbanknam3 = rbanknam3;
|
||||
}
|
||||
|
||||
public String getRbanknam4() {
|
||||
return rbanknam4;
|
||||
}
|
||||
|
||||
public void setRbanknam4(String rbanknam4) {
|
||||
this.rbanknam4 = rbanknam4;
|
||||
}
|
||||
|
||||
public String getRbanknam5() {
|
||||
return rbanknam5;
|
||||
}
|
||||
|
||||
public void setRbanknam5(String rbanknam5) {
|
||||
this.rbanknam5 = rbanknam5;
|
||||
public void setRbanknam(String rbanknam) {
|
||||
this.rbanknam = rbanknam;
|
||||
}
|
||||
|
||||
public String getOpType() {
|
||||
|
|
@ -409,36 +316,12 @@ public class DF54ObjectTag extends ObjectTag<SDf54> {
|
|||
this.sumDeb = sumDeb;
|
||||
}
|
||||
|
||||
public String getSclientn1() {
|
||||
return sclientn1;
|
||||
public String getSclientn() {
|
||||
return sclientn;
|
||||
}
|
||||
|
||||
public void setSclientn1(String sclientn1) {
|
||||
this.sclientn1 = sclientn1;
|
||||
}
|
||||
|
||||
public String getSclientn2() {
|
||||
return sclientn2;
|
||||
}
|
||||
|
||||
public void setSclientn2(String sclientn2) {
|
||||
this.sclientn2 = sclientn2;
|
||||
}
|
||||
|
||||
public String getSclientn3() {
|
||||
return sclientn3;
|
||||
}
|
||||
|
||||
public void setSclientn3(String sclientn3) {
|
||||
this.sclientn3 = sclientn3;
|
||||
}
|
||||
|
||||
public String getSclientn4() {
|
||||
return sclientn4;
|
||||
}
|
||||
|
||||
public void setSclientn4(String sclientn4) {
|
||||
this.sclientn4 = sclientn4;
|
||||
public void setSclientn(String sclientn) {
|
||||
this.sclientn = sclientn;
|
||||
}
|
||||
|
||||
public String getInnDeb() {
|
||||
|
|
@ -465,36 +348,12 @@ public class DF54ObjectTag extends ObjectTag<SDf54> {
|
|||
this.accDeb = accDeb;
|
||||
}
|
||||
|
||||
public String getRclientn1() {
|
||||
return rclientn1;
|
||||
public String getRclientn() {
|
||||
return rclientn;
|
||||
}
|
||||
|
||||
public void setRclientn1(String rclientn1) {
|
||||
this.rclientn1 = rclientn1;
|
||||
}
|
||||
|
||||
public String getRclientn2() {
|
||||
return rclientn2;
|
||||
}
|
||||
|
||||
public void setRclientn2(String rclientn2) {
|
||||
this.rclientn2 = rclientn2;
|
||||
}
|
||||
|
||||
public String getRclientn3() {
|
||||
return rclientn3;
|
||||
}
|
||||
|
||||
public void setRclientn3(String rclientn3) {
|
||||
this.rclientn3 = rclientn3;
|
||||
}
|
||||
|
||||
public String getRclientn4() {
|
||||
return rclientn4;
|
||||
}
|
||||
|
||||
public void setRclientn4(String rclientn4) {
|
||||
this.rclientn4 = rclientn4;
|
||||
public void setRclientn(String rclientn) {
|
||||
this.rclientn = rclientn;
|
||||
}
|
||||
|
||||
public String getInnCred() {
|
||||
|
|
@ -587,15 +446,14 @@ public class DF54ObjectTag extends ObjectTag<SDf54> {
|
|||
|
||||
@Override
|
||||
public boolean equals(Object o) {
|
||||
if (this == o) return true;
|
||||
if (o == null || getClass() != o.getClass()) return false;
|
||||
DF54ObjectTag that = (DF54ObjectTag) o;
|
||||
return Objects.equals(segType, that.segType) && Objects.equals(docType, that.docType) && Objects.equals(docnmRef, that.docnmRef) && Objects.equals(docnmprev, that.docnmprev) && Objects.equals(sbankcode, that.sbankcode) && Objects.equals(cAccDeb, that.cAccDeb) && Objects.equals(sbanknam1, that.sbanknam1) && Objects.equals(sbanknam2, that.sbanknam2) && Objects.equals(sbanknam3, that.sbanknam3) && Objects.equals(sbanknam4, that.sbanknam4) && Objects.equals(sbanknam5, that.sbanknam5) && Objects.equals(rbankcode, that.rbankcode) && Objects.equals(cAccCred, that.cAccCred) && Objects.equals(rbanknam1, that.rbanknam1) && Objects.equals(rbanknam2, that.rbanknam2) && Objects.equals(rbanknam3, that.rbanknam3) && Objects.equals(rbanknam4, that.rbanknam4) && Objects.equals(rbanknam5, that.rbanknam5) && Objects.equals(opType, that.opType) && Objects.equals(opOrder, that.opOrder) && Objects.equals(payDate, that.payDate) && Objects.equals(payVal, that.payVal) && Objects.equals(sumDeb, that.sumDeb) && Objects.equals(sclientn1, that.sclientn1) && Objects.equals(sclientn2, that.sclientn2) && Objects.equals(sclientn3, that.sclientn3) && Objects.equals(sclientn4, that.sclientn4) && Objects.equals(innDeb, that.innDeb) && Objects.equals(kppDeb, that.kppDeb) && Objects.equals(accDeb, that.accDeb) && Objects.equals(rclientn1, that.rclientn1) && Objects.equals(rclientn2, that.rclientn2) && Objects.equals(rclientn3, that.rclientn3) && Objects.equals(rclientn4, that.rclientn4) && Objects.equals(innCred, that.innCred) && Objects.equals(kppCred, that.kppCred) && Objects.equals(accKr1, that.accKr1) && Objects.equals(specif1, that.specif1) && Objects.equals(sendType, that.sendType) && Objects.equals(docResult, that.docResult) && Objects.equals(docNum, that.docNum) && Objects.equals(docDate, that.docDate) && Objects.equals(valueDate, that.valueDate) && Objects.equals(swiftBen, that.swiftBen) && Objects.equals(swiftInt, that.swiftInt);
|
||||
return Objects.equals(segType, that.segType) && Objects.equals(docType, that.docType) && Objects.equals(docnmRef, that.docnmRef) && Objects.equals(docnmprev, that.docnmprev) && Objects.equals(sbankcode, that.sbankcode) && Objects.equals(cAccDeb, that.cAccDeb) && Objects.equals(sbanknam, that.sbanknam) && Objects.equals(rbankcode, that.rbankcode) && Objects.equals(cAccCred, that.cAccCred) && Objects.equals(rbanknam, that.rbanknam) && Objects.equals(opType, that.opType) && Objects.equals(opOrder, that.opOrder) && Objects.equals(payDate, that.payDate) && Objects.equals(payVal, that.payVal) && Objects.equals(sumDeb, that.sumDeb) && Objects.equals(sclientn, that.sclientn) && Objects.equals(innDeb, that.innDeb) && Objects.equals(kppDeb, that.kppDeb) && Objects.equals(accDeb, that.accDeb) && Objects.equals(rclientn, that.rclientn) && Objects.equals(innCred, that.innCred) && Objects.equals(kppCred, that.kppCred) && Objects.equals(accKr1, that.accKr1) && Objects.equals(specif1, that.specif1) && Objects.equals(sendType, that.sendType) && Objects.equals(docResult, that.docResult) && Objects.equals(docNum, that.docNum) && Objects.equals(docDate, that.docDate) && Objects.equals(valueDate, that.valueDate) && Objects.equals(swiftBen, that.swiftBen) && Objects.equals(swiftInt, that.swiftInt);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return Objects.hash(segType, docType, docnmRef, docnmprev, sbankcode, cAccDeb, sbanknam1, sbanknam2, sbanknam3, sbanknam4, sbanknam5, rbankcode, cAccCred, rbanknam1, rbanknam2, rbanknam3, rbanknam4, rbanknam5, opType, opOrder, payDate, payVal, sumDeb, sclientn1, sclientn2, sclientn3, sclientn4, innDeb, kppDeb, accDeb, rclientn1, rclientn2, rclientn3, rclientn4, innCred, kppCred, accKr1, specif1, sendType, docResult, docNum, docDate, valueDate, swiftBen, swiftInt);
|
||||
return Objects.hash(segType, docType, docnmRef, docnmprev, sbankcode, cAccDeb, sbanknam, rbankcode, cAccCred, rbanknam, opType, opOrder, payDate, payVal, sumDeb, sclientn, innDeb, kppDeb, accDeb, rclientn, innCred, kppCred, accKr1, specif1, sendType, docResult, docNum, docDate, valueDate, swiftBen, swiftInt);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -607,34 +465,20 @@ public class DF54ObjectTag extends ObjectTag<SDf54> {
|
|||
", docnmprev='" + docnmprev + '\'' +
|
||||
", sbankcode='" + sbankcode + '\'' +
|
||||
", cAccDeb='" + cAccDeb + '\'' +
|
||||
", sbanknam1='" + sbanknam1 + '\'' +
|
||||
", sbanknam2='" + sbanknam2 + '\'' +
|
||||
", sbanknam3='" + sbanknam3 + '\'' +
|
||||
", sbanknam4='" + sbanknam4 + '\'' +
|
||||
", sbanknam5='" + sbanknam5 + '\'' +
|
||||
", sbanknam='" + sbanknam + '\'' +
|
||||
", rbankcode='" + rbankcode + '\'' +
|
||||
", cAccCred='" + cAccCred + '\'' +
|
||||
", rbanknam1='" + rbanknam1 + '\'' +
|
||||
", rbanknam2='" + rbanknam2 + '\'' +
|
||||
", rbanknam3='" + rbanknam3 + '\'' +
|
||||
", rbanknam4='" + rbanknam4 + '\'' +
|
||||
", rbanknam5='" + rbanknam5 + '\'' +
|
||||
", rbanknam='" + rbanknam + '\'' +
|
||||
", opType='" + opType + '\'' +
|
||||
", opOrder='" + opOrder + '\'' +
|
||||
", payDate=" + payDate +
|
||||
", payVal='" + payVal + '\'' +
|
||||
", sumDeb='" + sumDeb + '\'' +
|
||||
", sclientn1='" + sclientn1 + '\'' +
|
||||
", sclientn2='" + sclientn2 + '\'' +
|
||||
", sclientn3='" + sclientn3 + '\'' +
|
||||
", sclientn4='" + sclientn4 + '\'' +
|
||||
", sclientn='" + sclientn + '\'' +
|
||||
", innDeb='" + innDeb + '\'' +
|
||||
", kppDeb='" + kppDeb + '\'' +
|
||||
", accDeb='" + accDeb + '\'' +
|
||||
", rclientn1='" + rclientn1 + '\'' +
|
||||
", rclientn2='" + rclientn2 + '\'' +
|
||||
", rclientn3='" + rclientn3 + '\'' +
|
||||
", rclientn4='" + rclientn4 + '\'' +
|
||||
", rclientn='" + rclientn + '\'' +
|
||||
", innCred='" + innCred + '\'' +
|
||||
", kppCred='" + kppCred + '\'' +
|
||||
", accKr1='" + accKr1 + '\'' +
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
package ru.spcex.clearing.xml.exporter.logic.data.tags.objects;
|
||||
|
||||
import java.lang.reflect.Constructor;
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||
import com.fasterxml.jackson.annotation.JsonSubTypes;
|
||||
import com.fasterxml.jackson.annotation.JsonTypeInfo;
|
||||
import java.lang.reflect.Constructor;
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
import java.util.Optional;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import ru.spcex.platform.classes.base.SpcexObjectBase;
|
||||
|
|
@ -47,4 +48,8 @@ public abstract class ObjectTag<T1 extends SpcexObjectBase> {
|
|||
}
|
||||
return cloneObj;
|
||||
}
|
||||
|
||||
public String getOrEmptyString(String str) {
|
||||
return Optional.ofNullable(str).orElse("");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -98,9 +98,17 @@ public class ExportSf03FromHazelcastTest {
|
|||
expectedSDf03.setDocnm_ref("test3");
|
||||
expectedSDf03.setDocnmprev("test4");
|
||||
expectedSDf03.setC_acc_deb("test5");
|
||||
expectedSDf03.setSbanknam1("test6");
|
||||
expectedSDf03.setSbanknam1("sbanknam1");
|
||||
expectedSDf03.setSbanknam2("sbanknam2");
|
||||
expectedSDf03.setSbanknam3("sbanknam3");
|
||||
expectedSDf03.setSbanknam4("sbanknam4");
|
||||
expectedSDf03.setSbanknam5(null);
|
||||
expectedSDf03.setC_acc_cred("test7");
|
||||
expectedSDf03.setRbanknam1("test8");
|
||||
expectedSDf03.setRbanknam1("rbanknam1");
|
||||
expectedSDf03.setRbanknam2("rbanknam2");
|
||||
expectedSDf03.setRbanknam3("rbanknam3");
|
||||
expectedSDf03.setRbanknam4("rbanknam4");
|
||||
expectedSDf03.setRbanknam5(null);
|
||||
expectedSDf03.setPay_date("14.03.24");
|
||||
expectedSDf03.setPay_val("test9");
|
||||
expectedSDf03.setSum_deb("test10");
|
||||
|
|
@ -123,9 +131,9 @@ public class ExportSf03FromHazelcastTest {
|
|||
Assertions.assertThat(actualObjectTag.getDocnmRef()).isEqualTo(expectedSDf03.getDocnm_ref());
|
||||
Assertions.assertThat(actualObjectTag.getDocnmprev()).isEqualTo(expectedSDf03.getDocnmprev());
|
||||
Assertions.assertThat(actualObjectTag.getcAccDeb()).isEqualTo(expectedSDf03.getC_acc_deb());
|
||||
Assertions.assertThat(actualObjectTag.getSbanknam1()).isEqualTo(expectedSDf03.getSbanknam1());
|
||||
Assertions.assertThat(actualObjectTag.getSbanknam()).isEqualTo(expectedSDf03.getSbanknam1() + expectedSDf03.getSbanknam2() + expectedSDf03.getSbanknam3() + expectedSDf03.getSbanknam4());
|
||||
Assertions.assertThat(actualObjectTag.getcAccCred()).isEqualTo(expectedSDf03.getC_acc_cred());
|
||||
Assertions.assertThat(actualObjectTag.getRbanknam1()).isEqualTo(expectedSDf03.getRbanknam1());
|
||||
Assertions.assertThat(actualObjectTag.getRbanknam()).isEqualTo(expectedSDf03.getRbanknam1() + expectedSDf03.getRbanknam2() + expectedSDf03.getRbanknam3() + expectedSDf03.getRbanknam4());
|
||||
Assertions.assertThat(actualObjectTag.getPayDate().format(formatter)).isEqualTo(expectedSDf03.getPay_date());
|
||||
Assertions.assertThat(actualObjectTag.getPayVal()).isEqualTo(expectedSDf03.getPay_val());
|
||||
Assertions.assertThat(actualObjectTag.getSumDeb()).isEqualTo(expectedSDf03.getSum_deb());
|
||||
|
|
|
|||
|
|
@ -99,20 +99,34 @@ public class ExportSf54FromHazelcastTest {
|
|||
expectedSDf54.setDocnmprev("test4");
|
||||
expectedSDf54.setSbankcode("test5");
|
||||
expectedSDf54.setC_acc_deb("test6");
|
||||
expectedSDf54.setSbanknam1("test7");
|
||||
expectedSDf54.setSbanknam1("sbanknam1");
|
||||
expectedSDf54.setSbanknam2("sbanknam2");
|
||||
expectedSDf54.setSbanknam3("sbanknam3");
|
||||
expectedSDf54.setSbanknam4("sbanknam4");
|
||||
expectedSDf54.setSbanknam5(null);
|
||||
expectedSDf54.setRbankcode("test8");
|
||||
expectedSDf54.setC_acc_cred("test9");
|
||||
expectedSDf54.setRbanknam1("test10");
|
||||
expectedSDf54.setRbanknam1("rbanknam1");
|
||||
expectedSDf54.setRbanknam2("rbanknam2");
|
||||
expectedSDf54.setRbanknam3("rbanknam3");
|
||||
expectedSDf54.setRbanknam4("rbanknam4");
|
||||
expectedSDf54.setRbanknam5(null);
|
||||
expectedSDf54.setOp_type("test11");
|
||||
expectedSDf54.setOp_order("test12");
|
||||
expectedSDf54.setPay_date("14.03.24");
|
||||
expectedSDf54.setPay_val("test13");
|
||||
expectedSDf54.setSum_deb("test14");
|
||||
expectedSDf54.setSclientn1("test15");
|
||||
expectedSDf54.setSclientn1("sclientn1");
|
||||
expectedSDf54.setSclientn2("sclientn2");
|
||||
expectedSDf54.setSclientn3("sclientn3");
|
||||
expectedSDf54.setSclientn4(null);
|
||||
expectedSDf54.setInn_deb("test16");
|
||||
expectedSDf54.setKpp_deb("test17");
|
||||
expectedSDf54.setAcc_deb("test18");
|
||||
expectedSDf54.setRclientn1("test19");
|
||||
expectedSDf54.setRclientn1("rclientn1");
|
||||
expectedSDf54.setRclientn2("rclientn2");
|
||||
expectedSDf54.setRclientn3("rclientn3");
|
||||
expectedSDf54.setRclientn4(null);
|
||||
expectedSDf54.setInn_cred("test20");
|
||||
expectedSDf54.setKpp_cred("test21");
|
||||
expectedSDf54.setAcc_kr_1("test22");
|
||||
|
|
@ -142,20 +156,20 @@ public class ExportSf54FromHazelcastTest {
|
|||
Assertions.assertThat(actualObjectTag.getDocnmprev()).isEqualTo(expectedSDf54.getDocnmprev());
|
||||
Assertions.assertThat(actualObjectTag.getSbankcode()).isEqualTo(expectedSDf54.getSbankcode());
|
||||
Assertions.assertThat(actualObjectTag.getcAccDeb()).isEqualTo(expectedSDf54.getC_acc_deb());
|
||||
Assertions.assertThat(actualObjectTag.getSbanknam1()).isEqualTo(expectedSDf54.getSbanknam1());
|
||||
Assertions.assertThat(actualObjectTag.getSbanknam()).isEqualTo(expectedSDf54.getSbanknam1() + expectedSDf54.getSbanknam2() + expectedSDf54.getSbanknam3() + expectedSDf54.getSbanknam4());
|
||||
Assertions.assertThat(actualObjectTag.getRbankcode()).isEqualTo(expectedSDf54.getRbankcode());
|
||||
Assertions.assertThat(actualObjectTag.getcAccCred()).isEqualTo(expectedSDf54.getC_acc_cred());
|
||||
Assertions.assertThat(actualObjectTag.getRbanknam1()).isEqualTo(expectedSDf54.getRbanknam1());
|
||||
Assertions.assertThat(actualObjectTag.getRbanknam()).isEqualTo(expectedSDf54.getRbanknam1() + expectedSDf54.getRbanknam2() + expectedSDf54.getRbanknam3() + expectedSDf54.getRbanknam4());
|
||||
Assertions.assertThat(actualObjectTag.getOpType()).isEqualTo(expectedSDf54.getOp_type());
|
||||
Assertions.assertThat(actualObjectTag.getOpOrder()).isEqualTo(expectedSDf54.getOp_order());
|
||||
Assertions.assertThat(actualObjectTag.getPayDate().format(formatter)).isEqualTo(expectedSDf54.getPay_date());
|
||||
Assertions.assertThat(actualObjectTag.getPayVal()).isEqualTo(expectedSDf54.getPay_val());
|
||||
Assertions.assertThat(actualObjectTag.getSumDeb()).isEqualTo(expectedSDf54.getSum_deb());
|
||||
Assertions.assertThat(actualObjectTag.getSclientn1()).isEqualTo(expectedSDf54.getSclientn1());
|
||||
Assertions.assertThat(actualObjectTag.getSclientn()).isEqualTo(expectedSDf54.getSclientn1() + expectedSDf54.getSclientn2() + expectedSDf54.getSclientn3());
|
||||
Assertions.assertThat(actualObjectTag.getInnDeb()).isEqualTo(expectedSDf54.getInn_deb());
|
||||
Assertions.assertThat(actualObjectTag.getKppDeb()).isEqualTo(expectedSDf54.getKpp_deb());
|
||||
Assertions.assertThat(actualObjectTag.getAccDeb()).isEqualTo(expectedSDf54.getAcc_deb());
|
||||
Assertions.assertThat(actualObjectTag.getRclientn1()).isEqualTo(expectedSDf54.getRclientn1());
|
||||
Assertions.assertThat(actualObjectTag.getRclientn()).isEqualTo(expectedSDf54.getRclientn1() + expectedSDf54.getRclientn2() + expectedSDf54.getRclientn3());
|
||||
Assertions.assertThat(actualObjectTag.getInnCred()).isEqualTo(expectedSDf54.getInn_cred());
|
||||
Assertions.assertThat(actualObjectTag.getKppCred()).isEqualTo(expectedSDf54.getKpp_cred());
|
||||
Assertions.assertThat(actualObjectTag.getAccKr1()).isEqualTo(expectedSDf54.getAcc_kr_1());
|
||||
|
|
|
|||
|
|
@ -2,6 +2,6 @@
|
|||
<DOCUMENT MESSAGETYPE="DF03" MESSAGENAME="Распоряжение по итогам клиринга" MESSAGEDATE="2024-03-14" MESSAGETIME="09:15:31" SENDER="" RECIEVER="">
|
||||
<PARENTDOC PARENTID=""/>
|
||||
<OBJECTS>
|
||||
<OBJECT SEG_TYPE="test1" DOC_TYPE="test2" DOCNM_REF="test3" DOCNMPREV="test4" C_ACC_DEB="test5" SBANKNAM="test6" C_ACC_CRED="test7" RBANKNAM="test8" PAY_DATE="2024-03-14" PAY_VAL="test9" SUM_DEB="test10" SPECIF_1="test11" IMP_RESULT="test12"/>
|
||||
<OBJECT SEG_TYPE="test1" DOC_TYPE="test2" DOCNM_REF="test3" DOCNMPREV="test4" C_ACC_DEB="test5" SBANKNAM="sbanknam1sbanknam2sbanknam3sbanknam4" C_ACC_CRED="test7" RBANKNAM="rbanknam1rbanknam2rbanknam3rbanknam4" PAY_VAL="test9" SUM_DEB="test10" SPECIF_1="test11" IMP_RESULT="test12"/>
|
||||
</OBJECTS>
|
||||
</DOCUMENT>
|
||||
|
|
|
|||
|
|
@ -2,6 +2,6 @@
|
|||
<DOCUMENT MESSAGETYPE="DF54" MESSAGENAME="Распоряжение на вывод денежных средств" MESSAGEDATE="2024-03-14" MESSAGETIME="09:15:31" SENDER="" RECIEVER="">
|
||||
<PARENTDOC PARENTID=""/>
|
||||
<OBJECTS>
|
||||
<OBJECT SEG_TYPE="test1" DOC_TYPE="test2" DOCNM_REF="test3" DOCNMPREV="test4" SBANKCODE="test5" C_ACC_DEB="test6" SBANKNAM="test7" RBANKCODE="test8" C_ACC_CRED="test9" RBANKNAM="test10" OP_TYPE="test11" OP_ORDER="test12" PAY_DATE="2024-03-14" PAY_VAL="test13" SUM_DEB="test14" SCLIENTN="test15" INN_DEB="test16" KPP_DEB="test17" ACC_DEB="test18" RCLIENTN="test19" INN_CRED="test20" KPP_CRED="test21" ACC_KR_1="test22" SPECIF_1="test23" SEND_TYPE="test24" DOC_RESULT="test25" DOC_NUM="test26" DOC_DATE="2024-03-15" VALUE_DATE="2024-03-16" SWIFT_BEN="test27" SWIFT_INT="test28"/>
|
||||
<OBJECT SEG_TYPE="test1" DOC_TYPE="test2" DOCNM_REF="test3" DOCNMPREV="test4" SBANKCODE="test5" C_ACC_DEB="test6" SBANKNAM="sbanknam1sbanknam2sbanknam3sbanknam4" RBANKCODE="test8" C_ACC_CRED="test9" RBANKNAM="rbanknam1rbanknam2rbanknam3rbanknam4" OP_TYPE="test11" OP_ORDER="test12" PAY_VAL="test13" SUM_DEB="test14" SCLIENTN="sclientn1sclientn2sclientn3" INN_DEB="test16" KPP_DEB="test17" ACC_DEB="test18" RCLIENTN="rclientn1rclientn2rclientn3" INN_CRED="test20" KPP_CRED="test21" ACC_KR_1="test22" SPECIF_1="test23" SEND_TYPE="test24" DOC_RESULT="test25" DOC_NUM="test26" SWIFT_BEN="test27" SWIFT_INT="test28"/>
|
||||
</OBJECTS>
|
||||
</DOCUMENT>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue