Resolve Conflicts

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

@@ -3,6 +3,7 @@ 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 ApplicationEvaluationRequest {
@@ -15,4 +16,5 @@ public class ApplicationEvaluationRequest {
     private String note;
     private ApplicationStatusForEvaluation applicationStatus;
     private String motivation;
+    private BigDecimal amountAccepted;
 }

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

@@ -1,6 +1,7 @@
 package net.gepafin.tendermanagement.model.request;
 
 import java.math.BigDecimal;
+import java.util.Map;
 
 import lombok.Data;
 
@@ -23,4 +24,5 @@ public class CompanyRequest {
     private Boolean isLegalRepresentant;
     private String contactName;
     private String contactEmail;
+    private Map<String, Object> vatCheckResponse;
 }

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

@@ -4,6 +4,7 @@ import lombok.Data;
 import net.gepafin.tendermanagement.enums.ApplicationEvaluationStatusTypeEnum;
 import net.gepafin.tendermanagement.enums.ApplicationStatusTypeEnum;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -38,4 +39,8 @@ public class ApplicationEvaluationResponse {
     private LocalDateTime assignedAt;
     private String ndg;
     private String appointmentId;
+    private BigDecimal amountRequested;
+    private BigDecimal amountAccepted;
+    private LocalDateTime dateAccepted;
+    private LocalDateTime dateRejected;
 }

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

@@ -2,6 +2,7 @@ package net.gepafin.tendermanagement.model.response;
 
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -26,6 +27,15 @@ public class ApplicationGetResponseBean {
 
     private Long protocolNumber;
 
+    private BigDecimal amountRequested;
+
+    private BigDecimal amountAccepted;
+
+    private LocalDateTime dateAccepted;
+
+    private LocalDateTime dateRejected;
+
+
     private List<FormApplicationResponse> form;
 
 }

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

@@ -3,6 +3,7 @@ package net.gepafin.tendermanagement.model.response;
 import lombok.Data;
 import net.gepafin.tendermanagement.model.response.ApplicationFormFieldResponseBean;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -37,4 +38,12 @@ public class ApplicationResponse{
 
     private String assignedUserName;
 
+    private BigDecimal amountRequested;
+
+    private BigDecimal amountAccepted;
+
+    private LocalDateTime dateAccepted;
+
+    private LocalDateTime dateRejected;
+
 }

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

@@ -3,6 +3,7 @@ package net.gepafin.tendermanagement.model.response;
 import lombok.Data;
 import net.gepafin.tendermanagement.model.BaseBean;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -19,6 +20,14 @@ public class ApplicationResponseBean extends BaseBean {
 
     private Long protocolNumber;
 
+    private BigDecimal amountRequested;
+
+    private BigDecimal amountAccepted;
+
+    private LocalDateTime dateAccepted;
+
+    private LocalDateTime dateRejected;
+
     private List<ApplicationFormFieldResponseBean> formFields;
 
 }

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

@@ -0,0 +1,23 @@
+package net.gepafin.tendermanagement.model.response;
+
+import lombok.Builder;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Builder
+@Data
+public class ApplicationWidgetResponseBean {
+
+    private Long numberOfApplication;
+
+    private Long numberOfAssignedApplication;
+
+    private Long numberOfAcceptedApplication;
+
+    private Long numberOfApplicationInAmendmentState;
+
+    private Long numberOfDueApplication;
+
+    private BigDecimal evaluationAverageTime;
+}

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

@@ -3,6 +3,9 @@ package net.gepafin.tendermanagement.model.response;
 import lombok.Data;
 import net.gepafin.tendermanagement.enums.ApplicationStatusTypeEnum;
 
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
 @Data
 public class NextOrPreviousFormResponse {
 	
@@ -25,6 +28,14 @@ public class NextOrPreviousFormResponse {
 	private Long protocolNumber;
 
 	private ApplicationStatusTypeEnum applicationStatus;
+
+	private BigDecimal amountRequested;
+
+	private BigDecimal amountAccepted;
+
+	private LocalDateTime dateAccepted;
+
+	private LocalDateTime dateRejected;
 	
 	private FormApplicationResponse applicationFormResponse;
 

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

@@ -1,14 +1,17 @@
 package net.gepafin.tendermanagement.model.response;
 
 import lombok.Data;
+import net.gepafin.tendermanagement.entities.UserActionEntity;
+import org.springframework.data.domain.Page;
 
 import java.util.List;
+import java.util.Map;
 
 @Data
 public class SuperAdminWidgetResponseBean {
 
     private  Widget1 widget1;
 
-//    private List<Object[]> widgetBars;
+    private Map<String, Object>  widgetBars;
 
 }

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

@@ -0,0 +1,12 @@
+package net.gepafin.tendermanagement.model.response;
+import lombok.Getter;
+import lombok.Setter;
+import java.util.Map;
+
+@Getter
+@Setter
+public class VatCheckResponseBean {
+    private Boolean valid;
+    private Map<String, Object> vatCheckResponse;
+    private String message;
+}

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

@@ -23,4 +23,8 @@ public class Widget1 {
 
     private BigDecimal totalActiveFinancing;
 
+    private BigDecimal totalAmountRequested;
+
+    private BigDecimal totalAmountAccepted;
+
 }