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:
nisha
2025-02-17 16:37:34 +05:30
parent a5219a753c 0eaf0961bd
commit ed6a253773
112 changed files with 3861 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/net/gepafin/tendermanagement/model/request/ApplicationEvaluationFormRequestBean.java Normal file
View File

@@ -0,0 +1,19 @@
package net.gepafin.tendermanagement.model.request;
import lombok.Data;
import net.gepafin.tendermanagement.enums.ApplicationStatusForEvaluation;
import java.math.BigDecimal;
import java.util.List;
@Data
public class ApplicationEvaluationFormRequestBean {
private List<FieldRequest> files;
private List<EvaluationDocumentRequest> evaluationDocument;
private List<AmendmentDetailsRequest> amendmentDetails;
private String note;
private ApplicationStatusForEvaluation applicationStatus;
private List<ApplicationFormFieldRequestBean> formFields;
private String motivation;
private BigDecimal amountAccepted;
}

2
src/main/java/net/gepafin/tendermanagement/model/request/ApplicationPageableRequestBean.java
View File

@@ -10,5 +10,7 @@ public class ApplicationPageableRequestBean {
private GlobalFilters globalFilters;
private Integer daysRange;
private List<ApplicationStatusTypeEnum> status;
}

1
src/main/java/net/gepafin/tendermanagement/model/request/AssignedApplicationsRequest.java
View File

@@ -6,5 +6,4 @@ import net.gepafin.tendermanagement.enums.AssignedApplicationEnum;
@Data
public class AssignedApplicationsRequest {
private String note;
private AssignedApplicationEnum status;
}

6
src/main/java/net/gepafin/tendermanagement/model/request/CreateCallRequestStep1.java
View File

