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

http://jira.mfd.msk:8088/browse/CLS-50

Browse source
This commit is contained in:
ialbert 2022-10-06 15:35:26 +03:00
parent 7800b5cdab
commit d7a70d1811
4 changed files with 46 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/journal/InDocumentJournal.java
View file

@ -18,15 +18,16 @@ public class InDocumentJournal extends SpcexObjectBase {
private Instant registrationTime;
private Long registrationNumber;
private String documentName;
private Long senderId;
private String sender;
private Long quantity;
private String clearingCode;
private String courierType;
private Instant emailDate;
private BigDecimal amount;
private Long dossierNumber;
private String dossierNumber;
private String comment;
private Instant receiptDate;
private String resultStatus;
public Instant getRegistrationDate() {
return registrationDate;
@ -60,12 +61,12 @@ public class InDocumentJournal extends SpcexObjectBase {
this.documentName = value;
}
public Long getSenderId() {
return senderId;
public String getSender() {
return sender;
}
public void setSenderId(Long value) {
this.senderId = value;
public void setSender(String value) {
this.sender = value;
}
public Long getQuantity() {
@ -108,11 +109,11 @@ public class InDocumentJournal extends SpcexObjectBase {
this.amount = value;
}
public Long getDossierNumber() {
public String getDossierNumber() {
return dossierNumber;
}
public void setDossierNumber(Long value) {
public void setDossierNumber(String value) {
this.dossierNumber = value;
}
@ -132,4 +133,11 @@ public class InDocumentJournal extends SpcexObjectBase {
this.receiptDate = value;
}
public String getResultStatus() {
return resultStatus;
}
public void setResultStatus(String resultStatus) {
this.resultStatus = resultStatus;
}
}

24
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/journal/OutDocumentJournal.java
View file

@ -18,14 +18,15 @@ public class OutDocumentJournal extends SpcexObjectBase {
private Instant registrationTime;
private Long registrationNumber;
private String documentName;
private Long addresseeId;
private String addressee;
private Long quantity;
private String clearingCode;
private String courierType;
private Instant emailDate;
private BigDecimal amount;
private Long dossierNumber;
private String dossierNumber;
private Instant postDate;
private String resultStatus;
public Instant getRegistrationDate() {
return registrationDate;
@ -59,12 +60,12 @@ public class OutDocumentJournal extends SpcexObjectBase {
this.documentName = value;
}
public Long getAddresseeId() {
return addresseeId;
public String getAddressee() {
return addressee;
}
public void setAddresseeId(Long value) {
this.addresseeId = value;
public void setAddressee(String value) {
this.addressee = value;
}
public Long getQuantity() {
@ -107,11 +108,11 @@ public class OutDocumentJournal extends SpcexObjectBase {
this.amount = value;
}
public Long getDossierNumber() {
public String getDossierNumber() {
return dossierNumber;
}
public void setDossierNumber(Long value) {
public void setDossierNumber(String value) {
this.dossierNumber = value;
}
@ -123,4 +124,11 @@ public class OutDocumentJournal extends SpcexObjectBase {
this.postDate = value;
}
public String getResultStatus() {
return resultStatus;
}
public void setResultStatus(String resultStatus) {
this.resultStatus = resultStatus;
}
}

12
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/InDocumentJournalMapStore.java
View file

@ -31,7 +31,7 @@ public class InDocumentJournalMapStore extends TemplateMapStore<InDocumentJourna
@Override
public String[] getFields() {
return new String[]{
"ID", "REGISTRATION_DATE", "REGISTRATION_TIME", "REGISTRATION_NUMBER", "DOCUMENT_NAME", "SENDER_ID", "QUANTITY", "CLEARING_CODE", "COURIER_TYPE", "EMAIL_DATE", "AMOUNT", "DOSSIER_NUMBER", "COMMENT", "RECEIPT_DATE"
"ID", "REGISTRATION_DATE", "REGISTRATION_TIME", "REGISTRATION_NUMBER", "DOCUMENT_NAME", "SENDER", "QUANTITY", "CLEARING_CODE", "COURIER_TYPE", "EMAIL_DATE", "AMOUNT", "DOSSIER_NUMBER", "COMMENT", "RECEIPT_DATE", "RESULT_STATUS"
};
}
@ -43,13 +43,14 @@ public class InDocumentJournalMapStore extends TemplateMapStore<InDocumentJourna
object.setRegistrationTime(getInstantFromTimestamp(resultSet, "REGISTRATION_TIME"));
object.setRegistrationNumber(resultSet.getObject("REGISTRATION_NUMBER", Long.class));
object.setDocumentName(resultSet.getObject("DOCUMENT_NAME", String.class));
object.setSenderId(resultSet.getObject("SENDER_ID", Long.class));
object.setSender(resultSet.getObject("SENDER", String.class));
object.setQuantity(resultSet.getObject("QUANTITY", Long.class));
object.setClearingCode(resultSet.getObject("CLEARING_CODE", String.class));
object.setCourierType(resultSet.getObject("COURIER_TYPE", String.class));
object.setEmailDate(getInstantFromTimestamp(resultSet, "EMAIL_DATE"));
object.setAmount(resultSet.getObject("AMOUNT", BigDecimal.class));
object.setDossierNumber(resultSet.getObject("DOSSIER_NUMBER", Long.class));
object.setDossierNumber(resultSet.getObject("DOSSIER_NUMBER", String.class));
object.setResultStatus(resultSet.getObject("RESULT_STATUS", String.class));
object.setComment(resultSet.getObject("COMMENT", String.class));
object.setReceiptDate(getInstantFromTimestamp(resultSet, "RECEIPT_DATE"));
return object;
@ -63,7 +64,7 @@ public class InDocumentJournalMapStore extends TemplateMapStore<InDocumentJourna
TimeUtil.toDateFromInstant(object.getRegistrationTime()),
object.getRegistrationNumber(),
object.getDocumentName(),
object.getSenderId(),
object.getSender(),
object.getQuantity(),
object.getClearingCode(),
object.getCourierType(),
@ -71,7 +72,8 @@ public class InDocumentJournalMapStore extends TemplateMapStore<InDocumentJourna
object.getAmount(),
object.getDossierNumber(),
object.getComment(),
TimeUtil.toDateFromInstant(object.getReceiptDate())
TimeUtil.toDateFromInstant(object.getReceiptDate()),
object.getResultStatus()
};
return args;
}

12
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/OutDocumentJournalMapStore.java
View file

@ -31,7 +31,7 @@ public class OutDocumentJournalMapStore extends TemplateMapStore<OutDocumentJour
@Override
public String[] getFields() {
return new String[]{
"ID", "REGISTRATION_DATE", "REGISTRATION_TIME", "REGISTRATION_NUMBER", "DOCUMENT_NAME", "ADDRESSEE_ID", "QUANTITY", "CLEARING_CODE", "COURIER_TYPE", "EMAIL_DATE", "AMOUNT", "DOSSIER_NUMBER", "POST_DATE"
"ID", "REGISTRATION_DATE", "REGISTRATION_TIME", "REGISTRATION_NUMBER", "DOCUMENT_NAME", "ADDRESSEE", "QUANTITY", "CLEARING_CODE", "COURIER_TYPE", "EMAIL_DATE", "AMOUNT", "DOSSIER_NUMBER", "POST_DATE", "RESULT_STATUS"
};
}
@ -43,13 +43,14 @@ public class OutDocumentJournalMapStore extends TemplateMapStore<OutDocumentJour
object.setRegistrationTime(getInstantFromTimestamp(resultSet, "REGISTRATION_TIME"));
object.setRegistrationNumber(resultSet.getObject("REGISTRATION_NUMBER", Long.class));
object.setDocumentName(resultSet.getObject("DOCUMENT_NAME", String.class));
object.setAddresseeId(resultSet.getObject("ADDRESSEE_ID", Long.class));
object.setAddressee(resultSet.getObject("ADDRESSEE", String.class));
object.setQuantity(resultSet.getObject("QUANTITY", Long.class));
object.setClearingCode(resultSet.getObject("CLEARING_CODE", String.class));
object.setCourierType(resultSet.getObject("COURIER_TYPE", String.class));
object.setEmailDate(getInstantFromTimestamp(resultSet, "EMAIL_DATE"));
object.setAmount(resultSet.getObject("AMOUNT", BigDecimal.class));
object.setDossierNumber(resultSet.getObject("DOSSIER_NUMBER", Long.class));
object.setDossierNumber(resultSet.getObject("DOSSIER_NUMBER", String.class));
object.setResultStatus(resultSet.getObject("RESULT_STATUS", String.class));
object.setPostDate(getInstantFromTimestamp(resultSet, "POST_DATE"));
return object;
}
@ -62,14 +63,15 @@ public class OutDocumentJournalMapStore extends TemplateMapStore<OutDocumentJour
TimeUtil.toDateFromInstant(object.getRegistrationTime()),
object.getRegistrationNumber(),
object.getDocumentName(),
object.getAddresseeId(),
object.getAddressee(),
object.getQuantity(),
object.getClearingCode(),
object.getCourierType(),
TimeUtil.toDateFromInstant(object.getEmailDate()),
object.getAmount(),
object.getDossierNumber(),
TimeUtil.toDateFromInstant(object.getPostDate())
TimeUtil.toDateFromInstant(object.getPostDate()),
object.getResultStatus()
};
return args;
}