diff --git a/src/main/java/com/iconplus/smartproc/model/projection/DrpView.java b/src/main/java/com/iconplus/smartproc/model/projection/DrpView.java index 81bfadb..1984976 100644 --- a/src/main/java/com/iconplus/smartproc/model/projection/DrpView.java +++ b/src/main/java/com/iconplus/smartproc/model/projection/DrpView.java @@ -23,6 +23,10 @@ public interface DrpView { Date getPrintDate(); void setPrintDate(Date printDate); + Integer getTotalPengadaan(); + void setTotalPengadaan(Integer totalPengadaan); + + Boolean getIsActive(); void setIsActive(Boolean isActive); diff --git a/src/main/java/com/iconplus/smartproc/model/response/DrpResponse.java b/src/main/java/com/iconplus/smartproc/model/response/DrpResponse.java index 8371492..ef90e6d 100644 --- a/src/main/java/com/iconplus/smartproc/model/response/DrpResponse.java +++ b/src/main/java/com/iconplus/smartproc/model/response/DrpResponse.java @@ -20,6 +20,7 @@ public class DrpResponse extends BaseResponse { private Date approveDate; private Boolean isActive; private Boolean isDelete; + private Integer totalPengadaan; private List dataDrpDokumen; diff --git a/src/main/java/com/iconplus/smartproc/repository/DrpRepository.java b/src/main/java/com/iconplus/smartproc/repository/DrpRepository.java index 62397a5..fc0f1d9 100644 --- a/src/main/java/com/iconplus/smartproc/repository/DrpRepository.java +++ b/src/main/java/com/iconplus/smartproc/repository/DrpRepository.java @@ -25,10 +25,12 @@ public interface DrpRepository extends JpaRepository { "d.approveStatus as approveStatus, " + "d.approveDate as approveDate, " + "d.isActive as isActive, " + - "d.isDelete as isDelete " + + "d.isDelete as isDelete, " + + "count(dp.drpId) as totalPengadaan " + "FROM Drp d " + + "LEFT JOIN DrpPengadaan dp ON dp.drpId = d.id " + "WHERE d.isDelete = false " + -// "AND (:approveDate = '' or DATE(d.approveDate) = DATE(approveDate)) " + + "GROUP BY d.id " + "ORDER BY d.id") Page findByIsDeleteFalse(Timestamp approveDate, Pageable pageable); diff --git a/src/main/java/com/iconplus/smartproc/service/drp/GetListDrpService.java b/src/main/java/com/iconplus/smartproc/service/drp/GetListDrpService.java index 04e8990..51f015c 100644 --- a/src/main/java/com/iconplus/smartproc/service/drp/GetListDrpService.java +++ b/src/main/java/com/iconplus/smartproc/service/drp/GetListDrpService.java @@ -33,6 +33,7 @@ public class GetListDrpService implements BaseService