refactor approve status
This commit is contained in:
parent
3907377492
commit
bab3a7a3d9
@ -27,9 +27,8 @@ public class Drp extends BaseEntity {
|
||||
@Column(name = "tahun")
|
||||
private Integer tahun;
|
||||
|
||||
@Column(name = "is_approve")
|
||||
@Type(type = "org.hibernate.type.NumericBooleanType")
|
||||
private Boolean isApprove;
|
||||
@Column(name = "approve_status")
|
||||
private String approveStatus;
|
||||
|
||||
@Column(name = "approve_date")
|
||||
private Timestamp approveDate;
|
||||
|
@ -34,9 +34,6 @@ public class DrpDokumen extends BaseEntity {
|
||||
@Column(name = "keterangan")
|
||||
private String keterangan;
|
||||
|
||||
@Column(name = "file")
|
||||
private byte[] file;
|
||||
|
||||
@Column(name = "is_active")
|
||||
@Type(type = "org.hibernate.type.NumericBooleanType")
|
||||
private Boolean isActive;
|
||||
|
@ -31,9 +31,6 @@ public class DrpPengadaanDokumen extends BaseEntity {
|
||||
@Column(name = "filename")
|
||||
private String filename;
|
||||
|
||||
@Column(name = "file")
|
||||
private byte[] file;
|
||||
|
||||
@Column(name = "keterangan")
|
||||
private String keterangan;
|
||||
|
||||
|
@ -10,8 +10,8 @@ public interface DrpView {
|
||||
Integer getTahun();
|
||||
void setTahun(Integer tahun);
|
||||
|
||||
Boolean getIsApprove();
|
||||
void setIsApprove(Boolean isApprove);
|
||||
String getApproveStatus();
|
||||
void setApproveStatus(String isApprove);
|
||||
|
||||
Timestamp getApproveDate();
|
||||
void setApproveDate(Timestamp approveDate);
|
||||
|
@ -17,7 +17,7 @@ import java.util.List;
|
||||
public class DrpRequest extends BaseRequest {
|
||||
private Long id;
|
||||
private Integer tahun;
|
||||
private Boolean isApprove;
|
||||
private String approveStatus;
|
||||
private Timestamp approveDate;
|
||||
private Boolean isActive;
|
||||
|
||||
|
@ -16,7 +16,7 @@ import java.util.List;
|
||||
public class DrpResponse extends BaseResponse {
|
||||
private Long id;
|
||||
private Integer tahun;
|
||||
private Boolean isApprove;
|
||||
private String approveStatus;
|
||||
private Timestamp approveDate;
|
||||
private Boolean isActive;
|
||||
private Boolean isDelete;
|
||||
|
@ -21,7 +21,7 @@ public interface DrpRepository extends JpaRepository<Drp, Long> {
|
||||
|
||||
@Query(value = "SELECT d.id as id, " +
|
||||
"d.tahun as tahun, " +
|
||||
"d.isApprove as isApprove, " +
|
||||
"d.approveStatus as approveStatus, " +
|
||||
"d.approveDate as approveDate, " +
|
||||
"d.isActive as isActive, " +
|
||||
"d.isDelete as isDelete " +
|
||||
|
@ -49,7 +49,7 @@ public class GetDrpService implements BaseService<DrpRequest, DrpResponse> {
|
||||
return DrpResponse.builder()
|
||||
.id(drp.getId())
|
||||
.tahun(drp.getTahun())
|
||||
.isApprove(drp.getIsApprove())
|
||||
.approveStatus(drp.getApproveStatus())
|
||||
.approveDate(drp.getApproveDate())
|
||||
.isActive(drp.getIsActive())
|
||||
.isDelete(drp.getIsDelete())
|
||||
|
@ -31,7 +31,7 @@ public class GetListDrpService implements BaseService<DrpRequest, GetListDrpResp
|
||||
DrpResponse drpResponse = DrpResponse.builder()
|
||||
.id(drpView.getId())
|
||||
.tahun(drpView.getTahun())
|
||||
.isApprove(drpView.getIsApprove())
|
||||
.approveStatus(drpView.getApproveStatus())
|
||||
.approveDate(drpView.getApproveDate())
|
||||
.isActive(drpView.getIsActive())
|
||||
.isDelete(drpView.getIsDelete())
|
||||
|
@ -57,7 +57,6 @@ public class PostCreateDrpPengadaanService implements BaseService<DrpPengadaanRe
|
||||
.drpId(input.getDrpId())
|
||||
.jenisDokumenId(drpPengadaanDokumenRequest.getJenisDokumenId())
|
||||
.filename(drpPengadaanDokumenRequest.getFilename())
|
||||
.file(drpPengadaanDokumenRequest.getFile())
|
||||
.keterangan(drpPengadaanDokumenRequest.getKeterangan())
|
||||
.isDelete(false)
|
||||
.build();
|
||||
|
@ -47,7 +47,7 @@ public class PostCreateDrpService implements BaseService<DrpRequest, DrpResponse
|
||||
|
||||
Drp drp = Drp.builder()
|
||||
.tahun(input.getTahun())
|
||||
.isApprove(false)
|
||||
.approveStatus(input.getApproveStatus())
|
||||
.isActive(input.getIsActive())
|
||||
.isDelete(false)
|
||||
.build();
|
||||
@ -61,7 +61,6 @@ public class PostCreateDrpService implements BaseService<DrpRequest, DrpResponse
|
||||
.drpId(drpSaved.getId())
|
||||
.jenisDokumenId(drpDokumenRequest.getJenisDokumenId())
|
||||
.filename(drpDokumenRequest.getFilename())
|
||||
.file(drpDokumenRequest.getFile())
|
||||
.keterangan(drpDokumenRequest.getKeterangan())
|
||||
.isDelete(false)
|
||||
.build();
|
||||
@ -77,7 +76,6 @@ public class PostCreateDrpService implements BaseService<DrpRequest, DrpResponse
|
||||
.drpId(drpSaved.getId())
|
||||
.jenisDokumenId(drpPengadaanDokumenRequest.getJenisDokumenId())
|
||||
.filename(drpPengadaanDokumenRequest.getFilename())
|
||||
.file(drpPengadaanDokumenRequest.getFile())
|
||||
.keterangan(drpPengadaanDokumenRequest.getKeterangan())
|
||||
.isDelete(false)
|
||||
.build();
|
||||
|
Loading…
x
Reference in New Issue
Block a user