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:
Piyush
2025-01-30 15:09:34 +05:30
parent 0f31b61fb9 4ae96705fa
commit f3d2aec3ef
77 changed files with 2059 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

2
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 {
@@ -41,4 +42,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;
}

3
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,6 @@ public class UpdateCallRequestStep1 {
private List<FaqReq> faq;
private EvaluationVersionEnum evaluationVersion;
}

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

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

@@ -0,0 +1,18 @@
package net.gepafin.tendermanagement.model.response;
import lombok.Data;
import net.gepafin.tendermanagement.enums.EvaluationVersionEnum;
@Data
public class ApplicationEvaluationFormResponse {
private Long evaluationFormId;
private Long applicationId;
private Long assignedApplicationId;
private String note;
private String status;
private EvaluationVersionEnum evaluationVersion;
private ApplicationEvaluationFormResponseBean applicationEvaluationFormResponse;
}

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

3
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,6 @@ public class ApplicationEvaluationResponse {
private BigDecimal amountAccepted;
private LocalDateTime dateAccepted;
private LocalDateTime dateRejected;
private EvaluationVersionEnum evaluationVersion;
}

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

@@ -0,0 +1,17 @@
package net.gepafin.tendermanagement.model.response;
import lombok.Data;
import net.gepafin.tendermanagement.enums.ApplicationEvaluationStatusTypeEnum;
import net.gepafin.tendermanagement.enums.EvaluationVersionEnum;
import net.gepafin.tendermanagement.model.BaseBean;
import java.util.List;
@Data
public class ApplicationEvaluationResponseBean extends BaseBean {
private Long applicationId;
private Long evaluationId;
private String note;
private EvaluationVersionEnum evaluationVersion;
private List<ApplicationEvaluationFormFieldReponseBean> formFields;
}

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

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

@@ -2,6 +2,7 @@ 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.time.LocalDateTime;
@@ -22,6 +23,7 @@ public class AssignedApplicationsResponse extends BaseBean {
private LocalDateTime callEndDate;
private String companyName;
private LocalDateTime evaluationEndDate;
private EvaluationVersionEnum evaluationVersion;
}

3
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,6 @@ public class CallDetailsResponseBean {
private LocalDateTime updatedDate;
private Long preferredCallId;
private EvaluationVersionEnum evaluationVersion;
}

3
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
@@ -74,6 +75,8 @@ public class CallResponse {
private String currentStep;
private Long preferredCallId;
private EvaluationVersionEnum evaluationVersion;
}

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