Resolved conflicts of PR GEPAFINBE-6139 (Reviewed Evaluation Process)

src/main/java/net/gepafin/tendermanagement/model/request/ApplicationTechnicalEvaluationRejectedRequest.java

@@ -0,0 +1,13 @@
+package net.gepafin.tendermanagement.model.request;
+
+import lombok.Data;
+
+import java.util.Map;
+
+@Data
+public class ApplicationTechnicalEvaluationRejectedRequest {
+
+    private Map<String, Object> emailJson;
+
+
+}

src/main/java/net/gepafin/tendermanagement/model/request/AppointmentCreationRequest.java

@@ -2,6 +2,7 @@ package net.gepafin.tendermanagement.model.request;
 
 import lombok.Data;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Data
@@ -32,6 +33,7 @@ public class AppointmentCreationRequest {
         private String codProdotto;
         private String codOperazione;
         private Nota nota;
+        private LocalDateTime dataAppuntamento;
     }
 
     @Data

src/main/java/net/gepafin/tendermanagement/model/request/CreateAppointmentRequest.java

@@ -2,11 +2,14 @@ package net.gepafin.tendermanagement.model.request;
 
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 @Data
 public class CreateAppointmentRequest {
     private Double importoBreveTermine;
     private Integer durataMesiFinanziamento;
     private Nota nota;
+    private LocalDateTime dataAppuntamento;
 
     @Data
     public static class Nota {

src/main/java/net/gepafin/tendermanagement/model/response/ApplicationAmendmentRequestResponse.java

@@ -33,4 +33,5 @@ public class ApplicationAmendmentRequestResponse {
     private ApplicationAmendmentRequestEnum status;
     private String emailTemplate;
     private List<EmailSendResponse> emailSendResponse;
+    private List<DocumentResponseBean> amendmentInitialDocuments;
 }

src/main/java/net/gepafin/tendermanagement/model/response/CommunicationResponseBean.java

@@ -3,6 +3,7 @@ package net.gepafin.tendermanagement.model.response;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Data
 public class CommunicationResponseBean {
@@ -23,6 +24,8 @@ public class CommunicationResponseBean {
     private Long receiverUserId;
 
     private Long amendmentId;
+
+    private List<DocumentResponseBean> documents;
     
     public CommunicationResponseBean(LocalDateTime commentedDate, String comment, String title, LocalDateTime createdDate, LocalDateTime updatedDate, Long amendmentId, Long id) {