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-12-31 14:25:48 +05:30
parent 4eeee4be16 a0af62b67e
commit a7a6b369d7
122 changed files with 4364 additions and 572 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/net/gepafin/tendermanagement/model/request/AmendmentDetailsRequest.java Normal file
View File

@@ -0,0 +1,15 @@
package net.gepafin.tendermanagement.model.request;
import lombok.Data;
import java.util.List;
@Data
public class AmendmentDetailsRequest {
private String fieldId;
private Long amendmentId;
private Boolean valid;
}

13
src/main/java/net/gepafin/tendermanagement/model/request/AmendmentFieldRequest.java Normal file
View File

@@ -0,0 +1,13 @@
package net.gepafin.tendermanagement.model.request;
import lombok.Data;
@Data
public class AmendmentFieldRequest {
private String fieldId;
private String nameValue;
private String fileValue;
private Boolean valid = false;
}

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

@@ -9,9 +9,13 @@ public class AmendmentFormField {
private String fieldId;
private String label;
private String fieldValue;
private String isUploadedBy;
private Boolean valid;
public enum AmendmentIsUploadedByEnum {

17
src/main/java/net/gepafin/tendermanagement/model/request/AmendmentFormFieldRequest.java Normal file
View File

@@ -0,0 +1,17 @@
package net.gepafin.tendermanagement.model.request;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
public class AmendmentFormFieldRequest {
private String fieldId;
private Object fieldValue;
private Boolean valid;
}

4
src/main/java/net/gepafin/tendermanagement/model/request/ApplicationAmendmentRequestBean.java
View File

@@ -7,5 +7,7 @@ import lombok.Data;
@Data
public class ApplicationAmendmentRequestBean {
private String note;
private List<ApplicationFormFieldRequestBean> applicationFormFields;
private List<AmendmentFormFieldRequest> applicationFormFields;
private String amendmentDocuments;
private String amendmentNotes;
}

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

@@ -10,6 +10,8 @@ public class ApplicationEvaluationRequest {
private List<CriteriaRequest> criteria;
private List<ChecklistRequest> checklist;
private List<FieldRequest> files;
private List<EvaluationDocumentRequest> evaluationDocument;
private List<AmendmentDetailsRequest> amendmentDetails;
private String note;
private ApplicationStatusForEvaluation applicationStatus;
private String motivation;

42
src/main/java/net/gepafin/tendermanagement/model/request/AppointmentCreationRequest.java Normal file
View File

@@ -0,0 +1,42 @@
package net.gepafin.tendermanagement.model.request;
import lombok.Data;
import java.util.List;
@Data
public class AppointmentCreationRequest {
private Input input;
@Data
public static class Input {
private String id;
private String ndg;
private List<RichiestaCliente> richiestaCliente;
}
@Data
public static class RichiestaCliente {
private String codAbi;
private String codCab;
private Integer durataMesiFinanziamento;
private Integer idMotivazione;
private String idNota;
private String importoAgevolato;
private Double importoBreveTermine;
private String importoMedioLungoTermine;
private String codTipoProdotto;
private String codCategoriaProdotto;
private String codFormaTecnica;
private String codProdotto;
private String codOperazione;
private Nota nota;
}
@Data
public static class Nota {
private String titolo;
private String testo;
}
}

20
src/main/java/net/gepafin/tendermanagement/model/request/AppointmentNdgRequest.java Normal file
View File

@@ -0,0 +1,20 @@
package net.gepafin.tendermanagement.model.request;
import lombok.Data;
@Data
public class AppointmentNdgRequest {
private Filter filter;
private Pagination pagination;
@Data
public static class Filter {
private String partitaIva;
}
@Data
public static class Pagination {
private int targetPage;
private int recordsPerPage;
}
}

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

@@ -0,0 +1,14 @@
package net.gepafin.tendermanagement.model.request;
import lombok.Data;
@Data
public class AppointmentVisuraListRequest {
private AppointmentVisuraListRequest.VisuraFilter filter;
@Data
public static class VisuraFilter {
private String idVisura;
}
}

28
src/main/java/net/gepafin/tendermanagement/model/request/AppointmentVisuraRequest.java Normal file
View File

@@ -0,0 +1,28 @@
package net.gepafin.tendermanagement.model.request;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import lombok.Setter;
@Data
public class AppointmentVisuraRequest {
private VisuraInput input;
@Data
public static class VisuraInput {
private String codiceFiscale;
private String partitaIva;
private boolean creaAnagrafica;
private boolean salvaDocumenti;
private String visuraProvider;
private String visuraType;
private String visuraMode;
private String codArea;
private String codAgente;
@JsonProperty("isFromRating")
private boolean isFromRating;
@JsonProperty("isAnagraficaLegame")
private boolean isAnagraficaLegame;
}
}

17
src/main/java/net/gepafin/tendermanagement/model/request/CreateAppointmentRequest.java Normal file
View File

@@ -0,0 +1,17 @@
package net.gepafin.tendermanagement.model.request;
import lombok.Data;
@Data
public class CreateAppointmentRequest {
private Double importoBreveTermine;
private Integer durataMesiFinanziamento;
private Nota nota;
@Data
public static class Nota {
private String titolo;
private String testo;
}
}

15
src/main/java/net/gepafin/tendermanagement/model/request/EvaluationDocumentRequest.java Normal file
View File

@@ -0,0 +1,15 @@
package net.gepafin.tendermanagement.model.request;
import lombok.Data;
@Data
public class EvaluationDocumentRequest {
private String fieldId;
private String nameValue;
private String fileValue;
private Boolean valid;
}

45
src/main/java/net/gepafin/tendermanagement/model/request/NotificationReq.java Normal file
View File

@@ -0,0 +1,45 @@
package net.gepafin.tendermanagement.model.request;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import net.gepafin.tendermanagement.entities.UserWithCompanyEntity;
import java.time.LocalDateTime;
import java.util.List;
@Data
public class NotificationReq {
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
Long id;
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
Long userId;
String message;
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
String notificationType;
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
String status;
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
private LocalDateTime createdDate;
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
private LocalDateTime updatedDate;
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
private String redirectUrl;
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
private String title;
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
private List<Long> companyIds;
@JsonIgnore
private UserWithCompanyEntity userWithCompanyEntity;
}

10
src/main/java/net/gepafin/tendermanagement/model/request/UpdateAssignedApplicationRequest.java Normal file
View File

@@ -0,0 +1,10 @@
package net.gepafin.tendermanagement.model.request;
import lombok.Data;
import net.gepafin.tendermanagement.enums.AssignedApplicationEnum;
@Data
public class UpdateAssignedApplicationRequest {
private String note;
private AssignedApplicationEnum status;
private Long userId;
}

23
src/main/java/net/gepafin/tendermanagement/model/request/UploadDocToExternalSystemRequest.java Normal file
View File

@@ -0,0 +1,23 @@
package net.gepafin.tendermanagement.model.request;
import lombok.Data;
@Data
public class UploadDocToExternalSystemRequest {
private Input input;
@Data
public static class Input {
private Long idTipoProtocollo;
private Long idClassificazione;
private Boolean flagDaFirmare;
private String descrizione;
private Attributes attributes;
@Data
public static class Attributes {
private String ndg;
private String email;
}
}
}

12
src/main/java/net/gepafin/tendermanagement/model/response/AmendmentDetailsResponseBean.java Normal file
View File

@@ -0,0 +1,12 @@
package net.gepafin.tendermanagement.model.response;
import lombok.Data;
import java.util.List;
@Data
public class AmendmentDetailsResponseBean {
private String amendmentDocuments;
private String amendmentNotes;
private Boolean valid;
}

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

@@ -0,0 +1,15 @@
package net.gepafin.tendermanagement.model.response;
import lombok.Data;
import java.util.List;
@Data
public class AmendmentDocumentResponseBean {
private Long amendmentId;
private String fieldId;
private String label;
private Boolean valid;
private List<DocumentResponseBean> fileDetail ;
}

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

@@ -1,7 +1,6 @@
package net.gepafin.tendermanagement.model.response;
import lombok.Data;
import net.gepafin.tendermanagement.entities.ApplicationEvaluationEntity;
import net.gepafin.tendermanagement.enums.ApplicationAmendmentRequestEnum;
import java.time.LocalDateTime;
@@ -19,8 +18,12 @@ public class ApplicationAmendmentRequestResponse {
private Long protocolNumber;
private String callName;
private String beneficiaryName;
private String companyName;
private List<AmendmentFormFieldResponse> formFields;
private List<ApplicationFormFieldResponseBean> applicationFormFields;
private List<DocumentResponseBean> amendmentDocuments;
private String amendmentNotes;
private Boolean valid;
private Long applicationId;
private Long applicationEvaluationId;
private LocalDateTime evaluationEndDate;
@@ -28,4 +31,5 @@ public class ApplicationAmendmentRequestResponse {
private List<CommunicationResponseBean> commentsList;
private String internalNote;
private ApplicationAmendmentRequestEnum status;
private String emailTemplate;
}

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

@@ -21,13 +21,21 @@ public class ApplicationEvaluationResponse {
private List<CriteriaResponse> criteria;
private List<ChecklistResponse> checklist;
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;
}

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

@@ -33,4 +33,8 @@ public class ApplicationResponse{
private Long protocolNumber;
private Long assignedUserId;
private String assignedUserName;
}

8
src/main/java/net/gepafin/tendermanagement/model/response/AppointmentCreationResponse.java Normal file
View File

@@ -0,0 +1,8 @@
package net.gepafin.tendermanagement.model.response;
import lombok.Data;
@Data
public class AppointmentCreationResponse {
private String appointmentId;
}

16
src/main/java/net/gepafin/tendermanagement/model/response/AppointmentLoginResponse.java Normal file
View File

@@ -0,0 +1,16 @@
package net.gepafin.tendermanagement.model.response;
import lombok.Data;
@Data
public class AppointmentLoginResponse {
private String tokenId;
private String areaCode;
private Long companyId;
private String codecFiscale;
private String vatNumber;
private String ndg;
private String message;
private String idVisura;
}

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

@@ -25,4 +25,6 @@ public class DocumentResponseBean {
private LocalDateTime createdDate;
private LocalDateTime updatedDate;
private String documentAttachmentId;
}

8
src/main/java/net/gepafin/tendermanagement/model/response/DocumentUploadResponse.java Normal file
View File

@@ -0,0 +1,8 @@
package net.gepafin.tendermanagement.model.response;
import lombok.Data;
@Data
public class DocumentUploadResponse {
private String documentAttachmentId;
}

10
src/main/java/net/gepafin/tendermanagement/model/response/EmailContentResponse.java Normal file
View File

@@ -0,0 +1,10 @@
package net.gepafin.tendermanagement.model.response;
import lombok.Data;
@Data
public class EmailContentResponse {
private final String subject;
private final String body;
private final SystemEmailTemplateResponse systemEmailTemplateResponse;
}

14
src/main/java/net/gepafin/tendermanagement/model/response/EvaluationDocumentResponse.java Normal file
View File

@@ -0,0 +1,14 @@
package net.gepafin.tendermanagement.model.response;
import lombok.Data;
import java.util.List;
@Data
public class EvaluationDocumentResponse {
private String fieldId;
private String nameValue;
private Boolean valid;
private List<DocumentResponseBean> fileValue ;
}

8
src/main/java/net/gepafin/tendermanagement/model/response/NdgResponse.java Normal file
View File

@@ -0,0 +1,8 @@
package net.gepafin.tendermanagement.model.response;
import lombok.Data;
@Data
public class NdgResponse {
private String ndg;
}

21
src/main/java/net/gepafin/tendermanagement/model/response/NotificationResponse.java Normal file
View File

@@ -0,0 +1,21 @@
package net.gepafin.tendermanagement.model.response;
import lombok.Data;
import net.gepafin.tendermanagement.model.BaseBean;
@Data
public class NotificationResponse extends BaseBean {
private Long userId;
private String title;
private String message;
private String status;
private Long companyId;
private String redirectUrl;
private String notificationType;
}

1
src/main/java/net/gepafin/tendermanagement/model/response/UserResponseBean.java
View File

@@ -40,6 +40,7 @@ public class UserResponseBean extends BaseBean {
private List<CompanyResponse> companies;
private Boolean privacy;
private Boolean terms;
private Boolean marketing;