BFLOWS/bflows-bandi-be
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolved conflicts

Browse Source
This commit is contained in:
rajesh
2025-01-02 15:45:37 +05:30
parent cac4a7efac 3f72e09a26
commit 8220c709f4
158 changed files with 5895 additions and 1053 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/gepafin/tendermanagement/entities/ApplicationAmendmentRequestEntity.java
View File

@@ -47,4 +47,10 @@ public class ApplicationAmendmentRequestEntity extends BaseEntity {
@JoinColumn(name = "PROTOCOL_Id")
private ProtocolEntity protocol;
@Column(name = "end_date")
private LocalDateTime endDate;
@Column(name = "amendment_document")
private String amendmentDocument;
}

24
src/main/java/net/gepafin/tendermanagement/entities/ApplicationEntity.java
View File

@@ -12,10 +12,9 @@ public class ApplicationEntity extends BaseEntity {
@Column(name = "USER_ID")
private Long userId;
@ManyToOne
@JoinColumn(name = "COMPANY_ID", nullable = false)
private CompanyEntity company;
@Column(name = "COMPANY_ID")
private Long companyId;
@Column(name = "SUBMISSION_DATE")
private LocalDateTime submissionDate;
@@ -39,4 +38,21 @@ public class ApplicationEntity extends BaseEntity {
@Column(name = "HUB_ID")
private Long hubId;
@ManyToOne
@JoinColumn(name = "USER_WITH_COMPANY_ID")
private UserWithCompanyEntity userWithCompany;
@Column(name = "NDG")
private String ndg;
@Column(name = "ID_VISURA")
private String idVisura;
@Column(name = "NDG_STATUS")
private String ndgStatus;
@Column(name = "APPOINTMENT_ID")
private String appointmentId;
}

28
src/main/java/net/gepafin/tendermanagement/entities/ApplicationEvaluationEntity.java
View File

@@ -3,6 +3,8 @@ package net.gepafin.tendermanagement.entities;
import jakarta.persistence.*;
import lombok.Data;
import java.time.LocalDateTime;
@Data
@Entity
@Table(name = "application_evaluation")
@@ -20,6 +22,9 @@ public class ApplicationEvaluationEntity extends BaseEntity{
@Column(name = "checklist")
private String checklist;
@Column(name = "EVALUATION_DOCUMENT")
private String evaluationDocument;
@Column(name = "file")
private String file;
@@ -38,5 +43,26 @@ public class ApplicationEvaluationEntity extends BaseEntity{
@ManyToOne
@JoinColumn(name = "assigned_applications_id", nullable = true)
private AssignedApplicationsEntity assignedApplicationsEntity;
@Column(name = "INITIAL_DAYS")
private Long initialDays;
@Column(name = "REMAINING_DAYS")
private Long remainingDays;
@Column(name = "SUSPENDED_DAYS")
private Long suspendedDays;
@Column(name = "START_DATE")
private LocalDateTime startDate;
@Column(name = "END_DATE")
private LocalDateTime endDate;
@Column(name = "STOP_DATE_TIME")
private LocalDateTime stopDateTime;
@Column(name = "CLOSING_DATE")
private LocalDateTime closingDate;
}

5
src/main/java/net/gepafin/tendermanagement/entities/BeneficiaryPreferredCallEntity.java
View File

@@ -34,6 +34,11 @@ public class BeneficiaryPreferredCallEntity extends BaseEntity{
@Column(name = "STATUS", length = 255)
private String status;
@Column(name="IS_DELETED")
private Boolean isDeleted;
@ManyToOne
@JoinColumn(name = "USER_WITH_COMPANY_ID")
private UserWithCompanyEntity userWithCompany;
}

19
src/main/java/net/gepafin/tendermanagement/entities/CompanyEntity.java
View File

@@ -41,26 +41,19 @@ public class CompanyEntity extends BaseEntity{
@Column(name = "COUNTRY")
private String country;
@Column(name = "PEC")
private String pec;
@Column(name = "EMAIL")
private String email;
@Column(name = "NUMBER_OF_EMPLOYEES")
private String numberOfEmployees;
@Column(name = "ANNUAL_REVENUE")
private BigDecimal annualRevenue;
@Column(name = "CONTACT_NAME")
private String contactName;
@Column(name = "CONTACT_EMAIL")
private String contactEmail;
@ManyToOne
@JoinColumn(name = "HUB_ID")
private HubEntity hub;
// @Column(name = "JSON")
// private String json;
@Column(name = "NDG")
private String ndg;
}

6
src/main/java/net/gepafin/tendermanagement/entities/DocumentEntity.java
View File

@@ -29,4 +29,10 @@ public class DocumentEntity extends BaseEntity{
@Column(name ="IS_DELETED", nullable = false)
private Boolean isDeleted = false;
@Column(name="DOCUMENT_ATTACHMENT_ID")
private String documentAttachmentId;
@Column(name="uploaded_by")
private Long uploadedBy;
}

4
src/main/java/net/gepafin/tendermanagement/entities/FaqEntity.java
View File

@@ -45,5 +45,9 @@ public class FaqEntity extends BaseEntity {
@Column(name ="COMPANY_ID")
private Long companyId;
@ManyToOne
@JoinColumn(name = "USER_WITH_COMPANY_ID")
private UserWithCompanyEntity userWithCompany;
}

9
src/main/java/net/gepafin/tendermanagement/entities/HubEntity.java
View File

@@ -54,4 +54,13 @@ public class HubEntity extends BaseEntity{
@Column(name = "EMAIL_SERVICE_CONFIG")
private String emailServiceConfig;
@Column(name = "AUTH_TOKEN")
private String authToken;
@Column(name = "APPOINTMENT_AUTH_TOKEN_ID")
private String appointmentAuthTokenId;
@Column(name = "AREA_CODE")
private String areaCode;
}

39
src/main/java/net/gepafin/tendermanagement/entities/NotificationEntity.java Normal file
View File

@@ -0,0 +1,39 @@
package net.gepafin.tendermanagement.entities;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.Table;
import lombok.Data;
@Entity
@Table(name = "NOTIFICATION")
@Data
public class NotificationEntity extends BaseEntity {
@Column(name = "USER_ID")
private Long userId;
@Column(name = "MESSAGE")
private String message;
@Column(name = "TITLE")
private String title;
@Column(name = "STATUS")
private String status;
@Column(name = "IS_DELETED")
private Boolean isDeleted;
@Column(name = "NOTIFICATION_TYPE")
private String notificationType;
@Column(name = "REDIRECT_LINK")
private String redirectLink;
@ManyToOne
@JoinColumn(name = "USER_WITH_COMPANY_ID")
private UserWithCompanyEntity userWithCompany;
}

24
src/main/java/net/gepafin/tendermanagement/entities/NotificationTypeEntity.java Normal file
View File

@@ -0,0 +1,24 @@
package net.gepafin.tendermanagement.entities;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.Table;
import lombok.Data;
@Entity
@Data
@Table(name = "NOTIFICATION_TYPE")
public class NotificationTypeEntity extends BaseEntity {
@Column(name = "NOTIFICATION_NAME")
private String notificationName;
@Column(name = "JSON_TEMPLATE")
private String jsonTemplate;
@Column(name = "TITLE")
private String title;
@Column(name="IS_DELETED")
private Boolean isDeleted;
}

3
src/main/java/net/gepafin/tendermanagement/entities/ProtocolEntity.java
View File

@@ -28,4 +28,7 @@ public class ProtocolEntity extends BaseEntity {
@Column(name="HUB_ID")
private Long hubId;
@Column(name = "type")
private String type;
}

7
src/main/java/net/gepafin/tendermanagement/entities/UserCompanyDelegationEntity.java
View File

@@ -1,8 +1,6 @@
package net.gepafin.tendermanagement.entities;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.Table;
import jakarta.persistence.*;
import lombok.Data;
@Data
@@ -28,4 +26,7 @@ public class UserCompanyDelegationEntity extends BaseEntity{
@Column(name="STATUS")
private String status;
@ManyToOne
@JoinColumn(name = "USER_WITH_COMPANY_ID")
private UserWithCompanyEntity userWithCompany;
}

16
src/main/java/net/gepafin/tendermanagement/entities/UserWithCompanyEntity.java
View File

@@ -22,6 +22,22 @@ public class UserWithCompanyEntity extends BaseEntity{
@Column(name = "IS_LEGAL_REPRESENTANT")
private Boolean isLegalRepresentant;
@Column(name = "CONTACT_NAME")
private String contactName;
@Column(name = "CONTACT_EMAIL")
private String contactEmail;
@Column(name = "PEC")
private String pec;
@Column(name = "EMAIL")
private String email;
@Column(name = "JSON")
private String json;
@Column(name = "IS_DELETED")
private Boolean isDeleted = false;