refactor base smartproc

src/main/java/com/iconplus/smartproc/model/entity/JenisAnggaran.java

@@ -27,10 +27,6 @@ public class JenisAnggaran extends BaseEntity {
     @Column(name = "keterangan")
     private String keterangan;
 
-    @Column(name = "is_active")
-    @Type(type = "org.hibernate.type.NumericBooleanType")
-    private Boolean isActive;
-
     @Column(name = "deleted")
     @Type(type = "org.hibernate.type.NumericBooleanType")
     private Boolean deleted;

src/main/java/com/iconplus/smartproc/model/entity/JenisKontrak.java

@@ -3,6 +3,7 @@ package com.iconplus.smartproc.model.entity;
 import com.iconplus.smartproc.helper.base.BaseEntity;
 import lombok.Builder;
 import lombok.Data;
+import org.hibernate.annotations.Type;
 
 import javax.persistence.*;
 
@@ -22,4 +23,8 @@ public class JenisKontrak extends BaseEntity {
     @Column(name = "keterangan")
 	private String keterangan;
 
+    @Column(name = "deleted")
+    @Type(type = "org.hibernate.type.NumericBooleanType")
+    private Boolean deleted;
+
 }

src/main/java/com/iconplus/smartproc/model/entity/JenisPengadaan.java

@@ -3,6 +3,7 @@ package com.iconplus.smartproc.model.entity;
 import com.iconplus.smartproc.helper.base.BaseEntity;
 import lombok.Builder;
 import lombok.Data;
+import org.hibernate.annotations.Type;
 
 import javax.persistence.*;
 
@@ -22,4 +23,8 @@ public class JenisPengadaan extends BaseEntity {
     @Column(name = "keterangan")
     private String keterangan;
 
+    @Column(name = "deleted")
+    @Type(type = "org.hibernate.type.NumericBooleanType")
+    private Boolean deleted;
+
 }

src/main/java/com/iconplus/smartproc/model/entity/Lokasi.java

@@ -3,6 +3,7 @@ package com.iconplus.smartproc.model.entity;
 import com.iconplus.smartproc.helper.base.BaseEntity;
 import lombok.Builder;
 import lombok.Data;
+import org.hibernate.annotations.Type;
 
 import javax.persistence.*;
 
@@ -22,4 +23,8 @@ public class Lokasi extends BaseEntity {
     @Column(name = "keterangan")
     private String keterangan;
 
+    @Column(name = "deleted")
+    @Type(type = "org.hibernate.type.NumericBooleanType")
+    private Boolean deleted;
+
 }

src/main/java/com/iconplus/smartproc/model/entity/MetodePengadaan.java

@@ -3,6 +3,7 @@ package com.iconplus.smartproc.model.entity;
 import com.iconplus.smartproc.helper.base.BaseEntity;
 import lombok.Builder;
 import lombok.Data;
+import org.hibernate.annotations.Type;
 
 import javax.persistence.*;
 
@@ -22,4 +23,8 @@ public class MetodePengadaan extends BaseEntity {
     @Column(name = "keterangan")
     private String keterangan;
 
+    @Column(name = "deleted")
+    @Type(type = "org.hibernate.type.NumericBooleanType")
+    private Boolean deleted;
+
 }

src/main/java/com/iconplus/smartproc/model/entity/MetodePenyampaian.java

@@ -4,6 +4,7 @@ package com.iconplus.smartproc.model.entity;
 import com.iconplus.smartproc.helper.base.BaseEntity;
 import lombok.Builder;
 import lombok.Data;
+import org.hibernate.annotations.Type;
 
 import javax.persistence.*;
 
@@ -23,4 +24,8 @@ public class MetodePenyampaian extends BaseEntity {
     @Column(name = "keterangan")
     private String keterangan;
 
+    @Column(name = "deleted")
+    @Type(type = "org.hibernate.type.NumericBooleanType")
+    private Boolean deleted;
+
 }

src/main/java/com/iconplus/smartproc/model/entity/Roles.java

@@ -3,6 +3,7 @@ package com.iconplus.smartproc.model.entity;
 import com.iconplus.smartproc.helper.base.BaseEntity;
 import lombok.Builder;
 import lombok.Data;
+import org.hibernate.annotations.Type;
 
 import javax.persistence.*;
 
@@ -23,6 +24,11 @@ public class Roles extends BaseEntity {
     private String keterangan;
 
     @Column(name = "is_active")
-    private Boolean isactive;
+    @Type(type = "org.hibernate.type.NumericBooleanType")
+    private Boolean isActive;
+
+    @Column(name = "deleted")
+    @Type(type = "org.hibernate.type.NumericBooleanType")
+    private Boolean deleted;
 
 }

src/main/java/com/iconplus/smartproc/model/entity/StrategiPengadaan.java

@@ -3,6 +3,7 @@ package com.iconplus.smartproc.model.entity;
 import com.iconplus.smartproc.helper.base.BaseEntity;
 import lombok.Builder;
 import lombok.Data;
+import org.hibernate.annotations.Type;
 
 import javax.persistence.*;
 
@@ -13,8 +14,17 @@ import javax.persistence.*;
 public class StrategiPengadaan extends BaseEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
     private long id;
-    private String strategipengadaan;
+
+    @Column(name = "strategi_pengadaan")
+    private String strategiPengadaan;
+
+    @Column(name = "keterangan")
     private String keterangan;
 
+    @Column(name = "deleted")
+    @Type(type = "org.hibernate.type.NumericBooleanType")
+    private Boolean deleted;
+
 }

