This commit is contained in:
dirgantarasiahaan
2023-06-02 12:01:30 +07:00
parent 6203b9d8bf
commit f842852813
21 changed files with 421 additions and 105 deletions

View File

@@ -8,8 +8,7 @@ import lombok.NoArgsConstructor;
import org.hibernate.annotations.Type;
import javax.persistence.*;
import java.sql.Timestamp;
import java.util.Date;
import java.sql.Date;
@Data
@Builder
@@ -31,7 +30,22 @@ public class Drp extends BaseEntity {
private String approveStatus;
@Column(name = "approve_date")
private Timestamp approveDate;
private Date approveDate;
@Column(name = "vp_approve_date")
private Date vpApproveDate;
@Column(name = "komite_approve_date")
private Date komiteApproveDate;
@Column(name = "direktur_approve_date")
private Date direkturApproveDate;
@Column(name = "is_print")
private Boolean isPrint;
@Column(name = "print_date")
private Date printDate;
@Column(name = "is_active")
@Type(type = "org.hibernate.type.NumericBooleanType")

View File

@@ -8,7 +8,6 @@ import lombok.NoArgsConstructor;
import org.hibernate.annotations.Type;
import javax.persistence.*;
import java.sql.Date;
@Data
@Builder
@@ -26,41 +25,15 @@ public class DrpApproval extends BaseEntity {
@Column(name = "drp_id")
private Long drpId;
@Column(name = "approver_vp_id")
private Long approverVpId;
@Column(name = "approver_user_id")
private Long approverUserId;
@Column(name = "approver_vp_date")
private Date approverVpDate;
@Column(name = "is_approve")
@Type(type = "org.hibernate.type.NumericBooleanType")
private Boolean isApprove;
@Column(name = "approver_komite1_id")
private Long approverKomite1Id;
@Column(name = "approver_komite1_date")
private Date approverKomite1Date;
@Column(name = "approver_komite2_id")
private Long approverKomite2Id;
@Column(name = "approver_komite2_date")
private Date approverKomite2Date;
@Column(name = "approver_komite3_id")
private Long approverKomite3Id;
@Column(name = "approver_komite3_date")
private Date approverKomite3Date;
@Column(name = "approver_komite4_id")
private Long approverKomite4Id;
@Column(name = "approver_komite4_date")
private Date approverKomite4Date;
@Column(name = "approver_direktur_id")
private Long approverDirekturId;
@Column(name = "approver_direktur_date")
private Date approverDirekturDate;
@Column(name = "level")
private String level;
@Column(name = "is_active")
@Type(type = "org.hibernate.type.NumericBooleanType")

View File

@@ -0,0 +1,45 @@
package com.iconplus.smartproc.model.entity;
import com.iconplus.smartproc.helper.base.BaseEntity;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.hibernate.annotations.Type;
import javax.persistence.*;
import java.sql.Date;
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@Entity
@Table(name = "drp_rekomendasi")
public class DrpRekomendasi extends BaseEntity {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
private Long id;
@Column(name = "jenis_pengadaan_id")
private Long jenisPengadaanId;
@Column(name = "drp_approval_id")
private Long drpApprovalId;
@Column(name = "rekomendasi")
private String rekomendasi;
@Column(name = "rekomendasi_date")
private Date rekomendasiDate;
@Column(name = "is_active")
@Type(type = "org.hibernate.type.NumericBooleanType")
private Boolean isActive;
@Column(name = "is_delete")
@Type(type = "org.hibernate.type.NumericBooleanType")
private Boolean isDelete;
}

View File

@@ -1,5 +1,6 @@
package com.iconplus.smartproc.model.projection;
import java.sql.Date;
public interface DrpApprovalView {
@@ -16,23 +17,15 @@ public interface DrpApprovalView {
String getApproveStatus();
void setApproveStatus(String approveStatus);
Date getApproverVpDate();
void setApproveVpDate(Date approveVpDate);
Date getVpApproveDate();
void setVpApproveDate(Date vpApproveDate);
Date getApproverKomite1Date();
void setApproveKomite1Date(Date approveKomite1Date);
Date getKomiteApproveDate();
void setKomiteApproveDate(Date komiteApproveDate);
Date getApproverKomite2Date();
void setApproveKomite2Date(Date approveKomite2Date);
Date getDirekturApproveDate();
void setDirekturApproveDate(Date direkturApproveDate);
Date getApproverKomite3Date();
void setApproveKomite3Date(Date approveKomite3Date);
Date getApproverKomite4Date();
void setApproveKomite4Date(Date approveKomite4Date);
Date getApproverDirekturDate();
void setApproveDirekturDate(Date approveDirekturDate);
}

View File

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

View File

@@ -13,13 +13,11 @@ import org.springframework.data.domain.Pageable;
@NoArgsConstructor
public class DrpApprovalRequest extends BaseRequest {
private Long userId;
private Boolean isApprove;
private Long drpId;
private Long approverVpId;
private Long approverKomite1Id;
private Long approverKomite2Id;
private Long approverKomite3Id;
private Long approverKomite4Id;
private Long approverDirekturId;
private Long approverUserId;
private String level;
private String search;
private transient Pageable pageable;

View File

@@ -0,0 +1,24 @@
package com.iconplus.smartproc.model.request;
import com.iconplus.smartproc.helper.base.BaseRequest;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.sql.Date;
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class DrpRekomendasiRequest extends BaseRequest {
private Long id;
private Long drpApprovalId;
private Long jenisPengadaanId;
private String rekomendasi;
private Date rekomendasiDate;
}

View File

@@ -0,0 +1,20 @@
package com.iconplus.smartproc.model.request;
import com.iconplus.smartproc.helper.base.BaseRequest;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class ListDrpApprovalRequest extends BaseRequest {
private Long id;
private Long drpId;
private List<DrpApprovalRequest> data;
}

View File

@@ -19,9 +19,6 @@ public class DrpApprovalResponse extends BaseResponse {
private Integer tahun;
private String approveStatus;
private Date approverVpDate;
private Date approverKomite1Date;
private Date approverKomite2Date;
private Date approverKomite3Date;
private Date approverKomite4Date;
private Date approverKomiteDate;
private Date approverDirekturDate;
}

View File

@@ -0,0 +1,25 @@
package com.iconplus.smartproc.model.response;
import com.iconplus.smartproc.helper.base.BaseResponse;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class DrpRekomendasiResponse extends BaseResponse {
private Long id;
private String nomorRkp;
private String namaPengadaan;
private String approval;
private String status;
private Date approveDate;
private Date rekomendasiDate;
private String rekomendasi;
}

View File

@@ -6,7 +6,7 @@ import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.sql.Timestamp;
import java.util.Date;
import java.util.List;
@Data
@@ -17,7 +17,7 @@ public class DrpResponse extends BaseResponse {
private Long id;
private Integer tahun;
private String approveStatus;
private Timestamp approveDate;
private Date approveDate;
private Boolean isActive;
private Boolean isDelete;

View File

@@ -0,0 +1,22 @@
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
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class GetListDrpRekomendasiResponse extends BaseResponse {
private List<DrpRekomendasiResponse> data;
private Pagination pagination;
}