refactor penamaan table
This commit is contained in:
@@ -14,41 +14,25 @@ import javax.persistence.*;
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@Entity
|
||||
@Table(name = "rks_isi")
|
||||
public class RksIsi extends BaseEntity {
|
||||
@Table(name = "rks_daftar")
|
||||
public class RksDaftar extends BaseEntity {
|
||||
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
@Column(name = "id")
|
||||
private Long id;
|
||||
|
||||
@Column(name = "rks_daftar_isi_id")
|
||||
private Long rksDaftarIsiId;
|
||||
@Column(name = "kode_template")
|
||||
private String kodeTemplate;
|
||||
|
||||
@Column(name = "nomor")
|
||||
private String nomor;
|
||||
@Column(name = "nama_template")
|
||||
private String namaTemplate;
|
||||
|
||||
@Column(name = "parent_id")
|
||||
private Integer parentId;
|
||||
@Column(name = "metode_pengadaan_id")
|
||||
private Long metodePengadaanId;
|
||||
|
||||
@Column(name = "nama")
|
||||
private String nama;
|
||||
|
||||
@Column(name = "bab")
|
||||
private String bab;
|
||||
|
||||
@Column(name = "kelompok")
|
||||
private String kelompok;
|
||||
|
||||
@Column(name = "sub_bab")
|
||||
private String subBab;
|
||||
|
||||
@Column(name = "urutan")
|
||||
private String urutan;
|
||||
|
||||
@Column(name = "is_kontrak")
|
||||
@Type(type = "org.hibernate.type.NumericBooleanType")
|
||||
private Boolean isKontrak;
|
||||
@Column(name = "versi")
|
||||
private String versi;
|
||||
|
||||
@Column(name = "is_active")
|
||||
@Type(type = "org.hibernate.type.NumericBooleanType")
|
@@ -22,17 +22,27 @@ public class RksDaftarIsi extends BaseEntity {
|
||||
@Column(name = "id")
|
||||
private Long id;
|
||||
|
||||
@Column(name = "kode_template")
|
||||
private String kodeTemplate;
|
||||
@Column(name = "rks_daftar_id")
|
||||
private Long rksDaftarId;
|
||||
|
||||
@Column(name = "nama_template")
|
||||
private String namaTemplate;
|
||||
@Column(name = "nomor")
|
||||
private String nomor;
|
||||
|
||||
@Column(name = "metode_pengadaan_id")
|
||||
private Long metodePengadaanId;
|
||||
@Column(name = "parent_id")
|
||||
private Integer parentId;
|
||||
|
||||
@Column(name = "versi")
|
||||
private String versi;
|
||||
@Column(name = "title")
|
||||
private String title;
|
||||
|
||||
@Column(name = "level")
|
||||
private Integer level;
|
||||
|
||||
@Column(name = "urutan")
|
||||
private String urutan;
|
||||
|
||||
@Column(name = "is_kontrak")
|
||||
@Type(type = "org.hibernate.type.NumericBooleanType")
|
||||
private Boolean isKontrak;
|
||||
|
||||
@Column(name = "is_active")
|
||||
@Type(type = "org.hibernate.type.NumericBooleanType")
|
||||
|
@@ -34,8 +34,8 @@ public class RksTemplate extends BaseEntity {
|
||||
@Column(name = "versi")
|
||||
private String versi;
|
||||
|
||||
@Column(name = "rks_daftar_isi_id")
|
||||
private Long rksDaftarIsiId;
|
||||
@Column(name = "rks_daftar_id")
|
||||
private Long rksDaftarId;
|
||||
|
||||
@Column(name = "is_active")
|
||||
@Type(type = "org.hibernate.type.NumericBooleanType")
|
||||
|
@@ -20,8 +20,8 @@ public interface RksTemplateView {
|
||||
String getVersi();
|
||||
void setVersi(String versi);
|
||||
|
||||
Long getRksDaftarIsiId();
|
||||
void setRksDaftarIsiId(Long rksDaftarIsiId);
|
||||
Long getRksDaftarId();
|
||||
void setRksDaftarId(Long rksDaftarId);
|
||||
|
||||
String getDaftarIsi();
|
||||
void setDaftarIsi(String daftarIsi);
|
||||
|
@@ -5,8 +5,14 @@ import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import org.hibernate.annotations.Type;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.GeneratedValue;
|
||||
import javax.persistence.GenerationType;
|
||||
import javax.persistence.Id;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@AllArgsConstructor
|
||||
@@ -14,10 +20,16 @@ import org.springframework.data.domain.Pageable;
|
||||
public class RksDaftarIsiRequest extends BaseRequest {
|
||||
|
||||
private Long id;
|
||||
private String kodeTemplate;
|
||||
private String namaTemplate;
|
||||
private Long metodePengadaanId;
|
||||
private String versi;
|
||||
private Long rksDaftarId;
|
||||
private String nomor;
|
||||
private Integer parentId;
|
||||
private String parent;
|
||||
private String title;
|
||||
private Integer level;
|
||||
private String urutan;
|
||||
private Boolean isKontrak;
|
||||
private Boolean isActive;
|
||||
private Boolean isDelete;
|
||||
|
||||
private transient Pageable pageable;
|
||||
|
||||
|
@@ -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 org.springframework.data.domain.Pageable;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class RksDaftarRequest extends BaseRequest {
|
||||
|
||||
private Long id;
|
||||
private String kodeTemplate;
|
||||
private String namaTemplate;
|
||||
private Long metodePengadaanId;
|
||||
private String versi;
|
||||
|
||||
private transient Pageable pageable;
|
||||
|
||||
}
|
@@ -1,38 +0,0 @@
|
||||
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 org.hibernate.annotations.Type;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.GeneratedValue;
|
||||
import javax.persistence.GenerationType;
|
||||
import javax.persistence.Id;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class RksIsiRequest extends BaseRequest {
|
||||
|
||||
private Long id;
|
||||
private Long rksDaftarIsiId;
|
||||
private String nomor;
|
||||
private Integer parentId;
|
||||
private String parent;
|
||||
private String nama;
|
||||
private String bab;
|
||||
private String subBab;
|
||||
private String kelompok;
|
||||
private String urutan;
|
||||
private Boolean isKontrak;
|
||||
private Boolean isActive;
|
||||
private Boolean isDelete;
|
||||
|
||||
private transient Pageable pageable;
|
||||
|
||||
}
|
@@ -18,7 +18,7 @@ public class RksTemplateRequest extends BaseRequest {
|
||||
private String namaTemplate;
|
||||
private Long metodePengadaanId;
|
||||
private String versi;
|
||||
private Long rksDaftarIsiId;
|
||||
private Long rksDaftarId;
|
||||
private Boolean isActive;
|
||||
private Boolean isDelete;
|
||||
|
||||
|
@@ -15,6 +15,6 @@ import java.util.List;
|
||||
@NoArgsConstructor
|
||||
public class ListRksDaftarIsiResponse extends BaseResponse {
|
||||
|
||||
private List<RksDaftarIsiResponse> data;
|
||||
private List<RksDaftarResponse> data;
|
||||
private Pagination pagination;
|
||||
}
|
||||
|
@@ -15,6 +15,6 @@ import java.util.List;
|
||||
@NoArgsConstructor
|
||||
public class ListRksIsiResponse extends BaseResponse {
|
||||
|
||||
private List<RksIsiResponse> data;
|
||||
private List<RksDaftarIsiResponse> data;
|
||||
private Pagination pagination;
|
||||
}
|
||||
|
@@ -11,12 +11,13 @@ import lombok.NoArgsConstructor;
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class RksDaftarIsiResponse extends BaseResponse {
|
||||
|
||||
private Long id;
|
||||
private String kodeTemplate;
|
||||
private String namaTemplate;
|
||||
private Long metodePengadaanId;
|
||||
private String metodePengadaan;
|
||||
private String versi;
|
||||
|
||||
private Long rksDaftarId;
|
||||
private String nomor;
|
||||
private Integer parentId;
|
||||
private String title;
|
||||
private String urutan;
|
||||
private Boolean isKontrak;
|
||||
private Boolean isActive;
|
||||
private Boolean isDelete;
|
||||
}
|
||||
|
@@ -0,0 +1,22 @@
|
||||
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;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class RksDaftarResponse extends BaseResponse {
|
||||
|
||||
private Long id;
|
||||
private String kodeTemplate;
|
||||
private String namaTemplate;
|
||||
private Long metodePengadaanId;
|
||||
private String metodePengadaan;
|
||||
private String versi;
|
||||
|
||||
}
|
@@ -1,27 +0,0 @@
|
||||
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;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class RksIsiResponse extends BaseResponse {
|
||||
private Long id;
|
||||
private Long rksDaftarIsiId;
|
||||
private String nomor;
|
||||
private Integer parentId;
|
||||
private String parent;
|
||||
private String nama;
|
||||
private String bab;
|
||||
private String subBab;
|
||||
private String kelompok;
|
||||
private String urutan;
|
||||
private Boolean isKontrak;
|
||||
private Boolean isActive;
|
||||
private Boolean isDelete;
|
||||
}
|
@@ -18,7 +18,7 @@ public class RksTemplateResponse extends BaseResponse {
|
||||
private Long metodePengadaanId;
|
||||
private String metodePengadaan;
|
||||
private String versi;
|
||||
private Long rksDaftarIsiId;
|
||||
private Long rksDaftarId;
|
||||
private String daftarIsi;
|
||||
private Boolean isActive;
|
||||
private Boolean isDelete;
|
||||
|
Reference in New Issue
Block a user