Resolved conficts
This commit is contained in:
@@ -0,0 +1,13 @@
|
||||
package net.gepafin.tendermanagement.model.request;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class AmendmentFieldRequest {
|
||||
|
||||
private String fieldId;
|
||||
private String nameValue;
|
||||
private String fileValue;
|
||||
private Boolean isValid = false;
|
||||
|
||||
}
|
||||
@@ -11,4 +11,5 @@ public class ApplicationAmendmentRequest {
|
||||
private Long responseDays;
|
||||
private Boolean isSendNotification;
|
||||
private Boolean isSendEmail;
|
||||
private List<AmendmentFieldRequest> amendmentDocument;
|
||||
}
|
||||
|
||||
@@ -8,4 +8,5 @@ import lombok.Data;
|
||||
public class ApplicationAmendmentRequestBean {
|
||||
private String note;
|
||||
private List<ApplicationFormFieldRequestBean> applicationFormFields;
|
||||
private List<AmendmentFieldRequest> amendmentDocuments;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
package net.gepafin.tendermanagement.model.response;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class AmendmentDocumentResponse {
|
||||
|
||||
private String fieldId;
|
||||
private String nameValue;
|
||||
private DocumentResponseBean fileValue;
|
||||
private Boolean isValid = false;
|
||||
}
|
||||
@@ -21,6 +21,7 @@ public class ApplicationAmendmentRequestResponse {
|
||||
private String beneficiaryName;
|
||||
private List<AmendmentFormFieldResponse> formFields;
|
||||
private List<ApplicationFormFieldResponseBean> applicationFormFields;
|
||||
private List<AmendmentDocumentResponse> amendmentDocuments;
|
||||
private Long applicationId;
|
||||
private Long applicationEvaluationId;
|
||||
private LocalDateTime evaluationEndDate;
|
||||
|
||||
@@ -25,4 +25,6 @@ public class DocumentResponseBean {
|
||||
private LocalDateTime createdDate;
|
||||
|
||||
private LocalDateTime updatedDate;
|
||||
|
||||
private String documentAttachmentId;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user