salmanoe/SC-be-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update slip gaji komponen

Browse Source 
Penambahan informasi jenis komponen gaji
This commit is contained in:
Salman Manoe 2023-04-17 16:49:13 +07:00
parent cde365e1aa
commit e9cd635bff
2 changed files with 47 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/SlipGajiKomponenDao.java
View File

@ -15,9 +15,13 @@ import com.jasamedika.medifirst2000.entities.SlipGajiKomponen;
* @since Jan 30, 2023 * @since Jan 30, 2023
*/ */
public interface SlipGajiKomponenDao extends JpaRepository<SlipGajiKomponen, String> { public interface SlipGajiKomponenDao extends JpaRepository<SlipGajiKomponen, String> {
@Query("select new Map(sgk.id as id," + "sgk.komponen.id as idKomponen," @Query("select new Map(sgk.id as id," + "sgk.komponen.jenisKomponen as idJenisKomponen,"
+ "sgk.komponen.namaKomponen as namaKomponen," + "sgk.nominal as nominal) " + "from SlipGajiKomponen sgk " + "case when sgk.komponen.jenisKomponen = 1 then 'Penerimaan' "
+ "where sgk.slipGaji.pegawai.id = :pegawaiId " + "and sgk.slipGaji.bulan between :start and :end") + "when sgk.komponen.jenisKomponen = 2 then 'Pemotongan' end as jenisKomponen,"
+ "sgk.komponen.id as idKomponen," + "sgk.komponen.namaKomponen as namaKomponen,"
+ "sgk.nominal as nominal) " + "from SlipGajiKomponen sgk " + "where sgk.slipGaji.pegawai.id = :pegawaiId "
+ "and sgk.slipGaji.bulan between :start and :end "
+ "order by sgk.komponen.jenisKomponen, sgk.komponen.id")
List<Map<String, Object>> findAll(@Param("pegawaiId") Integer pegawaiId, @Param("start") Date start, List<Map<String, Object>> findAll(@Param("pegawaiId") Integer pegawaiId, @Param("start") Date start,
@Param("end") Date end); @Param("end") Date end);

42
jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipGajiKomponenDto.java
View File

@ -8,6 +8,12 @@ public class SlipGajiKomponenDto {
@Caption(value = "ID") @Caption(value = "ID")
private String id; private String id;
@Caption(value = "ID Jenis Komponen Gaji")
private Integer idJenisKomponen;
@Caption(value = "Jenis Komponen Gaji")
private String jenisKomponen;
@Caption(value = "ID Komponen Gaji") @Caption(value = "ID Komponen Gaji")
private Integer idKomponen; private Integer idKomponen;
@ -20,8 +26,11 @@ public class SlipGajiKomponenDto {
public SlipGajiKomponenDto() { public SlipGajiKomponenDto() {
} }
public SlipGajiKomponenDto(String id, Integer idKomponen, String namaKomponen, BigDecimal nominal) { public SlipGajiKomponenDto(String id, Integer idJenisKomponen, String jenisKomponen, Integer idKomponen,
String namaKomponen, BigDecimal nominal) {
this.id = id; this.id = id;
this.idJenisKomponen = idJenisKomponen;
this.jenisKomponen = jenisKomponen;
this.idKomponen = idKomponen; this.idKomponen = idKomponen;
this.namaKomponen = namaKomponen; this.namaKomponen = namaKomponen;
this.nominal = nominal; this.nominal = nominal;
@ -35,6 +44,22 @@ public class SlipGajiKomponenDto {
this.id = id; this.id = id;
} }
public Integer getIdJenisKomponen() {
return idJenisKomponen;
}
public void setIdJenisKomponen(Integer idJenisKomponen) {
this.idJenisKomponen = idJenisKomponen;
}
public String getJenisKomponen() {
return jenisKomponen;
}
public void setJenisKomponen(String jenisKomponen) {
this.jenisKomponen = jenisKomponen;
}
public Integer getIdKomponen() { public Integer getIdKomponen() {
return idKomponen; return idKomponen;
} }
@ -65,6 +90,8 @@ public class SlipGajiKomponenDto {
public static class SlipGajiKomponenDtoBuilder { public static class SlipGajiKomponenDtoBuilder {
private String id; private String id;
private Integer idJenisKomponen;
private String jenisKomponen;
private Integer idKomponen; private Integer idKomponen;
private String namaKomponen; private String namaKomponen;
private BigDecimal nominal; private BigDecimal nominal;
@ -77,6 +104,16 @@ public class SlipGajiKomponenDto {
return this; return this;
} }
public SlipGajiKomponenDtoBuilder idJenisKomponen(final Integer idJenisKomponen) {
this.idJenisKomponen = idJenisKomponen;
return this;
}
public SlipGajiKomponenDtoBuilder jenisKomponen(final String jenisKomponen) {
this.jenisKomponen = jenisKomponen;
return this;
}
public SlipGajiKomponenDtoBuilder idKomponen(final Integer idKomponen) { public SlipGajiKomponenDtoBuilder idKomponen(final Integer idKomponen) {
this.idKomponen = idKomponen; this.idKomponen = idKomponen;
return this; return this;
@ -93,7 +130,8 @@ public class SlipGajiKomponenDto {
} }
public SlipGajiKomponenDto build() { public SlipGajiKomponenDto build() {
return new SlipGajiKomponenDto(this.id, this.idKomponen, this.namaKomponen, this.nominal); return new SlipGajiKomponenDto(this.id, this.idJenisKomponen, this.jenisKomponen, this.idKomponen,
this.namaKomponen, this.nominal);
} }
} }
} }