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

Merge branch 'master' into dev-deploy

Browse Source
This commit is contained in:
Salman Manoe 2023-11-29 13:54:01 +07:00
commit ddb5ead583
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,9 +22,9 @@ public interface SlipGajiKomponenDao extends JpaRepository<SlipGajiKomponen, Str
+ "when sgk.komponen.jenisKomponen = 5 then 'Potongan Remunerasi' " + "when sgk.komponen.jenisKomponen = 5 then 'Potongan Remunerasi' "
+ "when sgk.komponen.jenisKomponen = 6 then 'Potongan Uang Makan' end as jenisKomponen," + "when sgk.komponen.jenisKomponen = 6 then 'Potongan Uang Makan' end as jenisKomponen,"
+ "sgk.komponen.id as idKomponen," + "sgk.komponen.namaKomponen as namaKomponen," + "sgk.komponen.id as idKomponen," + "sgk.komponen.namaKomponen as namaKomponen,"
+ "sgk.nominal as nominal) " + "from SlipGajiKomponen sgk " + "where sgk.slipGaji.pegawai.id = :pegawaiId " + "sgk.komponen.urutan as urutan," + "sgk.nominal as nominal) " + "from SlipGajiKomponen sgk "
+ "and sgk.slipGaji.bulan between :start and :end " + "where sgk.slipGaji.pegawai.id = :pegawaiId " + "and sgk.slipGaji.bulan between :start and :end "
+ "order by sgk.komponen.jenisKomponen, sgk.komponen.id") + "order by sgk.komponen.jenisKomponen, sgk.komponen.urutan")
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);

4
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SlipGajiServiceImpl.java
View File

@ -379,6 +379,7 @@ public class SlipGajiServiceImpl implements SlipGajiService {
kBuilder.idKomponen(Integer.valueOf(first.get().get("idKomponen").toString())); kBuilder.idKomponen(Integer.valueOf(first.get().get("idKomponen").toString()));
kBuilder.namaKomponen(first.get().get("namaKomponen").toString()); kBuilder.namaKomponen(first.get().get("namaKomponen").toString());
kBuilder.nominal(new BigDecimal(first.get().get("nominal").toString())); kBuilder.nominal(new BigDecimal(first.get().get("nominal").toString()));
kBuilder.urutan(Integer.parseInt(first.get().get("urutan").toString()));
} else { } else {
kBuilder.id(null); kBuilder.id(null);
kBuilder.idJenisKomponen(e.getJenisKomponen()); kBuilder.idJenisKomponen(e.getJenisKomponen());
@ -386,11 +387,12 @@ public class SlipGajiServiceImpl implements SlipGajiService {
kBuilder.idKomponen(e.getId()); kBuilder.idKomponen(e.getId());
kBuilder.namaKomponen(e.getNamaKomponen()); kBuilder.namaKomponen(e.getNamaKomponen());
kBuilder.nominal(null); kBuilder.nominal(null);
kBuilder.urutan(e.getUrutan());
} }
dtoList.add(kBuilder.build()); dtoList.add(kBuilder.build());
}); });
List<SlipGajiKomponenDto> collectDto = dtoList.stream() List<SlipGajiKomponenDto> collectDto = dtoList.stream()
.sorted(Comparator.comparing(SlipGajiKomponenDto::getIdKomponen)) .sorted(Comparator.comparing(SlipGajiKomponenDto::getUrutan))
.sorted(Comparator.comparing(SlipGajiKomponenDto::getIdJenisKomponen)) .sorted(Comparator.comparing(SlipGajiKomponenDto::getIdJenisKomponen))
.collect(Collectors.toList()); .collect(Collectors.toList());
dto.komponen(collectDto); dto.komponen(collectDto);

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

@ -28,4 +28,7 @@ public class SlipGajiKomponenDto {
@Caption(value = "Nominal") @Caption(value = "Nominal")
private BigDecimal nominal; private BigDecimal nominal;
@Caption(value = "Urutan")
private Integer urutan;
} }