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); } }