added protocol in amendment request

This commit is contained in:
harish
2024-10-28 11:52:19 +05:30
23 changed files with 197 additions and 136 deletions

View File

@@ -1,15 +1,8 @@
package net.gepafin.tendermanagement.entities;
import com.fasterxml.jackson.annotation.JsonIgnore;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.FetchType;
import jakarta.persistence.OneToMany;
import jakarta.persistence.Table;
import jakarta.persistence.*;
import lombok.Data;
import java.util.List;
@Entity
@Table(name="application_amendment_request")
@Data
@@ -27,14 +20,21 @@ public class ApplicationAmendmentRequestEntity extends BaseEntity {
@Column(name = "IS_EMAIL")
private Boolean isEmail=false;
@Column(name = "APPLICATION_ID")
private Long applicationId;
@Column(name = "FORM_FIELDS")
private String formFields;
@Column(name="IS_DELETED")
private Boolean isDeleted=false;
@OneToMany(mappedBy = "applicationAmendmentRequest", fetch = FetchType.LAZY)
@JsonIgnore
private List<CommunicationEntity> communicationList;
@ManyToOne
@JoinColumn(name = "APPLICATION_EVALUATION_ID", nullable = false)
private ApplicationEvaluationEntity applicationEvaluationEntity;
@OneToOne
@JoinColumn(name = "PROTOCOL_Id")
private ProtocolEntity protocol;
}

View File

@@ -8,9 +8,6 @@ import java.time.LocalDateTime;
@Entity
@Table(name = "APPLICATION")
@Data
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class ApplicationEntity extends BaseEntity {
@Column(name = "USER_ID")

View File

@@ -3,14 +3,14 @@ package net.gepafin.tendermanagement.entities;
import jakarta.persistence.*;
import lombok.Data;
import java.time.LocalDateTime;
import java.util.List;
@Data
@Entity
@Table(name = "application_evaluation")
public class ApplicationEvaluationEntity extends BaseEntity{
@Column(name = "application_Id")
private Long applicationId;
@Column(name = "user_id")
private Long userId;
@@ -35,4 +35,5 @@ public class ApplicationEvaluationEntity extends BaseEntity{
@ManyToOne
@JoinColumn(name = "assigned_applications_id", nullable = true)
private AssignedApplicationsEntity assignedApplicationsEntity;
}

View File

@@ -1,9 +1,7 @@
package net.gepafin.tendermanagement.entities;
import com.fasterxml.jackson.annotation.JsonIgnore;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.FetchType;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.Table;
@@ -23,13 +21,12 @@ public class CommunicationEntity extends BaseEntity {
private String communicationComment;
@Column(name = "IS_DELETED")
private Boolean isDeleted;
private Boolean isDeleted = false;
@Column(name = "COMMENTED_DATE")
private LocalDateTime commentedDate;
@ManyToOne(fetch = FetchType.LAZY)
@JsonIgnore
@ManyToOne
@JoinColumn(name = "AMENDMENT_ID", referencedColumnName = "id", nullable = false)
private ApplicationAmendmentRequestEntity applicationAmendmentRequest;