@@ -5,6 +5,7 @@ import java.time.LocalDateTime;
import java.util.List;
import lombok.Data;
import net.gepafin.tendermanagement.enums.EvaluationVersionEnum;
@Data
public class CreateCallRequestStep1 {
@@ -23,6 +24,10 @@ public class CreateCallRequestStep1 {
private BigDecimal amountMax;
private Long numberOfCheck;
private Long productId;
private List<LookUpDataReq> aimedTo;
private String documentationRequested;
@@ -41,4 +46,5 @@ public class CreateCallRequestStep1 {
private List<FaqReq> faq;
private EvaluationVersionEnum evaluationVersion;
}

14
src/main/java/net/gepafin/tendermanagement/model/request/CreateCallRequestStep2EvaluationV2.java Normal file
View File

@@ -0,0 +1,14 @@
package net.gepafin.tendermanagement.model.request;
import lombok.Data;
import java.util.List;
@Data
public class CreateCallRequestStep2EvaluationV2 {
private List<DocumentReq> docs;
private List<DocumentReq> images;
}

14
src/main/java/net/gepafin/tendermanagement/model/request/EvaluationFormRequest.java Normal file
View File

@@ -0,0 +1,14 @@
package net.gepafin.tendermanagement.model.request;
import lombok.Data;
import java.util.List;
@Data
public class EvaluationFormRequest {
private String label;
private List<ContentRequestBean> content;
}

7
src/main/java/net/gepafin/tendermanagement/model/request/UpdateCallRequestStep1.java
View File

@@ -6,6 +6,7 @@ import java.time.LocalTime;
import java.util.List;
import lombok.Data;
import net.gepafin.tendermanagement.enums.EvaluationVersionEnum;
@Data
public class UpdateCallRequestStep1 {
@@ -40,4 +41,10 @@ public class UpdateCallRequestStep1 {
private List<FaqReq> faq;
private Long numberOfCheck;
private Long productId;
private EvaluationVersionEnum evaluationVersion;
}

18
src/main/java/net/gepafin/tendermanagement/model/request/UpdateUserReqForBeneficiary.java Normal file
View File

@@ -0,0 +1,18 @@
package net.gepafin.tendermanagement.model.request;
import lombok.Data;
import java.time.LocalDateTime;
@Data
public class UpdateUserReqForBeneficiary {
private String firstName;
private String lastName;
private String email;
private String phoneNumber;
private String organization;
private String address;
private String city;
private String country;
private LocalDateTime dateOfBirth;
}

22
src/main/java/net/gepafin/tendermanagement/model/response/AmendmentWidgetResponseBean.java Normal file
View File

@@ -0,0 +1,22 @@
package net.gepafin.tendermanagement.model.response;
import lombok.Builder;
import lombok.Data;
import java.math.BigDecimal;
@Builder
@Data
public class AmendmentWidgetResponseBean {
private Long totalAmendments;
private Long waitingForResponseAmendments;
private Long responseReceivedAmendments;
private BigDecimal averageResponseDays;
private Long expiringRequestsIn48Hours;
private Long expiredAmendments;
}

15
src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationFormFieldReponseBean.java Normal file
View File

@@ -0,0 +1,15 @@
package net.gepafin.tendermanagement.model.response;
import lombok.Data;
import net.gepafin.tendermanagement.model.BaseBean;
@Data
public class ApplicationEvaluationFormFieldReponseBean extends BaseBean {
private Long id;
private Long applicationEvaluationFormId;
private String fieldId;
private Object fieldValue;
}

50
src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationFormResponse.java Normal file
View File

@@ -0,0 +1,50 @@
package net.gepafin.tendermanagement.model.response;
import lombok.Data;
import net.gepafin.tendermanagement.enums.ApplicationEvaluationStatusTypeEnum;
import net.gepafin.tendermanagement.enums.ApplicationStatusTypeEnum;
import net.gepafin.tendermanagement.enums.EvaluationVersionEnum;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;
@Data
public class ApplicationEvaluationFormResponse {
private Long id;
private Long applicationId;
private ApplicationStatusTypeEnum applicationStatus;
private Long assignedApplicationId;
private String note;
private ApplicationEvaluationStatusTypeEnum status;
private Long minScore;
private ApplicationEvaluationFormResponseBean applicationEvaluationFormResponse;
private List<FieldResponse> files;
private List<EvaluationDocumentResponse> evaluationDocument;
private List<AmendmentDocumentResponseBean> amendmentDetails;
private LocalDateTime createdDate;
private LocalDateTime updatedDate;
private String beneficiary;
private Long assignedUserId;
private String assignedUserName;
private Long protocolNumber;
private String callName;
private String motivation;
private LocalDateTime submissionDate;
private LocalDateTime evaluationEndDate;
private LocalDateTime callEndDate;
private String companyName;
private LocalDateTime assignedAt;
private String ndg;
private String appointmentId;
private BigDecimal amountRequested;
private BigDecimal amountAccepted;
private LocalDateTime dateAccepted;
private LocalDateTime dateRejected;
private EvaluationVersionEnum evaluationVersion;
private BigDecimal numberOfCheck;
private BigDecimal productId;
}

19
src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationFormResponseBean.java Normal file
View File

@@ -0,0 +1,19 @@
package net.gepafin.tendermanagement.model.response;
import lombok.Data;
import java.util.List;
@Data
public class ApplicationEvaluationFormResponseBean {
private Long id;
private String label;
private Long callId;
private List<ContentResponseBean> content;
private List<ApplicationEvaluationFormFieldReponseBean> formFields;
}

5
src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationResponse.java
View File

@@ -3,6 +3,7 @@ package net.gepafin.tendermanagement.model.response;
import lombok.Data;
import net.gepafin.tendermanagement.enums.ApplicationEvaluationStatusTypeEnum;
import net.gepafin.tendermanagement.enums.ApplicationStatusTypeEnum;
import net.gepafin.tendermanagement.enums.EvaluationVersionEnum;
import java.math.BigDecimal;
import java.time.LocalDateTime;
@@ -43,4 +44,8 @@ public class ApplicationEvaluationResponse {
private BigDecimal amountAccepted;
private LocalDateTime dateAccepted;
private LocalDateTime dateRejected;
private Long numberOfCheck;
private Long productId;
private EvaluationVersionEnum evaluationVersion;
}

13
src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationVersionResponse.java Normal file
View File

@@ -0,0 +1,13 @@
package net.gepafin.tendermanagement.model.response;
import lombok.Data;
import net.gepafin.tendermanagement.enums.EvaluationVersionEnum;
@Data
public class ApplicationEvaluationVersionResponse {
private Long callId;
private Long companyId;
private Long applicationId;
private Long evaluationId;
private EvaluationVersionEnum evaluationVersion;
}

3
src/main/java/net/gepafin/tendermanagement/model/response/ApplicationResponse.java
View File

@@ -1,6 +1,7 @@
package net.gepafin.tendermanagement.model.response;
import lombok.Data;
import net.gepafin.tendermanagement.enums.EvaluationVersionEnum;
import net.gepafin.tendermanagement.model.response.ApplicationFormFieldResponseBean;
import java.math.BigDecimal;
@@ -49,4 +50,6 @@ public class ApplicationResponse{
private LocalDateTime dateRejected;
private EvaluationVersionEnum evaluationVersion;
}

15
src/main/java/net/gepafin/tendermanagement/model/response/ApplicationToConsider.java Normal file
View File

@@ -0,0 +1,15 @@
package net.gepafin.tendermanagement.model.response;
import lombok.Builder;
import lombok.Data;
import java.math.BigDecimal;
@Builder
@Data
public class ApplicationToConsider {
public Long totalAssignedApplication;
private BigDecimal additionalApplicationPercentage;
}

19
src/main/java/net/gepafin/tendermanagement/model/response/ApplicationWidget.java Normal file
View File

@@ -0,0 +1,19 @@
package net.gepafin.tendermanagement.model.response;
import lombok.Builder;
import lombok.Data;
import java.math.BigDecimal;
@Data
@Builder
public class ApplicationWidget {
private Long submittedApplication;
private BigDecimal successRate;
private Long approvedApplication;
private BigDecimal totalAmountFinanced;
}

15
src/main/java/net/gepafin/tendermanagement/model/response/AssignedApplicationWidgetResponseBean.java Normal file
View File

@@ -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;
}

5
src/main/java/net/gepafin/tendermanagement/model/response/AssignedApplicationsResponse.java
View File

@@ -2,8 +2,10 @@ package net.gepafin.tendermanagement.model.response;
import lombok.Data;
import net.gepafin.tendermanagement.enums.AssignedApplicationEnum;
import net.gepafin.tendermanagement.enums.EvaluationVersionEnum;
import net.gepafin.tendermanagement.model.BaseBean;
import java.math.BigDecimal;
import java.time.LocalDateTime;
@Data
@@ -22,6 +24,9 @@ public class AssignedApplicationsResponse extends BaseBean {
private LocalDateTime callEndDate;
private String companyName;
private LocalDateTime evaluationEndDate;
private Long numberOfCheck;
private Long productId;
private EvaluationVersionEnum evaluationVersion;
}

15
src/main/java/net/gepafin/tendermanagement/model/response/AverageEvaluationTime.java Normal file
View File

@@ -0,0 +1,15 @@
package net.gepafin.tendermanagement.model.response;
import lombok.Builder;
import lombok.Data;
import java.math.BigDecimal;
@Builder
@Data
public class AverageEvaluationTime {
private BigDecimal averageEvlauationDaysRating;
private BigDecimal timeDifferenceFromAverage;
}

17
src/main/java/net/gepafin/tendermanagement/model/response/BeneficiaryStatisticsResponseBean.java Normal file
View File

@@ -0,0 +1,17 @@
package net.gepafin.tendermanagement.model.response;
import lombok.Builder;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Map;
@Data
@Builder
public class BeneficiaryStatisticsResponseBean {
private ApplicationWidget applicationWidget;
private Map<String, Object> applicationWidgetBars;
}

7
src/main/java/net/gepafin/tendermanagement/model/response/CallDetailsResponseBean.java
View File

@@ -2,6 +2,7 @@ package net.gepafin.tendermanagement.model.response;
import lombok.Data;
import net.gepafin.tendermanagement.enums.CallStatusEnum;
import net.gepafin.tendermanagement.enums.EvaluationVersionEnum;
import java.math.BigDecimal;
import java.time.LocalDateTime;
@@ -55,4 +56,10 @@ public class CallDetailsResponseBean {
private LocalDateTime updatedDate;
private Long preferredCallId;
private Long numberOfCheck;
private Long productId;
private EvaluationVersionEnum evaluationVersion;
}

7
src/main/java/net/gepafin/tendermanagement/model/response/CallResponse.java
View File

@@ -8,6 +8,7 @@ import java.util.List;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import lombok.Data;
import net.gepafin.tendermanagement.enums.CallStatusEnum;
import net.gepafin.tendermanagement.enums.EvaluationVersionEnum;
import net.gepafin.tendermanagement.util.DynamicLocalTimeSerializer;
@Data
@@ -49,6 +50,10 @@ public class CallResponse {
private String phoneNumber;
private Long numberOfCheck;
private Long productId;
@JsonSerialize(using = DynamicLocalTimeSerializer.class)
private LocalTime startTime;
@@ -74,6 +79,8 @@ public class CallResponse {
private String currentStep;
private Long preferredCallId;
private EvaluationVersionEnum evaluationVersion;
}

15
src/main/java/net/gepafin/tendermanagement/model/response/EvaluatedApplication.java Normal file
View File

@@ -0,0 +1,15 @@
package net.gepafin.tendermanagement.model.response;
import lombok.Builder;
import lombok.Data;
import java.math.BigDecimal;
@Builder
@Data
public class EvaluatedApplication {
public Long evaluatedApplication;
private BigDecimal dailyAverage;
}

19
src/main/java/net/gepafin/tendermanagement/model/response/EvaluationFormResponseBean.java Normal file
View File

@@ -0,0 +1,19 @@
package net.gepafin.tendermanagement.model.response;
import lombok.Data;
import java.util.List;
@Data
public class EvaluationFormResponseBean {
private Long id;
private String callStatus;
private String label;
private Long callId;
private List<ContentResponseBean> content;
}

30
src/main/java/net/gepafin/tendermanagement/model/response/GetAllAmendmentResponseBean.java Normal file
View File

@@ -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;
}

20
src/main/java/net/gepafin/tendermanagement/model/response/PreInstructorWidgetResponseBean.java Normal file
View File

@@ -0,0 +1,20 @@
package net.gepafin.tendermanagement.model.response;
import lombok.Builder;
import lombok.Data;
import java.math.BigDecimal;
@Builder
@Data
public class PreInstructorWidgetResponseBean {
private ApplicationToConsider assignedApplication;
private EvaluatedApplication evaluatedApplication;
private AverageEvaluationTime averageEvaluationDays;
private RescueInstructorInProgress amendmentInProgress;
}

13
src/main/java/net/gepafin/tendermanagement/model/response/RescueInstructorInProgress.java Normal file
View File

@@ -0,0 +1,13 @@
package net.gepafin.tendermanagement.model.response;
import lombok.Builder;
import lombok.Data;
@Builder
@Data
public class RescueInstructorInProgress {
private Long totalAmendmentInProgress;
private Long expiringToday;
}