add constant status
This commit is contained in:
@ -1,21 +1,22 @@
|
||||
package com.iconplus.smartproc.service.approval;
|
||||
|
||||
import com.iconplus.smartproc.helper.model.Pagination;
|
||||
import com.iconplus.smartproc.helper.service.BaseService;
|
||||
import com.iconplus.smartproc.model.projection.DrpApprovalView;
|
||||
import com.iconplus.smartproc.model.request.DrpApprovalRequest;
|
||||
import com.iconplus.smartproc.model.response.DrpApprovalResponse;
|
||||
import com.iconplus.smartproc.model.response.GetListDrpApprovalResponse;
|
||||
import com.iconplus.smartproc.repository.DrpApprovalRepository;
|
||||
import com.iconplus.smartproc.repository.DrpRepository;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
@Slf4j
|
||||
public class GetListApprovalDrpServie implements BaseService<DrpApprovalRequest, DrpApprovalResponse> {
|
||||
public class GetListApprovalDrpServie implements BaseService<DrpApprovalRequest, GetListDrpApprovalResponse> {
|
||||
|
||||
private final DrpRepository drpRepository;
|
||||
private final DrpApprovalRepository drpApprovalRepository;
|
||||
@ -28,7 +29,7 @@ public class GetListApprovalDrpServie implements BaseService<DrpApprovalRequest,
|
||||
}
|
||||
|
||||
@Override
|
||||
public DrpApprovalResponse execute(DrpApprovalRequest input) throws IOException {
|
||||
public GetListDrpApprovalResponse execute(DrpApprovalRequest input) {
|
||||
|
||||
List<DrpApprovalResponse> drpApprovalResponseList = new ArrayList<>();
|
||||
var drpApprovalViews = drpRepository.getListApprovalDrp(input.getPageable());
|
||||
@ -37,6 +38,7 @@ public class GetListApprovalDrpServie implements BaseService<DrpApprovalRequest,
|
||||
.id(drpApprovalView.getId())
|
||||
.drpId(drpApprovalView.getDrpId())
|
||||
.tahun(drpApprovalView.getTahun())
|
||||
.approveStatus(drpApprovalView.getApproveStatus())
|
||||
.approverVpDate(drpApprovalView.getApproverVpDate())
|
||||
.approverKomite1Date(drpApprovalView.getApproverKomite1Date())
|
||||
.approverKomite2Date(drpApprovalView.getApproverKomite2Date())
|
||||
@ -44,9 +46,19 @@ public class GetListApprovalDrpServie implements BaseService<DrpApprovalRequest,
|
||||
.approverKomite4Date(drpApprovalView.getApproverKomite4Date())
|
||||
.approverDirekturDate(drpApprovalView.getApproverDirekturDate())
|
||||
.build();
|
||||
drpApprovalResponseList.add(drpApprovalResponse);
|
||||
}
|
||||
return null;
|
||||
|
||||
|
||||
return GetListDrpApprovalResponse.builder()
|
||||
.data(drpApprovalResponseList)
|
||||
.pagination(Pagination.builder()
|
||||
.pageSize(input.getPageable().getPageSize())
|
||||
.currentPage(input.getPageable().getPageNumber())
|
||||
.totalPages(drpApprovalViews.getTotalPages())
|
||||
.totalRecords(drpApprovalViews.getTotalElements())
|
||||
.isFirstPage(drpApprovalViews.isFirst())
|
||||
.isLastPage(drpApprovalViews.isLast())
|
||||
.build())
|
||||
.build();
|
||||
}
|
||||
}
|
||||
|
@ -35,16 +35,12 @@ public class PostCreateDrpService implements BaseService<DrpRequest, DrpResponse
|
||||
Constants.ERR_TTL_10001,
|
||||
String.format(Constants.ERR_MSG_10001, "DRP", input.getId())));
|
||||
|
||||
drp.setApproveStatus(input.getApproveStatus());
|
||||
drp.setIsActive(input.getIsActive());
|
||||
|
||||
var drpSaved = drpRepository.save(drp);
|
||||
|
||||
List<DrpDokumen> drpDokumenList = new ArrayList<>();
|
||||
if (ObjectUtils.isNotEmpty(input.getDataDrpDokumen())) {
|
||||
for (DrpDokumenRequest drpDokumenRequest : input.getDataDrpDokumen()) {
|
||||
DrpDokumen drpDokumen = DrpDokumen.builder()
|
||||
.drpId(drpSaved.getId())
|
||||
.drpId(drp.getId())
|
||||
.jenisDokumenId(drpDokumenRequest.getJenisDokumenId())
|
||||
.filename(drpDokumenRequest.getFilename())
|
||||
.keterangan(drpDokumenRequest.getKeterangan())
|
||||
@ -58,7 +54,7 @@ public class PostCreateDrpService implements BaseService<DrpRequest, DrpResponse
|
||||
drpDokumenRepository.saveAll(drpDokumenList);
|
||||
|
||||
return DrpResponse.builder()
|
||||
.id(drpSaved.getId())
|
||||
.id(drp.getId())
|
||||
.build();
|
||||
}
|
||||
}
|
||||
|
@ -25,6 +25,7 @@ public class PostCreateTahunDrpService implements BaseService<DrpRequest, DrpRes
|
||||
|
||||
Drp drp = Drp.builder()
|
||||
.tahun(input.getTahun())
|
||||
.approveStatus(Constants.STATUS_PENYUSUNAN)
|
||||
.isDelete(false)
|
||||
.build();
|
||||
|
||||
|
Reference in New Issue
Block a user