pointing sindiglive

src/main/java/com/iconplus/smartproc/model/entity/DrpRekomendasi.java

@@ -23,6 +23,12 @@ public class DrpRekomendasi extends BaseEntity {
     @Column(name = "id")
     private Long id;
 
+    @Column(name = "drp_id")
+    private Long drpId;
+
+    @Column(name = "user_id")
+    private Long userId;
+
     @Column(name = "jenis_pengadaan_id")
     private Long jenisPengadaanId;
 

src/main/java/com/iconplus/smartproc/model/projection/DrpRekomendasiView.java

@@ -1,27 +1,23 @@
 package com.iconplus.smartproc.model.projection;
 
-import java.util.Date;
+
+import java.sql.Date;
 
 public interface DrpRekomendasiView {
 
     Long getId();
     void setId(Long id);
 
-    String getNomorRkp();
-    void setNomorRkp(String nomorRkp);
+    String getJabatan();
+    void setJabatan(String jabatan);
 
+    Boolean getIsApprove();
+    void setIsApprove(Boolean isApprove);
 
-    String getNamaPengadaan();
-    void setNamaPengadaan(String namaPengadaan);
+    Date getRekomendasiDate();
+    void setRekomendasiDate(Date rekomendasiDate);
 
-    String getApproval();
-    void setApproval(String approval);
+    String getRekomendasi();
+    void setRekomendasiDate(String rekomendasi);
 
-    Boolean getStatus();
-    void setStatus(Boolean status);
-
-
-//    Date approveDate;
-//    Date rekomendasiDate;
-//    String rekomendasi;
 }

src/main/java/com/iconplus/smartproc/model/request/DrpApprovalRequest.java

@@ -18,6 +18,7 @@ public class DrpApprovalRequest extends BaseRequest {
     private Long drpId;
     private Long approverUserId;
     private String level;
+    private Long jenisPengadaanId;
 
     private String search;
     private transient Pageable pageable;

src/main/java/com/iconplus/smartproc/model/request/DrpRekomendasiRequest.java

@@ -16,9 +16,12 @@ public class DrpRekomendasiRequest extends BaseRequest {
 
     private Long id;
     private Long drpApprovalId;
+    private Long userId;
+    private Long drpId;
     private Long jenisPengadaanId;
     private String rekomendasi;
     private Date rekomendasiDate;
 
 
+
 }

src/main/java/com/iconplus/smartproc/model/response/DrpApprovalResponse.java

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.sql.Date;
+import java.util.List;
 
 @Data
 @Builder
@@ -21,4 +22,9 @@ public class DrpApprovalResponse extends BaseResponse {
     private Date approverVpDate;
     private Date approverKomiteDate;
     private Date approverDirekturDate;
+
+    private DrpPengadaanResponse dataPengadaan;
+    private List<DrpPengadaanDokumenResponse> dataPengadaanDokumen;
+    private List<DrpRekomendasiResponse> dataRekomendasi;
+
 }

src/main/java/com/iconplus/smartproc/model/response/DrpRekomendasiResponse.java

@@ -6,7 +6,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.Date;
+import java.sql.Date;
+
 
 @Data
 @Builder
@@ -22,4 +23,5 @@ public class DrpRekomendasiResponse extends BaseResponse {
     private Date approveDate;
     private Date rekomendasiDate;
     private String rekomendasi;
+    private String jabatan;
 }

src/main/java/com/iconplus/smartproc/model/response/GetListDrpRekomendasiResponse.java

@@ -2,13 +2,11 @@ package com.iconplus.smartproc.model.response;
 
 import com.iconplus.smartproc.helper.base.BaseResponse;
 import com.iconplus.smartproc.helper.model.Pagination;
-import com.iconplus.smartproc.model.response.DrpRekomendasiResponse;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.Date;
 import java.util.List;
 
 @Data