refactor approve status

This commit is contained in:
dirgantarasiahaan 2023-05-29 15:29:38 +07:00
parent 3907377492
commit bab3a7a3d9
11 changed files with 10 additions and 20 deletions

View File

@ -27,9 +27,8 @@ public class Drp extends BaseEntity {
@Column(name = "tahun") @Column(name = "tahun")
private Integer tahun; private Integer tahun;
@Column(name = "is_approve") @Column(name = "approve_status")
@Type(type = "org.hibernate.type.NumericBooleanType") private String approveStatus;
private Boolean isApprove;
@Column(name = "approve_date") @Column(name = "approve_date")
private Timestamp approveDate; private Timestamp approveDate;

View File

@ -34,9 +34,6 @@ public class DrpDokumen extends BaseEntity {
@Column(name = "keterangan") @Column(name = "keterangan")
private String keterangan; private String keterangan;
@Column(name = "file")
private byte[] file;
@Column(name = "is_active") @Column(name = "is_active")
@Type(type = "org.hibernate.type.NumericBooleanType") @Type(type = "org.hibernate.type.NumericBooleanType")
private Boolean isActive; private Boolean isActive;

View File

@ -31,9 +31,6 @@ public class DrpPengadaanDokumen extends BaseEntity {
@Column(name = "filename") @Column(name = "filename")
private String filename; private String filename;
@Column(name = "file")
private byte[] file;
@Column(name = "keterangan") @Column(name = "keterangan")
private String keterangan; private String keterangan;

View File

@ -10,8 +10,8 @@ public interface DrpView {
Integer getTahun(); Integer getTahun();
void setTahun(Integer tahun); void setTahun(Integer tahun);
Boolean getIsApprove(); String getApproveStatus();
void setIsApprove(Boolean isApprove); void setApproveStatus(String isApprove);
Timestamp getApproveDate(); Timestamp getApproveDate();
void setApproveDate(Timestamp approveDate); void setApproveDate(Timestamp approveDate);

View File

@ -17,7 +17,7 @@ import java.util.List;
public class DrpRequest extends BaseRequest { public class DrpRequest extends BaseRequest {
private Long id; private Long id;
private Integer tahun; private Integer tahun;
private Boolean isApprove; private String approveStatus;
private Timestamp approveDate; private Timestamp approveDate;
private Boolean isActive; private Boolean isActive;

View File

@ -16,7 +16,7 @@ import java.util.List;
public class DrpResponse extends BaseResponse { public class DrpResponse extends BaseResponse {
private Long id; private Long id;
private Integer tahun; private Integer tahun;
private Boolean isApprove; private String approveStatus;
private Timestamp approveDate; private Timestamp approveDate;
private Boolean isActive; private Boolean isActive;
private Boolean isDelete; private Boolean isDelete;

View File

@ -21,7 +21,7 @@ public interface DrpRepository extends JpaRepository<Drp, Long> {
@Query(value = "SELECT d.id as id, " + @Query(value = "SELECT d.id as id, " +
"d.tahun as tahun, " + "d.tahun as tahun, " +
"d.isApprove as isApprove, " + "d.approveStatus as approveStatus, " +
"d.approveDate as approveDate, " + "d.approveDate as approveDate, " +
"d.isActive as isActive, " + "d.isActive as isActive, " +
"d.isDelete as isDelete " + "d.isDelete as isDelete " +

View File

@ -49,7 +49,7 @@ public class GetDrpService implements BaseService<DrpRequest, DrpResponse> {
return DrpResponse.builder() return DrpResponse.builder()
.id(drp.getId()) .id(drp.getId())
.tahun(drp.getTahun()) .tahun(drp.getTahun())
.isApprove(drp.getIsApprove()) .approveStatus(drp.getApproveStatus())
.approveDate(drp.getApproveDate()) .approveDate(drp.getApproveDate())
.isActive(drp.getIsActive()) .isActive(drp.getIsActive())
.isDelete(drp.getIsDelete()) .isDelete(drp.getIsDelete())

View File

@ -31,7 +31,7 @@ public class GetListDrpService implements BaseService<DrpRequest, GetListDrpResp
DrpResponse drpResponse = DrpResponse.builder() DrpResponse drpResponse = DrpResponse.builder()
.id(drpView.getId()) .id(drpView.getId())
.tahun(drpView.getTahun()) .tahun(drpView.getTahun())
.isApprove(drpView.getIsApprove()) .approveStatus(drpView.getApproveStatus())
.approveDate(drpView.getApproveDate()) .approveDate(drpView.getApproveDate())
.isActive(drpView.getIsActive()) .isActive(drpView.getIsActive())
.isDelete(drpView.getIsDelete()) .isDelete(drpView.getIsDelete())

View File

@ -57,7 +57,6 @@ public class PostCreateDrpPengadaanService implements BaseService<DrpPengadaanRe
.drpId(input.getDrpId()) .drpId(input.getDrpId())
.jenisDokumenId(drpPengadaanDokumenRequest.getJenisDokumenId()) .jenisDokumenId(drpPengadaanDokumenRequest.getJenisDokumenId())
.filename(drpPengadaanDokumenRequest.getFilename()) .filename(drpPengadaanDokumenRequest.getFilename())
.file(drpPengadaanDokumenRequest.getFile())
.keterangan(drpPengadaanDokumenRequest.getKeterangan()) .keterangan(drpPengadaanDokumenRequest.getKeterangan())
.isDelete(false) .isDelete(false)
.build(); .build();

View File

@ -47,7 +47,7 @@ public class PostCreateDrpService implements BaseService<DrpRequest, DrpResponse
Drp drp = Drp.builder() Drp drp = Drp.builder()
.tahun(input.getTahun()) .tahun(input.getTahun())
.isApprove(false) .approveStatus(input.getApproveStatus())
.isActive(input.getIsActive()) .isActive(input.getIsActive())
.isDelete(false) .isDelete(false)
.build(); .build();
@ -61,7 +61,6 @@ public class PostCreateDrpService implements BaseService<DrpRequest, DrpResponse
.drpId(drpSaved.getId()) .drpId(drpSaved.getId())
.jenisDokumenId(drpDokumenRequest.getJenisDokumenId()) .jenisDokumenId(drpDokumenRequest.getJenisDokumenId())
.filename(drpDokumenRequest.getFilename()) .filename(drpDokumenRequest.getFilename())
.file(drpDokumenRequest.getFile())
.keterangan(drpDokumenRequest.getKeterangan()) .keterangan(drpDokumenRequest.getKeterangan())
.isDelete(false) .isDelete(false)
.build(); .build();
@ -77,7 +76,6 @@ public class PostCreateDrpService implements BaseService<DrpRequest, DrpResponse
.drpId(drpSaved.getId()) .drpId(drpSaved.getId())
.jenisDokumenId(drpPengadaanDokumenRequest.getJenisDokumenId()) .jenisDokumenId(drpPengadaanDokumenRequest.getJenisDokumenId())
.filename(drpPengadaanDokumenRequest.getFilename()) .filename(drpPengadaanDokumenRequest.getFilename())
.file(drpPengadaanDokumenRequest.getFile())
.keterangan(drpPengadaanDokumenRequest.getKeterangan()) .keterangan(drpPengadaanDokumenRequest.getKeterangan())
.isDelete(false) .isDelete(false)
.build(); .build();