From 6ab0d25290d7dcab3f0c697eb14930dadad4d15b Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Fri, 17 Nov 2023 19:54:52 +0700 Subject: [PATCH 1/7] Update service slip gaji Penerapan perubahan cetakan slip gaji --- .../service/impl/SlipGajiServiceImpl.java | 50 +- .../medifirst2000/dto/KomponenGajiDto.java | 39 +- .../medifirst2000/dto/SlipGajiDto.java | 188 +- .../dto/SlipGajiKomponenDto.java | 122 +- .../medifirst2000/entities/KomponenGaji.java | 52 +- .../medifirst2000/entities/SlipGaji.java | 96 +- .../entities/SlipGajiDetail.java | 130 +- .../entities/SlipGajiKomponen.java | 108 +- .../WEB-INF/templates/jrxml/slipGaji.jrxml | 2420 +++++++++++------ .../controller/SlipGajiController.java | 5 - 10 files changed, 1603 insertions(+), 1607 deletions(-) diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SlipGajiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SlipGajiServiceImpl.java index 04fe7928..64bed1b4 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SlipGajiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SlipGajiServiceImpl.java @@ -159,33 +159,38 @@ public class SlipGajiServiceImpl implements SlipGajiService { slipGajiDetailDao.save(listDetail); } { - List listKomponen = new ArrayList<>(); - List dtos = dto.getKomponen(); - dtos.forEach(k -> { - if (CommonUtil.isNotNullOrEmpty(k.getNominal())) { - SlipGajiKomponen existedKomponen = slipGajiKomponenDao.findBySlipGajiAndKomponen(dto.getId(), - k.getIdKomponen()); - if (CommonUtil.isNotNullOrEmpty(existedKomponen)) { - existedKomponen.setNominal(k.getNominal()); - listKomponen.add(existedKomponen); - } else { - SlipGajiKomponen.SlipGajiKomponenBuilder kBuilder = SlipGajiKomponen.builder(); - if (CommonUtil.isNotNullOrEmpty(k.getId())) - kBuilder.id(k.getId()); - KomponenGaji kGaji = new KomponenGaji(); - kGaji.setId(k.getIdKomponen()); - kBuilder.komponen(kGaji); - kBuilder.nominal(k.getNominal()); - kBuilder.slipGaji(savedSlip); - listKomponen.add(kBuilder.build()); - } - } - }); + List listKomponen = getSlipGajiKomponen(dto, savedSlip); slipGajiKomponenDao.save(listKomponen); } } } + private List getSlipGajiKomponen(SlipGajiDto dto, SlipGaji savedSlip) { + List listKomponen = new ArrayList<>(); + List dtos = dto.getKomponen(); + dtos.forEach(k -> { + if (CommonUtil.isNotNullOrEmpty(k.getNominal())) { + SlipGajiKomponen existedKomponen = slipGajiKomponenDao.findBySlipGajiAndKomponen(dto.getId(), + k.getIdKomponen()); + if (CommonUtil.isNotNullOrEmpty(existedKomponen)) { + existedKomponen.setNominal(k.getNominal()); + listKomponen.add(existedKomponen); + } else { + SlipGajiKomponen.SlipGajiKomponenBuilder kBuilder = SlipGajiKomponen.builder(); + if (CommonUtil.isNotNullOrEmpty(k.getId())) + kBuilder.id(k.getId()); + KomponenGaji kGaji = new KomponenGaji(); + kGaji.setId(k.getIdKomponen()); + kBuilder.komponen(kGaji); + kBuilder.nominal(k.getNominal()); + kBuilder.slipGaji(savedSlip); + listKomponen.add(kBuilder.build()); + } + } + }); + return listKomponen; + } + @Override public void save(List dtoList) { List listSlip = new ArrayList<>(); @@ -508,7 +513,6 @@ public class SlipGajiServiceImpl implements SlipGajiService { try (FileOutputStream out = new FileOutputStream(file)) { workbook.write(out); } catch (Exception e) { - e.printStackTrace(); return absoluteFilePath; } return absoluteFilePath; diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/KomponenGajiDto.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/KomponenGajiDto.java index 4a5b552f..27bf07dc 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/KomponenGajiDto.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/KomponenGajiDto.java @@ -1,11 +1,17 @@ package com.jasamedika.medifirst2000.dto; import com.jasamedika.medifirst2000.helper.Caption; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; /** * @author Salman * */ +@Getter +@Setter +@AllArgsConstructor public class KomponenGajiDto { @Caption(value = "ID") protected Integer id; @@ -15,37 +21,4 @@ public class KomponenGajiDto { @Caption(value = "Jenis Komponen") private Integer jenisKomponen; - - public KomponenGajiDto() { - } - - public KomponenGajiDto(Integer id, String namaKomponen, Integer jenisKomponen) { - this.id = id; - this.namaKomponen = namaKomponen; - this.jenisKomponen = jenisKomponen; - } - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getNamaKomponen() { - return namaKomponen; - } - - public void setNamaKomponen(String namaKomponen) { - this.namaKomponen = namaKomponen; - } - - public Integer getJenisKomponen() { - return jenisKomponen; - } - - public void setJenisKomponen(Integer jenisKomponen) { - this.jenisKomponen = jenisKomponen; - } } diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipGajiDto.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipGajiDto.java index 59e99002..0286ede9 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipGajiDto.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipGajiDto.java @@ -1,15 +1,20 @@ package com.jasamedika.medifirst2000.dto; -import java.util.List; +import com.jasamedika.medifirst2000.helper.Caption; +import lombok.*; import javax.validation.constraints.NotNull; - -import com.jasamedika.medifirst2000.helper.Caption; +import java.util.List; /** * @author salmanoe * @since Jan 20, 2023 */ +@Getter +@Setter +@AllArgsConstructor +@NoArgsConstructor +@Builder public class SlipGajiDto { @Caption(value = "ID Slip Gaji") private String id; @@ -41,181 +46,4 @@ public class SlipGajiDto { @Caption(value = "Komponen Gaji") private List komponen; - - public SlipGajiDto() { - } - - public SlipGajiDto(String id, Integer idPegawai, String namaPegawai, String nip, String jabatan, String unitKerja, - String subUnitKerja, String grade, Long bulan, List komponen) { - super(); - this.id = id; - this.idPegawai = idPegawai; - this.namaPegawai = namaPegawai; - this.nip = nip; - this.jabatan = jabatan; - this.unitKerja = unitKerja; - this.subUnitKerja = subUnitKerja; - this.grade = grade; - this.bulan = bulan; - this.komponen = komponen; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public Integer getIdPegawai() { - return idPegawai; - } - - public void setIdPegawai(Integer idPegawai) { - this.idPegawai = idPegawai; - } - - public String getNamaPegawai() { - return namaPegawai; - } - - public void setNamaPegawai(String namaPegawai) { - this.namaPegawai = namaPegawai; - } - - public String getNip() { - return nip; - } - - public void setNip(String nip) { - this.nip = nip; - } - - public String getJabatan() { - return jabatan; - } - - public void setJabatan(String jabatan) { - this.jabatan = jabatan; - } - - public String getUnitKerja() { - return unitKerja; - } - - public void setUnitKerja(String unitKerja) { - this.unitKerja = unitKerja; - } - - public String getSubUnitKerja() { - return subUnitKerja; - } - - public void setSubUnitKerja(String subUnitKerja) { - this.subUnitKerja = subUnitKerja; - } - - public String getGrade() { - return grade; - } - - public void setGrade(String grade) { - this.grade = grade; - } - - public Long getBulan() { - return bulan; - } - - public void setBulan(Long bulan) { - this.bulan = bulan; - } - - public List getKomponen() { - return komponen; - } - - public void setKomponen(List komponen) { - this.komponen = komponen; - } - - public void addKomponen(SlipGajiKomponenDto komponen) { - this.komponen.add(komponen); - } - - public static SlipGajiDtoBuilder builder() { - return new SlipGajiDtoBuilder(); - } - - public static class SlipGajiDtoBuilder { - private String id; - private Integer idPegawai; - private String namaPegawai; - private String nip; - private String jabatan; - private String unitKerja; - private String subUnitKerja; - private String grade; - private Long bulan; - private List komponen; - - public SlipGajiDtoBuilder() { - } - - public SlipGajiDtoBuilder id(final String id) { - this.id = id; - return this; - } - - public SlipGajiDtoBuilder idPegawai(final Integer idPegawai) { - this.idPegawai = idPegawai; - return this; - } - - public SlipGajiDtoBuilder namaPegawai(final String namaPegawai) { - this.namaPegawai = namaPegawai; - return this; - } - - public SlipGajiDtoBuilder nip(final String nip) { - this.nip = nip; - return this; - } - - public SlipGajiDtoBuilder jabatan(final String jabatan) { - this.jabatan = jabatan; - return this; - } - - public SlipGajiDtoBuilder unitKerja(final String unitKerja) { - this.unitKerja = unitKerja; - return this; - } - - public SlipGajiDtoBuilder subUnitKerja(final String subUnitKerja) { - this.subUnitKerja = subUnitKerja; - return this; - } - - public SlipGajiDtoBuilder grade(final String grade) { - this.grade = grade; - return this; - } - - public SlipGajiDtoBuilder bulan(final Long bulan) { - this.bulan = bulan; - return this; - } - - public SlipGajiDtoBuilder komponen(final List komponen) { - this.komponen = komponen; - return this; - } - - public SlipGajiDto build() { - return new SlipGajiDto(this.id, this.idPegawai, this.namaPegawai, this.nip, this.jabatan, this.unitKerja, - this.subUnitKerja, this.grade, this.bulan, this.komponen); - } - } } diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipGajiKomponenDto.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipGajiKomponenDto.java index cfda7906..f29685de 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipGajiKomponenDto.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipGajiKomponenDto.java @@ -1,9 +1,15 @@ package com.jasamedika.medifirst2000.dto; +import com.jasamedika.medifirst2000.helper.Caption; +import lombok.*; + import java.math.BigDecimal; -import com.jasamedika.medifirst2000.helper.Caption; - +@Getter +@Setter +@AllArgsConstructor +@NoArgsConstructor +@Builder public class SlipGajiKomponenDto { @Caption(value = "ID") private String id; @@ -22,116 +28,4 @@ public class SlipGajiKomponenDto { @Caption(value = "Nominal") private BigDecimal nominal; - - public SlipGajiKomponenDto() { - } - - public SlipGajiKomponenDto(String id, Integer idJenisKomponen, String jenisKomponen, Integer idKomponen, - String namaKomponen, BigDecimal nominal) { - this.id = id; - this.idJenisKomponen = idJenisKomponen; - this.jenisKomponen = jenisKomponen; - this.idKomponen = idKomponen; - this.namaKomponen = namaKomponen; - this.nominal = nominal; - } - - public String getId() { - return id; - } - - public void setId(String 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() { - return idKomponen; - } - - public void setIdKomponen(Integer idKomponen) { - this.idKomponen = idKomponen; - } - - public String getNamaKomponen() { - return namaKomponen; - } - - public void setNamaKomponen(String namaKomponen) { - this.namaKomponen = namaKomponen; - } - - public BigDecimal getNominal() { - return nominal; - } - - public void setNominal(BigDecimal nominal) { - this.nominal = nominal; - } - - public static SlipGajiKomponenDtoBuilder builder() { - return new SlipGajiKomponenDtoBuilder(); - } - - public static class SlipGajiKomponenDtoBuilder { - private String id; - private Integer idJenisKomponen; - private String jenisKomponen; - private Integer idKomponen; - private String namaKomponen; - private BigDecimal nominal; - - public SlipGajiKomponenDtoBuilder() { - } - - public SlipGajiKomponenDtoBuilder id(final String id) { - this.id = id; - 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) { - this.idKomponen = idKomponen; - return this; - } - - public SlipGajiKomponenDtoBuilder namaKomponen(final String namaKomponen) { - this.namaKomponen = namaKomponen; - return this; - } - - public SlipGajiKomponenDtoBuilder nominal(final BigDecimal nominal) { - this.nominal = nominal; - return this; - } - - public SlipGajiKomponenDto build() { - return new SlipGajiKomponenDto(this.id, this.idJenisKomponen, this.jenisKomponen, this.idKomponen, - this.namaKomponen, this.nominal); - } - } } diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/KomponenGaji.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/KomponenGaji.java index 9c89b113..dcd5e76d 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/KomponenGaji.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/KomponenGaji.java @@ -1,22 +1,19 @@ package com.jasamedika.medifirst2000.entities; -import java.io.Serializable; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; - import com.jasamedika.medifirst2000.helper.Caption; +import lombok.Getter; +import lombok.Setter; + +import javax.persistence.*; +import java.io.Serializable; /** * @author salmanoe * @since Jan 30, 2023 */ -@Entity // @Audited +@Getter +@Setter +@Entity @Table(name = "sdm_komponengaji_m") public class KomponenGaji implements Serializable { @Id @@ -36,37 +33,4 @@ public class KomponenGaji implements Serializable { @Column(name = "jeniskomponen", nullable = false) @Caption(value = "Jenis Komponen") private Integer jenisKomponen; - - public KomponenGaji() { - } - - public KomponenGaji(Integer id, String namaKomponen, Integer jenisKomponen) { - this.id = id; - this.namaKomponen = namaKomponen; - this.jenisKomponen = jenisKomponen; - } - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getNamaKomponen() { - return namaKomponen; - } - - public void setNamaKomponen(String namaKomponen) { - this.namaKomponen = namaKomponen; - } - - public Integer getJenisKomponen() { - return jenisKomponen; - } - - public void setJenisKomponen(Integer jenisKomponen) { - this.jenisKomponen = jenisKomponen; - } } diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/SlipGaji.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/SlipGaji.java index 080820f8..35a331dc 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/SlipGaji.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/SlipGaji.java @@ -1,28 +1,23 @@ package com.jasamedika.medifirst2000.entities; -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.validation.constraints.NotNull; - +import com.jasamedika.medifirst2000.helper.Caption; +import lombok.*; import org.hibernate.annotations.GenericGenerator; -import com.jasamedika.medifirst2000.helper.Caption; +import javax.persistence.*; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.Date; /** * @author salmanoe * @since Jan 19, 2023 */ +@Getter +@Setter +@AllArgsConstructor +@NoArgsConstructor +@Builder @Entity @Table(name = "sdm_slipgaji_t") public class SlipGaji implements Serializable { @@ -45,73 +40,4 @@ public class SlipGaji implements Serializable { @Column(name = "bulan", nullable = false) @Caption(value = "Bulan") private Date bulan; - - public SlipGaji() { - } - - public SlipGaji(String id, Pegawai pegawai, Date bulan) { - this.id = id; - this.pegawai = pegawai; - this.bulan = bulan; - } - - public static long getSerialversionuid() { - return serialVersionUID; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public Pegawai getPegawai() { - return pegawai; - } - - public void setPegawai(Pegawai pegawai) { - this.pegawai = pegawai; - } - - public Date getBulan() { - return bulan; - } - - public void setBulan(Date bulan) { - this.bulan = bulan; - } - - public static SlipGajiBuilder builder() { - return new SlipGajiBuilder(); - } - - public static class SlipGajiBuilder { - private String id; - private Pegawai pegawai; - private Date bulan; - - public SlipGajiBuilder() { - } - - public SlipGajiBuilder id(final String id) { - this.id = id; - return this; - } - - public SlipGajiBuilder pegawai(final Pegawai pegawai) { - this.pegawai = pegawai; - return this; - } - - public SlipGajiBuilder bulan(final Date bulan) { - this.bulan = bulan; - return this; - } - - public SlipGaji build() { - return new SlipGaji(this.id, this.pegawai, this.bulan); - } - } } diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/SlipGajiDetail.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/SlipGajiDetail.java index b65fea88..d0f8e9a3 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/SlipGajiDetail.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/SlipGajiDetail.java @@ -1,24 +1,22 @@ package com.jasamedika.medifirst2000.entities; -import java.io.Serializable; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; - +import com.jasamedika.medifirst2000.helper.Caption; +import lombok.*; import org.hibernate.annotations.GenericGenerator; -import com.jasamedika.medifirst2000.helper.Caption; +import javax.persistence.*; +import javax.validation.constraints.NotNull; +import java.io.Serializable; /** * @author salmanoe * @since Jan 19, 2023 */ +@Getter +@Setter +@AllArgsConstructor +@NoArgsConstructor +@Builder @Entity @Table(name = "sdm_slipgajidetail_t") public class SlipGajiDetail implements Serializable { @@ -56,112 +54,4 @@ public class SlipGajiDetail implements Serializable { @JoinColumn(name = "gradefk") @Caption(value = "Grade") private NilaiKelompokJabatan grade; - - public SlipGajiDetail() { - } - - public SlipGajiDetail(SlipGaji slipGaji, Jabatan jabatan, UnitKerjaPegawai unitKerja, - SubUnitKerjaPegawai subUnitKerja, NilaiKelompokJabatan grade) { - this.slipGaji = slipGaji; - this.jabatan = jabatan; - this.unitKerja = unitKerja; - this.subUnitKerja = subUnitKerja; - this.grade = grade; - } - - public static long getSerialversionuid() { - return serialVersionUID; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public SlipGaji getSlipGaji() { - return slipGaji; - } - - public void setSlipGaji(SlipGaji slipGaji) { - this.slipGaji = slipGaji; - } - - public Jabatan getJabatan() { - return jabatan; - } - - public void setJabatan(Jabatan jabatan) { - this.jabatan = jabatan; - } - - public UnitKerjaPegawai getUnitKerja() { - return unitKerja; - } - - public void setUnitKerja(UnitKerjaPegawai unitKerja) { - this.unitKerja = unitKerja; - } - - public SubUnitKerjaPegawai getSubUnitKerja() { - return subUnitKerja; - } - - public void setSubUnitKerja(SubUnitKerjaPegawai subUnitKerja) { - this.subUnitKerja = subUnitKerja; - } - - public NilaiKelompokJabatan getGrade() { - return grade; - } - - public void setGrade(NilaiKelompokJabatan grade) { - this.grade = grade; - } - - public static SlipGajiDetailBuilder builder() { - return new SlipGajiDetailBuilder(); - } - - public static class SlipGajiDetailBuilder { - private SlipGaji slipGaji; - private Jabatan jabatan; - private UnitKerjaPegawai unitKerja; - private SubUnitKerjaPegawai subUnitKerja; - private NilaiKelompokJabatan grade; - - public SlipGajiDetailBuilder() { - } - - public SlipGajiDetailBuilder slipGaji(final SlipGaji slipGaji) { - this.slipGaji = slipGaji; - return this; - } - - public SlipGajiDetailBuilder jabatan(final Jabatan jabatan) { - this.jabatan = jabatan; - return this; - } - - public SlipGajiDetailBuilder unitKerja(final UnitKerjaPegawai unitKerja) { - this.unitKerja = unitKerja; - return this; - } - - public SlipGajiDetailBuilder subUnitKerja(final SubUnitKerjaPegawai subUnitKerja) { - this.subUnitKerja = subUnitKerja; - return this; - } - - public SlipGajiDetailBuilder grade(final NilaiKelompokJabatan grade) { - this.grade = grade; - return this; - } - - public SlipGajiDetail build() { - return new SlipGajiDetail(this.slipGaji, this.jabatan, this.unitKerja, this.subUnitKerja, this.grade); - } - } } diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/SlipGajiKomponen.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/SlipGajiKomponen.java index e5b0c75b..d377cfe6 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/SlipGajiKomponen.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/SlipGajiKomponen.java @@ -1,25 +1,23 @@ package com.jasamedika.medifirst2000.entities; -import java.io.Serializable; -import java.math.BigDecimal; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; - +import com.jasamedika.medifirst2000.helper.Caption; +import lombok.*; import org.hibernate.annotations.GenericGenerator; -import com.jasamedika.medifirst2000.helper.Caption; +import javax.persistence.*; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.math.BigDecimal; /** * @author salmanoe * @since Jan 30, 2023 */ +@Getter +@Setter +@AllArgsConstructor +@NoArgsConstructor +@Builder @Entity @Table(name = "sdm_slipgajikomponen_t") public class SlipGajiKomponen implements Serializable { @@ -46,88 +44,4 @@ public class SlipGajiKomponen implements Serializable { @JoinColumn(name = "slipgajifk", columnDefinition = "CHAR(32)", nullable = false) @Caption(value = "Slip Gaji") private SlipGaji slipGaji; - - public SlipGajiKomponen() { - } - - public SlipGajiKomponen(String id, KomponenGaji komponen, BigDecimal nominal, SlipGaji slipGaji) { - this.id = id; - this.komponen = komponen; - this.nominal = nominal; - this.slipGaji = slipGaji; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public KomponenGaji getKomponen() { - return komponen; - } - - public void setKomponen(KomponenGaji komponen) { - this.komponen = komponen; - } - - public BigDecimal getNominal() { - return nominal; - } - - public void setNominal(BigDecimal nominal) { - this.nominal = nominal; - } - - public SlipGaji getSlipGaji() { - return slipGaji; - } - - public void setSlipGaji(SlipGaji slipGaji) { - this.slipGaji = slipGaji; - } - - public static long getSerialversionuid() { - return serialVersionUID; - } - - public static SlipGajiKomponenBuilder builder() { - return new SlipGajiKomponenBuilder(); - } - - public static class SlipGajiKomponenBuilder { - private String id; - private KomponenGaji komponen; - private BigDecimal nominal; - private SlipGaji slipGaji; - - public SlipGajiKomponenBuilder() { - } - - public SlipGajiKomponenBuilder id(final String id) { - this.id = id; - return this; - } - - public SlipGajiKomponenBuilder komponen(final KomponenGaji komponen) { - this.komponen = komponen; - return this; - } - - public SlipGajiKomponenBuilder nominal(final BigDecimal nominal) { - this.nominal = nominal; - return this; - } - - public SlipGajiKomponenBuilder slipGaji(final SlipGaji slipGaji) { - this.slipGaji = slipGaji; - return this; - } - - public SlipGajiKomponen build() { - return new SlipGajiKomponen(this.id, this.komponen, this.nominal, this.slipGaji); - } - } } diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml index 5827a9f0..74c598be 100644 --- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml +++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml @@ -1,15 +1,10 @@ - - - - - - - - - - + + + + + @@ -49,28 +44,25 @@ - <band height="60" splitType="Stretch"> + <band height="62" splitType="Stretch"> <staticText> - <reportElement x="440" y="0" width="262" height="42" isPrintWhenDetailOverflows="true" uuid="7f60017e-ff9e-411d-86a3-c30f87191a76"> - <property name="com.jaspersoft.studio.unit.height" value="px"/> + <reportElement x="0" y="42" width="505" height="20" isPrintWhenDetailOverflows="true" uuid="94e742c7-7ea7-4b33-9350-f6cd0c9253eb"> <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="com.jaspersoft.studio.unit.x" value="px"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> </reportElement> - <textElement textAlignment="Right"> - <font size="12"/> - </textElement> - <text><![CDATA[SLIP GAJI]]></text> - </staticText> - <staticText> - <reportElement x="0" y="42" width="702" height="18" isPrintWhenDetailOverflows="true" uuid="94e742c7-7ea7-4b33-9350-f6cd0c9253eb"/> <box> - <bottomPen lineWidth="1.0" lineStyle="Solid"/> + <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> + <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> + <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> + <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> </box> - <textElement textAlignment="Left" verticalAlignment="Top"/> + <textElement textAlignment="Left" verticalAlignment="Top"> + <font size="9"/> + </textElement> <text><![CDATA[Jl. Letjend. S. Parman Kav. 87, Slipi,Jakarta Barat 11420 – Indonesia, Telp 021 5668284]]></text> </staticText> <image> - <reportElement x="0" y="0" width="440" height="42" isPrintWhenDetailOverflows="true" uuid="c4fbc1c2-32a1-42ec-a770-88149a0d9be1"> + <reportElement x="0" y="0" width="505" height="42" isPrintWhenDetailOverflows="true" uuid="c4fbc1c2-32a1-42ec-a770-88149a0d9be1"> <property name="com.jaspersoft.studio.unit.width" value="px"/> <property name="com.jaspersoft.studio.unit.height" value="px"/> </reportElement> @@ -79,929 +71,1545 @@ </band> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - + + - - + + - + - - + + - - + + - + - - + + - - + + - + - - + + - - + + - + - - + + - - + + - + - - + + - - + + - + - - - - - - - - diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SlipGajiController.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SlipGajiController.java index e2fa3ca5..9a26121f 100644 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SlipGajiController.java +++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SlipGajiController.java @@ -34,7 +34,6 @@ public class SlipGajiController { slipGajiService.init(); return new ResponseEntity<>(true, HttpStatus.CREATED); } catch (Exception e) { - e.printStackTrace(); return new ResponseEntity<>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR); } } @@ -45,7 +44,6 @@ public class SlipGajiController { slipGajiService.save(dto); return new ResponseEntity<>(true, HttpStatus.CREATED); } catch (Exception e) { - e.printStackTrace(); return new ResponseEntity<>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR); } } @@ -56,7 +54,6 @@ public class SlipGajiController { slipGajiService.save(dtoList); return new ResponseEntity<>(true, HttpStatus.CREATED); } catch (Exception e) { - e.printStackTrace(); return new ResponseEntity<>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR); } } @@ -67,7 +64,6 @@ public class SlipGajiController { slipGajiService.updateDetail(dto); return new ResponseEntity<>(true, HttpStatus.CREATED); } catch (Exception e) { - e.printStackTrace(); return new ResponseEntity<>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR); } } @@ -89,7 +85,6 @@ public class SlipGajiController { result.put("filename", fileNamePath); return new ResponseEntity<>(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); return new ResponseEntity<>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR); } } From c3022745626e2de250c4e04e72b6a376a5830396 Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Mon, 20 Nov 2023 16:14:48 +0700 Subject: [PATCH 2/7] Update slipGaji.jrxml Perbaikan font size dan stretch type --- .../WEB-INF/templates/jrxml/slipGaji.jrxml | 1293 +++++++++-------- 1 file changed, 708 insertions(+), 585 deletions(-) diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml index 416c2a06..73df9bb9 100644 --- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml +++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml @@ -1,5 +1,5 @@ - + @@ -57,109 +57,20 @@ - - - - - - - - - - - - - - - - - - - - - - - - + - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -168,106 +79,267 @@ - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + - + - - - - - + + + + - + - - - - - - - + + + + + - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -279,48 +351,48 @@ - + - + - + - + + - + - + - - + - + @@ -331,47 +403,49 @@ - + - + - + - + - + + + - + - + - - + - + + @@ -380,46 +454,47 @@ - + - + - + - + - + + + - + - - - + - + - + + @@ -428,46 +503,47 @@ - + - + - + - + - - - - - - - - - + + + + + + + + + - + - + + @@ -476,45 +552,47 @@ - + - + - + - + - - - - - - - - - + + + + + + + + + - + - + + + @@ -522,45 +600,46 @@ - + - + - + - - + - + + + - + - - - + - + - + + + @@ -568,48 +647,49 @@ - + - + - + - - + - + + - + - + - + - - + - + + + @@ -617,59 +697,59 @@ - + - + - + - - + - + - - + - + - + - - + - + + - + - + + + @@ -677,35 +757,38 @@ - + - + + + - + - + - + - - + - + + + @@ -713,45 +796,49 @@ - + - + + - + - + + + - + - + - + - - + - + + + @@ -759,51 +846,53 @@ - + - + - - + - + + + - + - + - + - - + - + + + @@ -811,54 +900,58 @@ - + - + - - + - - + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + @@ -867,51 +960,50 @@ - + - - - + - + - + + - + - + - - - + - + - + + + @@ -920,46 +1012,45 @@ - + - + - - - + - + - + + - + - + - - - + - + - + + + @@ -967,46 +1058,48 @@ - + - + + - + - + + - + - + - - - + - + - + + + @@ -1014,46 +1107,48 @@ - + - + + - + - + + - + - + - - - + - + - + + + @@ -1061,46 +1156,48 @@ - + - + + - + - + + - + - + - - - + - + - + + + @@ -1108,45 +1205,49 @@ - + - + + - + - + + + - + - + - + - - + - + + + @@ -1154,45 +1255,49 @@ - + - + + - + - + + + - + - + - + - - + - + + + @@ -1200,46 +1305,45 @@ - + - + + - + - - - + - + - - - + - + - + + + @@ -1247,46 +1351,48 @@ - + - + + - + - + + - + - - - + - + - + + + @@ -1294,51 +1400,53 @@ - + - + - + - - + - + + + - + - + - + - - + - + + + @@ -1346,54 +1454,58 @@ - + - + - - + - - + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + @@ -1402,51 +1514,50 @@ - + - - - + - + - + + - + - + - - - + - + - + + + @@ -1454,40 +1565,40 @@ - + - + - - + - - + - + - + + + @@ -1495,14 +1606,13 @@ - + - + - @@ -1510,116 +1620,129 @@ - + - - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From a6b7c4eb8fe36b5f0c40e5e9ee85e55bda0124b2 Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Mon, 20 Nov 2023 16:15:08 +0700 Subject: [PATCH 3/7] Update ReportServiceImpl.java Perbaikan validasi golongan pegawai di service report --- .../service/impl/ReportServiceImpl.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java index 1e4f8f9c..613dac78 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java @@ -1929,8 +1929,9 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic if (Master.StatusPegawai.CUTI_TAHUNAN.equals(statusPegawaiId) || Master.StatusPegawai.CUTI_SAKIT.equals(statusPegawaiId) || Master.StatusPegawai.CUTI_MELAHIRKAN.equals(statusPegawaiId)) { - if (Arrays.asList(Master.GolonganPegawai.JF_AHLI_UTAMA) - .contains(Integer.parseInt(pegawai.get("idGolongan").toString()))) { + if (CommonUtil.isNotNullOrEmpty(pegawai.get("idGolongan")) + && Arrays.asList(Master.GolonganPegawai.JF_AHLI_UTAMA) + .contains(Integer.parseInt(pegawai.get("idGolongan").toString()))) { String cutiA1 = settingDataFixedDao.getSettingDataFixed("cutiA1"); String[] arrCutiA1 = cutiA1.split("_"); labelTtdMenkes = arrCutiA1[0]; @@ -1953,8 +1954,9 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic } } else if (Master.StatusPegawai.CUTI_BESAR.equals(statusPegawaiId) || Master.StatusPegawai.CUTI_ALASAN_PENTING.equals(statusPegawaiId)) { - if (Arrays.asList(Master.GolonganPegawai.JF_AHLI_UTAMA) - .contains(Integer.parseInt(pegawai.get("idGolongan").toString()))) { + if (CommonUtil.isNotNullOrEmpty(pegawai.get("idGolongan")) + && Arrays.asList(Master.GolonganPegawai.JF_AHLI_UTAMA) + .contains(Integer.parseInt(pegawai.get("idGolongan").toString()))) { String cutiA1 = settingDataFixedDao.getSettingDataFixed("cutiB1"); String[] arrCutiA1 = cutiA1.split("_"); labelTtdMenkes = arrCutiA1[0]; @@ -2138,8 +2140,9 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic if (Master.StatusPegawai.CUTI_TAHUNAN.equals(statusPegawaiId) || Master.StatusPegawai.CUTI_SAKIT.equals(statusPegawaiId) || Master.StatusPegawai.CUTI_MELAHIRKAN.equals(statusPegawaiId)) { - if (Arrays.asList(Master.GolonganPegawai.JF_AHLI_UTAMA) - .contains(Integer.parseInt(pegawai.get("idGolongan").toString()))) { + if (CommonUtil.isNotNullOrEmpty(pegawai.get("idGolongan")) + && Arrays.asList(Master.GolonganPegawai.JF_AHLI_UTAMA) + .contains(Integer.parseInt(pegawai.get("idGolongan").toString()))) { String cutiA1 = settingDataFixedDao.getSettingDataFixed("cutiA1"); String[] arrCutiA1 = cutiA1.split("_"); labelTtdMenkes = arrCutiA1[0]; @@ -2162,8 +2165,9 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic } } else if (Master.StatusPegawai.CUTI_BESAR.equals(statusPegawaiId) || Master.StatusPegawai.CUTI_ALASAN_PENTING.equals(statusPegawaiId)) { - if (Arrays.asList(Master.GolonganPegawai.JF_AHLI_UTAMA) - .contains(Integer.parseInt(pegawai.get("idGolongan").toString()))) { + if (CommonUtil.isNotNullOrEmpty(pegawai.get("idGolongan")) + && Arrays.asList(Master.GolonganPegawai.JF_AHLI_UTAMA) + .contains(Integer.parseInt(pegawai.get("idGolongan").toString()))) { String cutiA1 = settingDataFixedDao.getSettingDataFixed("cutiB1"); String[] arrCutiA1 = cutiA1.split("_"); labelTtdMenkes = arrCutiA1[0]; From 4e3f30651a82a99d31f2eec26cee6ce0caf83b0c Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Tue, 21 Nov 2023 10:47:07 +0700 Subject: [PATCH 4/7] Update service slip gaji Perbaikan komponen gaji dari unit kerja sdm --- .../medifirst2000/constants/Master.java | 13 +- .../service/impl/ReportServiceImpl.java | 36 ++ .../service/impl/SlipGajiServiceImpl.java | 9 +- .../medifirst2000/dto/SlipPenerimaanDto.java | 20 + .../medifirst2000/dto/SlipPotonganDto.java | 18 +- .../WEB-INF/templates/jrxml/slipGaji.jrxml | 417 +++++++++++++----- 6 files changed, 400 insertions(+), 113 deletions(-) diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java index 96d5d3c9..5e724489 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java @@ -180,6 +180,8 @@ public final class Master { } public static final class KomponenGaji { + public static final Integer FEE_FOR_ON_SITE = 5; + public static final Integer FEE_FOR_SERVICE = 4; public static final Integer GAJI_POKOK = 1; public static final Integer SIMPANAN_WAJIB_KOPERASI_GAJI = 14; public static final Integer SIMPANAN_WAJIB_KOPERASI_REMUNERASI = 38; @@ -190,15 +192,21 @@ public final class Master { public static final Integer POTONGAN_BPJSTK = 21; public static final Integer POTONGAN_LAIN = 33; public static final Integer POTONGAN_OBAT = 16; - public static final Integer POTONGAN_PPH_21_REMUNERASI = 9; - public static final Integer POTONGAN_PPH_21_REMUNERASI_OPERASIONAL = 10; + public static final Integer POTONGAN_PPH_21_REMUNERASI = 36; + public static final Integer POTONGAN_PPH_21_REMUNERASI_OPERASIONAL = 37; public static final Integer POTONGAN_PPH_21_UANG_MAKAN = 12; public static final Integer POTONGAN_RAWAT_INAP = 17; public static final Integer POTONGAN_RAWAT_JALAN = 18; public static final Integer PFK = 31; public static final Integer PPH = 8; + public static final Integer PPH_FEE_FOR_ON_SITE = 11; + public static final Integer PPH_FEE_FOR_SERVICE = 10; + public static final Integer PPH_REMUNERASI = 9; + public static final Integer PPH_UANG_LEMBUR = 13; public static final Integer REMUNERASI = 2; public static final Integer REMUNERASI_OPERASIONAL = 3; + public static final Integer REMUNERASI_TAMBAHAN_DIKLITJAR = 22; + public static final Integer REMUNERASI_TAMBAHAN_LAIN = 23; public static final Integer SEWA_RUMAH = 32; public static final Integer TABUNGAN_RUMAH = 34; public static final Integer TOKO_KOPERASI = 19; @@ -209,6 +217,7 @@ public final class Master { public static final Integer TUNJANGAN_PNS = 26; public static final Integer TUNJANGAN_PPH = 30; public static final Integer TUNJANGAN_STRUKTURAL = 27; + public static final Integer UANG_LEMBUR = 7; public static final Integer UANG_MAKAN = 6; public static final Integer WAKAF_DLL = 39; } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java index 613dac78..52f9f1cd 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java @@ -3288,6 +3288,16 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic result.put("remunerasi", nf.format(k.getNominal())); } else if (Master.KomponenGaji.REMUNERASI_OPERASIONAL.equals(k.getIdKomponen())) { result.put("remunerasiOperasional", nf.format(k.getNominal())); + } else if (Master.KomponenGaji.FEE_FOR_SERVICE.equals(k.getIdKomponen())) { + result.put("feeForService", nf.format(k.getNominal())); + } else if (Master.KomponenGaji.FEE_FOR_ON_SITE.equals(k.getIdKomponen())) { + result.put("feeForOnSite", nf.format(k.getNominal())); + } else if (Master.KomponenGaji.REMUNERASI_TAMBAHAN_DIKLITJAR.equals(k.getIdKomponen())) { + result.put("remunerasiTambahanDiklitjar", nf.format(k.getNominal())); + } else if (Master.KomponenGaji.REMUNERASI_TAMBAHAN_LAIN.equals(k.getIdKomponen())) { + result.put("remunerasiTambahanLain", nf.format(k.getNominal())); + } else if (Master.KomponenGaji.UANG_LEMBUR.equals(k.getIdKomponen())) { + result.put("uangLembur", nf.format(k.getNominal())); } else if (Master.KomponenGaji.UANG_MAKAN.equals(k.getIdKomponen())) { result.put("uangMakan", nf.format(k.getNominal())); } else if (Master.KomponenGaji.PFK.equals(k.getIdKomponen())) { @@ -3328,6 +3338,14 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic result.put("tokoKoperasi", nf.format(k.getNominal())); } else if (Master.KomponenGaji.WAKAF_DLL.equals(k.getIdKomponen())) { result.put("wakafDanLainLain", nf.format(k.getNominal())); + } else if (Master.KomponenGaji.PPH_REMUNERASI.equals(k.getIdKomponen())) { + result.put("pphRemunerasi", nf.format(k.getNominal())); + } else if (Master.KomponenGaji.PPH_FEE_FOR_SERVICE.equals(k.getIdKomponen())) { + result.put("pphFeeForService", nf.format(k.getNominal())); + } else if (Master.KomponenGaji.PPH_FEE_FOR_ON_SITE.equals(k.getIdKomponen())) { + result.put("pphFeeForOnSite", nf.format(k.getNominal())); + } else if (Master.KomponenGaji.PPH_UANG_LEMBUR.equals(k.getIdKomponen())) { + result.put("pphUangLembur", nf.format(k.getNominal())); } else if (Master.KomponenGaji.POTONGAN_PPH_21_UANG_MAKAN.equals(k.getIdKomponen())) { result.put("potonganPph21UangMakan", nf.format(k.getNominal())); } @@ -3447,6 +3465,16 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic penerimaanDtoBuilder.remunerasi(nf.format(k.getNominal())); } else if (Master.KomponenGaji.REMUNERASI_OPERASIONAL.equals(k.getIdKomponen())) { penerimaanDtoBuilder.remunerasiOperasional(nf.format(k.getNominal())); + } else if (Master.KomponenGaji.FEE_FOR_SERVICE.equals(k.getIdKomponen())) { + penerimaanDtoBuilder.feeForService(nf.format(k.getNominal())); + } else if (Master.KomponenGaji.FEE_FOR_ON_SITE.equals(k.getIdKomponen())) { + penerimaanDtoBuilder.feeForOnSite(nf.format(k.getNominal())); + } else if (Master.KomponenGaji.REMUNERASI_TAMBAHAN_DIKLITJAR.equals(k.getIdKomponen())) { + penerimaanDtoBuilder.remunerasiTambahanDiklitjar(nf.format(k.getNominal())); + } else if (Master.KomponenGaji.REMUNERASI_TAMBAHAN_LAIN.equals(k.getIdKomponen())) { + penerimaanDtoBuilder.remunerasiTambahanLain(nf.format(k.getNominal())); + } else if (Master.KomponenGaji.UANG_LEMBUR.equals(k.getIdKomponen())) { + penerimaanDtoBuilder.uangLembur(nf.format(k.getNominal())); } else if (Master.KomponenGaji.UANG_MAKAN.equals(k.getIdKomponen())) { penerimaanDtoBuilder.uangMakan(nf.format(k.getNominal())); } else if (Master.KomponenGaji.PFK.equals(k.getIdKomponen())) { @@ -3487,6 +3515,14 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic potonganDtoBuilder.tokoKoperasi(nf.format(k.getNominal())); } else if (Master.KomponenGaji.WAKAF_DLL.equals(k.getIdKomponen())) { potonganDtoBuilder.wakafDanLainLain(nf.format(k.getNominal())); + } else if (Master.KomponenGaji.PPH_REMUNERASI.equals(k.getIdKomponen())) { + potonganDtoBuilder.pphRemunerasi(nf.format(k.getNominal())); + } else if (Master.KomponenGaji.PPH_FEE_FOR_SERVICE.equals(k.getIdKomponen())) { + potonganDtoBuilder.pphFeeForService(nf.format(k.getNominal())); + } else if (Master.KomponenGaji.PPH_FEE_FOR_ON_SITE.equals(k.getIdKomponen())) { + potonganDtoBuilder.pphFeeForOnSite(nf.format(k.getNominal())); + } else if (Master.KomponenGaji.PPH_UANG_LEMBUR.equals(k.getIdKomponen())) { + potonganDtoBuilder.pphUangLembur(nf.format(k.getNominal())); } else if (Master.KomponenGaji.POTONGAN_PPH_21_UANG_MAKAN.equals(k.getIdKomponen())) { potonganDtoBuilder.potonganPph21UangMakan(nf.format(k.getNominal())); } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SlipGajiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SlipGajiServiceImpl.java index f2a57889..3f5396af 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SlipGajiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SlipGajiServiceImpl.java @@ -486,10 +486,11 @@ public class SlipGajiServiceImpl implements SlipGajiService { data.put(i++, new Object[] { d.get("id"), d.get("idPegawai"), d.get("namaPegawai"), d.get("nip"), d.get("1"), d.get("24"), d.get("25"), d.get("26"), d.get("27"), d.get("28"), d.get("29"), d.get("30"), - d.get("2"), d.get("3"), d.get("6"), d.get("31"), d.get("8"), d.get("32"), d.get("40"), - d.get("33"), d.get("34"), d.get("21"), d.get("20"), d.get("14"), d.get("15"), d.get("9"), - d.get("10"), d.get("16"), d.get("17"), d.get("18"), d.get("38"), d.get("35"), d.get("19"), - d.get("39"), d.get("12") }); + d.get("2"), d.get("3"), d.get("4"), d.get("5"), d.get("22"), d.get("23"), d.get("7"), + d.get("6"), d.get("31"), d.get("8"), d.get("32"), d.get("40"), d.get("33"), d.get("34"), + d.get("21"), d.get("20"), d.get("14"), d.get("15"), d.get("36"), d.get("37"), d.get("16"), + d.get("17"), d.get("18"), d.get("38"), d.get("35"), d.get("19"), d.get("39"), d.get("9"), + d.get("10"), d.get("11"), d.get("13"), d.get("12") }); } TreeMap sorted = new TreeMap<>(data); Set keyset = sorted.keySet(); diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPenerimaanDto.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPenerimaanDto.java index 3c909735..a77de902 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPenerimaanDto.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPenerimaanDto.java @@ -53,6 +53,26 @@ public class SlipPenerimaanDto { @Builder.Default private String remunerasiOperasional = "-"; + @Caption(value = "Fee for Service") + @Builder.Default + private String feeForService = "-"; + + @Caption(value = "Fee for On Site") + @Builder.Default + private String feeForOnSite = "-"; + + @Caption(value = "Remunerasi Tambahan Pendidikan/Pelatihan/Pengajaran") + @Builder.Default + private String remunerasiTambahanDiklitjar = "-"; + + @Caption(value = "Remunerasi Tambahan Lain") + @Builder.Default + private String remunerasiTambahanLain = "-"; + + @Caption(value = "Uang Lembur") + @Builder.Default + private String uangLembur = "-"; + @Caption(value = "Uang Makan") @Builder.Default private String uangMakan = "-"; diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPotonganDto.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPotonganDto.java index 4072421f..d4fa292a 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPotonganDto.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPotonganDto.java @@ -85,10 +85,26 @@ public class SlipPotonganDto { @Builder.Default private String tokoKoperasi = "-"; - @Caption(value = "Wakap Dan Lain-lain") + @Caption(value = "Wakaf Dan Lain-lain") @Builder.Default private String wakafDanLainLain = "-"; + @Caption(value = "PPH Remunerasi") + @Builder.Default + private String pphRemunerasi = "-"; + + @Caption(value = "PPH Fee for Service") + @Builder.Default + private String pphFeeForService = "-"; + + @Caption(value = "PPH Fee for On Site") + @Builder.Default + private String pphFeeForOnSite = "-"; + + @Caption(value = "PPH Uang Lembur") + @Builder.Default + private String pphUangLembur = "-"; + @Caption(value = "Potongan PPH 21 Uang Makan") @Builder.Default private String potonganPph21UangMakan = "-"; diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml index 73df9bb9..e08a5147 100644 --- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml +++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml @@ -53,11 +53,20 @@ + + + + + + + + + - + @@ -87,7 +96,7 @@ - + @@ -97,7 +106,7 @@ - + @@ -107,7 +116,7 @@ - + @@ -118,7 +127,7 @@ - + @@ -128,7 +137,7 @@ - + @@ -139,7 +148,7 @@ - + @@ -150,7 +159,7 @@ - + @@ -158,7 +167,7 @@ - + @@ -166,7 +175,7 @@ - + @@ -175,8 +184,9 @@ - + + @@ -185,7 +195,7 @@ - + @@ -195,7 +205,7 @@ - + @@ -206,7 +216,7 @@ - + @@ -220,7 +230,7 @@ - + @@ -234,7 +244,7 @@ - + @@ -248,7 +258,7 @@ - + @@ -256,7 +266,7 @@ - + @@ -264,7 +274,7 @@ - + @@ -1060,18 +1070,7 @@ - - - - - - - - - - - - + @@ -1094,6 +1093,16 @@ + + + + + + + + + + @@ -1109,18 +1118,7 @@ - - - - - - - - - - - - + @@ -1143,6 +1141,16 @@ + + + + + + + + + + @@ -1158,18 +1166,7 @@ - - - - - - - - - - - - + @@ -1192,6 +1189,16 @@ + + + + + + + + + + @@ -1207,18 +1214,7 @@ - - - - - - - - - - - - + @@ -1242,6 +1238,18 @@ + + + + + + + + + + + + @@ -1257,18 +1265,7 @@ - - - - - - - - - - - - + @@ -1292,6 +1289,18 @@ + + + + + + + + + + + + @@ -1390,7 +1399,203 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1405,7 +1610,7 @@ - + @@ -1417,7 +1622,7 @@ - + @@ -1429,7 +1634,7 @@ - + @@ -1444,7 +1649,7 @@ - + @@ -1459,7 +1664,7 @@ - + @@ -1472,7 +1677,7 @@ - + @@ -1485,7 +1690,7 @@ - + @@ -1503,7 +1708,7 @@ - + @@ -1519,7 +1724,7 @@ - + @@ -1529,7 +1734,7 @@ - + @@ -1542,7 +1747,7 @@ - + @@ -1555,7 +1760,7 @@ - + @@ -1570,7 +1775,7 @@ - + @@ -1583,7 +1788,7 @@ - + @@ -1596,7 +1801,7 @@ - + @@ -1611,7 +1816,7 @@ - + @@ -1625,7 +1830,7 @@ - + @@ -1638,7 +1843,7 @@ - + @@ -1651,7 +1856,7 @@ - + @@ -1661,7 +1866,7 @@ - + @@ -1674,7 +1879,7 @@ - + @@ -1685,7 +1890,7 @@ - + @@ -1698,7 +1903,7 @@ - + @@ -1709,7 +1914,7 @@ - + @@ -1722,7 +1927,7 @@ - + @@ -1733,7 +1938,7 @@ - + From 4d2a4ee36db0b899982739df6d0fe2d6bcfa2d6e Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Tue, 21 Nov 2023 13:41:15 +0700 Subject: [PATCH 5/7] Update slipGaji.jrxml Perbaikan strecthing impact to performance --- .../WEB-INF/templates/jrxml/slipGaji.jrxml | 1624 ++++++++--------- 1 file changed, 771 insertions(+), 853 deletions(-) diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml index e08a5147..5aa493b3 100644 --- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml +++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml @@ -67,36 +67,32 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + @@ -106,7 +102,7 @@ - + @@ -116,7 +112,7 @@ - + @@ -127,7 +123,7 @@ - + @@ -137,7 +133,7 @@ - + @@ -148,7 +144,7 @@ - + @@ -285,7 +281,7 @@ - + @@ -296,10 +292,8 @@ - - - + @@ -314,10 +308,22 @@ - - - + + + + + + + + + + + + + + + @@ -332,24 +338,42 @@ + + + + + + + + + + + + - + - - - - + - + - - + + + + + + + + + + + - + @@ -366,29 +390,7 @@ - - - - - - - - - - - - - - - - - - - - - - - + @@ -397,12 +399,31 @@ - + - - - + + + + + + + + + + + + + + + + + + + + + + @@ -418,7 +439,27 @@ - + + + + + + + + + + + + + + + + + + + + + @@ -426,34 +467,10 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -469,7 +486,27 @@ - + + + + + + + + + + + + + + + + + + + + + @@ -477,32 +514,10 @@ - + - - - - - - - - - - - - - - - - - - - - - - - + @@ -518,7 +533,27 @@ - + + + + + + + + + + + + + + + + + + + + + @@ -526,32 +561,10 @@ - + - - - - - - - - - - - - - - - - - - - - - - - + @@ -567,40 +580,37 @@ - - - - - - - - - - - - - - - - - - - - - - + - + - - - + + + + + + + + + + + + + + + + + + + + + @@ -615,39 +625,40 @@ - - + + - - - - - - - - - - - - - - - - - - - + - - - + + + + + + + + + + + + + + + + + + + + + + @@ -662,28 +673,7 @@ - - - - - - - - - - - - - - - - - - - - - - + @@ -692,12 +682,30 @@ - + - - - + + + + + + + + + + + + + + + + + + + + + @@ -712,77 +720,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -793,10 +731,29 @@ - - - + + + + + + + + + + + + + + + + + + + + + + @@ -810,29 +767,8 @@ - - - - - - - - - - - - - - - - - - - - - - + @@ -843,10 +779,81 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -860,32 +867,19 @@ - - + + + - - - - + + - - - - - - - - - - - - - + - + @@ -895,12 +889,10 @@ - + - - - + @@ -914,34 +906,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -956,10 +922,42 @@ - - + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + @@ -975,43 +973,36 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - + - - - + + + + + + + + + + + + + + + + + + + + @@ -1027,15 +1018,27 @@ - - + + + + - + + + + + + + + + + + - + @@ -1043,22 +1046,10 @@ - + - - - - - - - - - - - - - + @@ -1072,8 +1063,28 @@ + + + + + + + + + + + + + + + + + + + + - + @@ -1081,32 +1092,10 @@ - + - - - - - - - - - - - - - - - - - - - - - - - + @@ -1120,8 +1109,28 @@ + + + + + + + + + + + + + + + + + + + + - + @@ -1129,32 +1138,10 @@ - + - - - - - - - - - - - - - - - - - - - - - - - + @@ -1168,41 +1155,42 @@ - - + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - + + + + + + + + + + + @@ -1216,30 +1204,8 @@ - - - - - - - - - - - - - - - - - - - - - - - + @@ -1248,12 +1214,32 @@ - + + + + + + + + + + + + + - - - + + + + + + + + + + + @@ -1267,78 +1253,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -1347,10 +1263,27 @@ - - - + + + + + + + + + + + + + + + + + + + + @@ -1364,19 +1297,18 @@ - - - - - - - + + + + + + - - + + - + @@ -1386,20 +1318,19 @@ - - - - - - + + + + + + + - - - - + + - + @@ -1414,41 +1345,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -1463,7 +1360,7 @@ - + @@ -1474,7 +1371,7 @@ - + @@ -1485,7 +1382,7 @@ - + @@ -1494,10 +1391,40 @@ - - + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + @@ -1511,19 +1438,18 @@ - - - - - - - + + + + + + - - + + - + @@ -1533,20 +1459,19 @@ - - - - - - + + + + + + + - - - - + + - + @@ -1560,8 +1485,29 @@ + + + + + + + + + + - + + + + + + + + + + + + @@ -1572,30 +1518,59 @@ - - + - + + + + + + - + - + + + + - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1609,32 +1584,19 @@ - - + + + - - - - + + - - - - - - - - - - - - - + - + @@ -1644,12 +1606,10 @@ - + - - - + @@ -1663,34 +1623,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -1705,10 +1639,42 @@ - - + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + @@ -1723,31 +1689,21 @@ - - - - - - - - - - - + - + - - - - + + - + - + + + @@ -1755,12 +1711,10 @@ - + - - - + @@ -1774,21 +1728,8 @@ - - - - - - - - - - - - - - + @@ -1796,27 +1737,10 @@ - - - - - - - - - - - - - - - - - - + - + @@ -1830,20 +1754,22 @@ - - - + + - - + + + + + + + - + - - - + @@ -1853,20 +1779,8 @@ - - - - - - - - - - - - - + @@ -1876,10 +1790,29 @@ - - - + + + + + + + + + + + + + + + + + + + + + + @@ -1890,7 +1823,7 @@ - + @@ -1898,12 +1831,10 @@ - + - - - + @@ -1914,20 +1845,17 @@ - + - - + - - - + @@ -1937,16 +1865,6 @@ - - - - - - - - - - From 6b0fa4870ae3df2b46688a71df3a764574bce848 Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Tue, 21 Nov 2023 14:48:44 +0700 Subject: [PATCH 6/7] Update service slip gaji Rollback komponen gaji dari unit kerja sdm --- .../service/impl/ReportServiceImpl.java | 36 -- .../service/impl/SlipGajiServiceImpl.java | 9 +- .../WEB-INF/templates/jrxml/slipGaji.jrxml | 372 +++++------------- 3 files changed, 92 insertions(+), 325 deletions(-) diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java index 52f9f1cd..613dac78 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java @@ -3288,16 +3288,6 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic result.put("remunerasi", nf.format(k.getNominal())); } else if (Master.KomponenGaji.REMUNERASI_OPERASIONAL.equals(k.getIdKomponen())) { result.put("remunerasiOperasional", nf.format(k.getNominal())); - } else if (Master.KomponenGaji.FEE_FOR_SERVICE.equals(k.getIdKomponen())) { - result.put("feeForService", nf.format(k.getNominal())); - } else if (Master.KomponenGaji.FEE_FOR_ON_SITE.equals(k.getIdKomponen())) { - result.put("feeForOnSite", nf.format(k.getNominal())); - } else if (Master.KomponenGaji.REMUNERASI_TAMBAHAN_DIKLITJAR.equals(k.getIdKomponen())) { - result.put("remunerasiTambahanDiklitjar", nf.format(k.getNominal())); - } else if (Master.KomponenGaji.REMUNERASI_TAMBAHAN_LAIN.equals(k.getIdKomponen())) { - result.put("remunerasiTambahanLain", nf.format(k.getNominal())); - } else if (Master.KomponenGaji.UANG_LEMBUR.equals(k.getIdKomponen())) { - result.put("uangLembur", nf.format(k.getNominal())); } else if (Master.KomponenGaji.UANG_MAKAN.equals(k.getIdKomponen())) { result.put("uangMakan", nf.format(k.getNominal())); } else if (Master.KomponenGaji.PFK.equals(k.getIdKomponen())) { @@ -3338,14 +3328,6 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic result.put("tokoKoperasi", nf.format(k.getNominal())); } else if (Master.KomponenGaji.WAKAF_DLL.equals(k.getIdKomponen())) { result.put("wakafDanLainLain", nf.format(k.getNominal())); - } else if (Master.KomponenGaji.PPH_REMUNERASI.equals(k.getIdKomponen())) { - result.put("pphRemunerasi", nf.format(k.getNominal())); - } else if (Master.KomponenGaji.PPH_FEE_FOR_SERVICE.equals(k.getIdKomponen())) { - result.put("pphFeeForService", nf.format(k.getNominal())); - } else if (Master.KomponenGaji.PPH_FEE_FOR_ON_SITE.equals(k.getIdKomponen())) { - result.put("pphFeeForOnSite", nf.format(k.getNominal())); - } else if (Master.KomponenGaji.PPH_UANG_LEMBUR.equals(k.getIdKomponen())) { - result.put("pphUangLembur", nf.format(k.getNominal())); } else if (Master.KomponenGaji.POTONGAN_PPH_21_UANG_MAKAN.equals(k.getIdKomponen())) { result.put("potonganPph21UangMakan", nf.format(k.getNominal())); } @@ -3465,16 +3447,6 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic penerimaanDtoBuilder.remunerasi(nf.format(k.getNominal())); } else if (Master.KomponenGaji.REMUNERASI_OPERASIONAL.equals(k.getIdKomponen())) { penerimaanDtoBuilder.remunerasiOperasional(nf.format(k.getNominal())); - } else if (Master.KomponenGaji.FEE_FOR_SERVICE.equals(k.getIdKomponen())) { - penerimaanDtoBuilder.feeForService(nf.format(k.getNominal())); - } else if (Master.KomponenGaji.FEE_FOR_ON_SITE.equals(k.getIdKomponen())) { - penerimaanDtoBuilder.feeForOnSite(nf.format(k.getNominal())); - } else if (Master.KomponenGaji.REMUNERASI_TAMBAHAN_DIKLITJAR.equals(k.getIdKomponen())) { - penerimaanDtoBuilder.remunerasiTambahanDiklitjar(nf.format(k.getNominal())); - } else if (Master.KomponenGaji.REMUNERASI_TAMBAHAN_LAIN.equals(k.getIdKomponen())) { - penerimaanDtoBuilder.remunerasiTambahanLain(nf.format(k.getNominal())); - } else if (Master.KomponenGaji.UANG_LEMBUR.equals(k.getIdKomponen())) { - penerimaanDtoBuilder.uangLembur(nf.format(k.getNominal())); } else if (Master.KomponenGaji.UANG_MAKAN.equals(k.getIdKomponen())) { penerimaanDtoBuilder.uangMakan(nf.format(k.getNominal())); } else if (Master.KomponenGaji.PFK.equals(k.getIdKomponen())) { @@ -3515,14 +3487,6 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic potonganDtoBuilder.tokoKoperasi(nf.format(k.getNominal())); } else if (Master.KomponenGaji.WAKAF_DLL.equals(k.getIdKomponen())) { potonganDtoBuilder.wakafDanLainLain(nf.format(k.getNominal())); - } else if (Master.KomponenGaji.PPH_REMUNERASI.equals(k.getIdKomponen())) { - potonganDtoBuilder.pphRemunerasi(nf.format(k.getNominal())); - } else if (Master.KomponenGaji.PPH_FEE_FOR_SERVICE.equals(k.getIdKomponen())) { - potonganDtoBuilder.pphFeeForService(nf.format(k.getNominal())); - } else if (Master.KomponenGaji.PPH_FEE_FOR_ON_SITE.equals(k.getIdKomponen())) { - potonganDtoBuilder.pphFeeForOnSite(nf.format(k.getNominal())); - } else if (Master.KomponenGaji.PPH_UANG_LEMBUR.equals(k.getIdKomponen())) { - potonganDtoBuilder.pphUangLembur(nf.format(k.getNominal())); } else if (Master.KomponenGaji.POTONGAN_PPH_21_UANG_MAKAN.equals(k.getIdKomponen())) { potonganDtoBuilder.potonganPph21UangMakan(nf.format(k.getNominal())); } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SlipGajiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SlipGajiServiceImpl.java index 3f5396af..b957f92c 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SlipGajiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SlipGajiServiceImpl.java @@ -486,11 +486,10 @@ public class SlipGajiServiceImpl implements SlipGajiService { data.put(i++, new Object[] { d.get("id"), d.get("idPegawai"), d.get("namaPegawai"), d.get("nip"), d.get("1"), d.get("24"), d.get("25"), d.get("26"), d.get("27"), d.get("28"), d.get("29"), d.get("30"), - d.get("2"), d.get("3"), d.get("4"), d.get("5"), d.get("22"), d.get("23"), d.get("7"), - d.get("6"), d.get("31"), d.get("8"), d.get("32"), d.get("40"), d.get("33"), d.get("34"), - d.get("21"), d.get("20"), d.get("14"), d.get("15"), d.get("36"), d.get("37"), d.get("16"), - d.get("17"), d.get("18"), d.get("38"), d.get("35"), d.get("19"), d.get("39"), d.get("9"), - d.get("10"), d.get("11"), d.get("13"), d.get("12") }); + d.get("2"), d.get("3"), d.get("6"), d.get("31"), d.get("8"), d.get("32"), d.get("40"), + d.get("33"), d.get("34"), d.get("21"), d.get("20"), d.get("14"), d.get("15"), d.get("36"), + d.get("37"), d.get("16"), d.get("17"), d.get("18"), d.get("38"), d.get("35"), d.get("19"), + d.get("39"), d.get("12") }); } TreeMap sorted = new TreeMap<>(data); Set keyset = sorted.keySet(); diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml index 5aa493b3..4bd732cb 100644 --- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml +++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml @@ -53,20 +53,11 @@ - - - - - - - - - - + @@ -1017,16 +1008,6 @@ - - - - - - - - - - @@ -1061,18 +1042,8 @@ - + - - - - - - - - - - @@ -1107,18 +1078,8 @@ - + - - - - - - - - - - @@ -1153,20 +1114,8 @@ - + - - - - - - - - - - - - @@ -1202,20 +1151,8 @@ - + - - - - - - - - - - - - @@ -1251,7 +1188,7 @@ - + @@ -1344,196 +1281,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -1546,7 +1295,7 @@ - + @@ -1558,7 +1307,7 @@ - + @@ -1570,7 +1319,7 @@ - + @@ -1585,7 +1334,7 @@ - + @@ -1596,7 +1345,7 @@ - + @@ -1609,7 +1358,7 @@ - + @@ -1624,7 +1373,7 @@ - + @@ -1640,7 +1389,7 @@ - + @@ -1651,7 +1400,7 @@ - + @@ -1664,7 +1413,7 @@ - + @@ -1674,7 +1423,7 @@ - + @@ -1690,7 +1439,7 @@ - + @@ -1701,7 +1450,7 @@ - + @@ -1714,7 +1463,7 @@ - + @@ -1729,7 +1478,7 @@ - + @@ -1740,7 +1489,7 @@ - + @@ -1754,7 +1503,7 @@ - + @@ -1769,7 +1518,7 @@ - + @@ -1780,7 +1529,7 @@ - + @@ -1791,7 +1540,7 @@ - + @@ -1801,7 +1550,7 @@ - + @@ -1812,7 +1561,7 @@ - + @@ -1823,7 +1572,7 @@ - + @@ -1834,7 +1583,7 @@ - + @@ -1845,7 +1594,7 @@ - + @@ -1855,7 +1604,7 @@ - + @@ -1866,6 +1615,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From b9306c8e757c13ca02411ce3da6c56676b67e022 Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Tue, 21 Nov 2023 15:52:14 +0700 Subject: [PATCH 7/7] Update slipGaji.jrxml Perbaikan posisi label keterangan --- .../WEB-INF/templates/jrxml/slipGaji.jrxml | 239 +++++++++--------- 1 file changed, 124 insertions(+), 115 deletions(-) diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml index 4bd732cb..94582df8 100644 --- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml +++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml @@ -858,17 +858,6 @@ - - - - - - - - - - - @@ -883,7 +872,7 @@ - + @@ -1333,17 +1322,6 @@ - - - - - - - - - - - @@ -1358,7 +1336,7 @@ - + @@ -1410,7 +1388,7 @@ - + @@ -1438,17 +1416,6 @@ - - - - - - - - - - - @@ -1463,7 +1430,7 @@ - + @@ -1477,17 +1444,6 @@ - - - - - - - - - - - @@ -1503,7 +1459,7 @@ - + @@ -1529,7 +1485,7 @@ - + @@ -1537,10 +1493,10 @@ - + - + @@ -1550,7 +1506,7 @@ - + @@ -1558,10 +1514,10 @@ - + - + @@ -1572,7 +1528,7 @@ - + @@ -1580,10 +1536,10 @@ - + - + @@ -1594,7 +1550,7 @@ - + @@ -1604,7 +1560,7 @@ - + @@ -1614,62 +1570,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -