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
2024-08-30 18:54:16 +05:30
parent 18c40eaf03 98d1405a7c
commit 5ed23848bb
22 changed files with 202 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,42 +3,27 @@ package net.gepafin.tendermanagement.model.request;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
@Data
public class CreateCallRequestStep1 {
@NotEmpty
private String name;
@NotEmpty
private String descriptionShort;
@NotEmpty
private String descriptionLong;
@NotNull
private LocalDateTime startDate;
private List<LocalDateTime> dates;
@NotNull
private LocalDateTime endDate;
@NotNull
private Long regionId;
@NotNull
private BigDecimal amount;
@NotNull
private BigDecimal amountMax;
@NotNull
private List<LookUpDataReq> aimedTo;
@NotEmpty
private String documentationRequested;
private Boolean confidi;

3
src/main/java/net/gepafin/tendermanagement/model/request/CreateCallRequestStep2.java
View File

@@ -2,7 +2,6 @@ package net.gepafin.tendermanagement.model.request;
import java.util.List;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
@Data
@@ -10,10 +9,8 @@ public class CreateCallRequestStep2 {
private Long threshold;
@NotNull
private List<EvaluationCriteriaReq> criteria;
@NotNull
private List<LookUpDataReq> checkList;
private List<DocumentReq> docs;

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

@@ -3,7 +3,7 @@ package net.gepafin.tendermanagement.model.request;
import lombok.Data;
@Data
public class FaqReq {
public class FaqReq extends LookUpDataReq{
private Long id;
private Boolean isVisible;

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

@@ -9,35 +9,24 @@ import lombok.Data;
@Data
public class UpdateCallRequestStep1 {
private String name;
private String name;
private String descriptionShort;
private String descriptionShort;
private String descriptionLong;
private String descriptionLong;
private LocalDateTime startDate;
private List<LocalDateTime> dates;
private LocalDateTime endDate;
private BigDecimal amount;
private BigDecimal amount;
private BigDecimal amountMax;
private BigDecimal amountMax;
private List<LookUpDataReq> aimedTo;
private List<LookUpDataReq> aimedTo;
private String documentationRequested;
private String documentationRequested;
private Boolean confidi;
private Boolean confidi;
private List<FaqReq> faq;
private List<FaqReq> faq;
}

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

@@ -35,23 +35,10 @@ public class CallDetailsResponseBean {
private String priorityArea;
private String documentationReqested;
private String documentationRequested;
private LocalDateTime createdDate;
private LocalDateTime updatedDate;
private List<LookUpDataResponse> aimedTo;
private List<EvaluationCriteriaResponseBean> criteria;
private List<DocumentResponseBean> docs;
private List<FaqResponseBean> faq;
private List<DocumentResponseBean> images;
private List<LookUpDataResponse> checkList;
private String currentStep;
}

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

@@ -18,9 +18,7 @@ public class CallResponse {
private String descriptionLong;
private LocalDateTime startDate;
private LocalDateTime endDate;
private List<LocalDateTime> dates;
private CallStatusEnum status;
@@ -38,7 +36,7 @@ public class CallResponse {
private String priorityArea;
private String documentationReqested;
private String documentationRequested;
private Boolean confidi;

8
src/main/java/net/gepafin/tendermanagement/model/response/FaqResponseBean.java
View File

@@ -23,4 +23,12 @@ public class FaqResponseBean extends BaseBean {
private LocalDateTime responseDate;
private Long lookUpDataId;
private String title;
private String value;
}