Resolved conflicts
This commit is contained in:
@@ -0,0 +1,15 @@
|
||||
package net.gepafin.tendermanagement.model.response;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
@Data
|
||||
public class AssignedApplicationWidgetResponseBean {
|
||||
private Long numberOfAssignedApplication;
|
||||
private Long numberOfApplicationInAmendmentState;
|
||||
private Long numberOfApplicationInCloseState;
|
||||
private Long numberOfApplicationInOpenState;
|
||||
private Long numberOfApplicationExpiringIn48Hours;
|
||||
private BigDecimal averageEvaluationDays;
|
||||
}
|
||||
@@ -0,0 +1,30 @@
|
||||
package net.gepafin.tendermanagement.model.response;
|
||||
|
||||
import lombok.Data;
|
||||
import net.gepafin.tendermanagement.enums.ApplicationAmendmentRequestEnum;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class GetAllAmendmentResponseBean {
|
||||
private Long id;
|
||||
private String callEmail;
|
||||
private String note;
|
||||
private Long responseDays;
|
||||
private LocalDateTime startDate;
|
||||
private Boolean isSendNotification;
|
||||
private Boolean isSendEmail;
|
||||
private Long protocolNumber;
|
||||
private String callName;
|
||||
private String beneficiaryName;
|
||||
private String companyName;
|
||||
private String amendmentNotes;
|
||||
private Long applicationId;
|
||||
private Long applicationEvaluationId;
|
||||
private LocalDateTime evaluationEndDate;
|
||||
private LocalDateTime expirationDate;
|
||||
private String internalNote;
|
||||
private ApplicationAmendmentRequestEnum status;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user