src/main/java/com/iconplus/smartproc/model/entity/SumberDana.java

@@ -3,6 +3,7 @@ package com.iconplus.smartproc.model.entity;
 import com.iconplus.smartproc.helper.base.BaseEntity;
 import lombok.Builder;
 import lombok.Data;
+import org.hibernate.annotations.Type;
 
 import javax.persistence.*;
 
@@ -22,4 +23,8 @@ public class SumberDana extends BaseEntity {
     @Column(name = "keterangan")
     private String keterangan;
 
+    @Column(name = "deleted")
+    @Type(type = "org.hibernate.type.NumericBooleanType")
+    private Boolean deleted;
+
 }

src/main/java/com/iconplus/smartproc/model/entity/SupplyPositioningMatrix.java

@@ -3,6 +3,7 @@ package com.iconplus.smartproc.model.entity;
 import com.iconplus.smartproc.helper.base.BaseEntity;
 import lombok.Builder;
 import lombok.Data;
+import org.hibernate.annotations.Type;
 
 import javax.persistence.*;
 
@@ -17,9 +18,13 @@ public class SupplyPositioningMatrix extends BaseEntity {
     private long id;
 
     @Column(name = "supply_positioning_matrix")
-    private String supplypositioningmatrix;
+    private String supplyPositioningMatrix;
 
     @Column(name = "keterangan")
 	private String keterangan;
 
+    @Column(name = "deleted")
+    @Type(type = "org.hibernate.type.NumericBooleanType")
+    private Boolean deleted;
+
 }

src/main/java/com/iconplus/smartproc/model/entity/UnitInisiator.java

@@ -3,6 +3,7 @@ package com.iconplus.smartproc.model.entity;
 import com.iconplus.smartproc.helper.base.BaseEntity;
 import lombok.Builder;
 import lombok.Data;
+import org.hibernate.annotations.Type;
 
 import javax.persistence.*;
 
@@ -22,4 +23,8 @@ public class UnitInisiator extends BaseEntity {
     @Column(name = "keterangan")
     private String keterangan;
 
+    @Column(name = "deleted")
+    @Type(type = "org.hibernate.type.NumericBooleanType")
+    private Boolean deleted;
+
 }

src/main/java/com/iconplus/smartproc/model/projection/JenisAnggaranView.java

@@ -5,12 +5,10 @@ public interface JenisAnggaranView {
     Long getId();
     String getJenisAnggaran();
     String getKeterangan();
-    Boolean getIsActive();
     Boolean getDeleted();
 
     void setId(Long id);
     void setJenisAnggaran(String jenisAnggaran);
     void setKeterangan(String keterangan);
-    void setIsActive(Boolean isActive);
     void setDeleted(Boolean deleted);
 }