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

Merge branch 'dev'

Browse Source
This commit is contained in:
Salman Manoe 2023-11-24 20:24:37 +07:00
commit 8684e1eae2
3 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java
View File

@ -3207,29 +3207,38 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
result.put("periode", df.format(new Date(bulan)));
result.put("unitKerja", CommonUtil.isNotNullOrEmpty(dto.getUnitKerja()) ? dto.getUnitKerja() : "-");
result.put("subUnitKerja", CommonUtil.isNotNullOrEmpty(dto.getSubUnitKerja()) ? dto.getSubUnitKerja() : "-");
result.put("statusKepegawaian",
CommonUtil.isNotNullOrEmpty(dto.getStatusKepegawaian()) ? dto.getStatusKepegawaian() : "-");
result.put("gajiPokok", "-");
result.put("tunjanganIstriSuami", "-");
result.put("tunjanganAnak", "-");
result.put("tunjanganPns", "-");
result.put("tunjanganUmum", "-");
result.put("tunjanganStruktural", "-");
result.put("tunjanganFungsional", "-");
result.put("tunjanganBeras", "-");
result.put("tunjanganPph", "-");
result.put("remunerasi", "-");
result.put("tunjanganKompensasi", "-");
result.put("pembulatan", "-");
result.put("remunerasiKinerja", "-");
result.put("feeForService", "-");
result.put("remunerasiOperasional", "-");
result.put("kelebihanJamKerja", "-");
result.put("remunerasiManajerial", "-");
result.put("remunerasiTambahanDiklitjar", "-");
result.put("remunerasiTambahanLain", "-");
result.put("uangMakan", "-");
result.put("pfk", "-");
result.put("pph", "-");
result.put("potonganPfk", "-");
result.put("potonganPph", "-");
result.put("potonganBpjsKetenagakerjaan", "-");
result.put("potonganBpjsKesehatan", "-");
result.put("sewaRumah", "-");
result.put("kelebihanTunjangan", "-");
result.put("potonganLain", "-");
result.put("tabunganRumah", "-");
result.put("potonganBpjsKetenagakerjaan", "-");
result.put("potonganBpjsKesehatan", "-");
result.put("simpananWajibKoperasiGaji", "-");
result.put("pinjamanKoperasiGaji", "-");
result.put("potonganPph21Remunerasi", "-");
result.put("potonganPph21RemunerasiOperasional", "-");
result.put("potonganPphRemunerasi", "-");
result.put("potonganPphRemunerasiOperasional", "-");
result.put("potonganObat", "-");
result.put("potonganRawatInap", "-");
result.put("potonganRawatJalan", "-");
@ -3237,7 +3246,7 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
result.put("pinjamanKoperasiRemunerasi", "-");
result.put("tokoKoperasi", "-");
result.put("wakafDanLainLain", "-");
result.put("potonganPph21UangMakan", "-");
result.put("potonganUangMakan", "-");
BigDecimal jumlahGaji = ZERO;
BigDecimal jumlahRemunerasi = ZERO;
BigDecimal jumlahUangMakan = ZERO;
@ -3305,7 +3314,7 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
} else if (Master.KomponenGaji.UANG_MAKAN.equals(k.getIdKomponen())) {
result.put("uangMakan", nf.format(k.getNominal()));
} else if (Master.KomponenGaji.POTONGAN_PFK.equals(k.getIdKomponen())) {
result.put("potongaPfk", nf.format(k.getNominal()));
result.put("potonganPfk", nf.format(k.getNominal()));
} else if (Master.KomponenGaji.POTONGAN_PPH.equals(k.getIdKomponen())) {
result.put("potonganPph", nf.format(k.getNominal()));
} else if (Master.KomponenGaji.POTONGAN_BPJSTK.equals(k.getIdKomponen())) {

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

@ -507,7 +507,8 @@ public class SlipGajiServiceImpl implements SlipGajiService {
int cellnum = 0;
for (Object obj : objArr) {
Cell cell = row.createCell(cellnum++);
cell.setCellStyle(defaultCellStyle);
if (row.getRowNum() != 0 && cell.getColumnIndex() > 1)
cell.setCellStyle(defaultCellStyle);
if (obj instanceof String)
cell.setCellValue((String) obj);
else if (obj instanceof Integer)

11
jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml
View File

@ -364,6 +364,7 @@
<property name="com.jaspersoft.studio.unit.width" value="px"/>
</reportElement>
<box rightPadding="5">
<topPen lineWidth="1.0"/>
<rightPen lineWidth="1.0"/>
</box>
<textElement textAlignment="Right" verticalAlignment="Middle">
@ -376,7 +377,9 @@
<property name="com.jaspersoft.studio.unit.width" value="px"/>
<property name="com.jaspersoft.studio.unit.height" value="px"/>
</reportElement>
<box topPadding="0" leftPadding="2" bottomPadding="0" rightPadding="0"/>
<box topPadding="0" leftPadding="2" bottomPadding="0" rightPadding="0">
<topPen lineWidth="1.0"/>
</box>
<textElement verticalAlignment="Middle">
<font size="8"/>
</textElement>
@ -387,7 +390,9 @@
<property name="com.jaspersoft.studio.unit.x" value="px"/>
<property name="com.jaspersoft.studio.unit.height" value="px"/>
</reportElement>
<box rightPadding="5"/>
<box rightPadding="5">
<topPen lineWidth="1.0"/>
</box>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font size="8"/>
</textElement>
@ -400,7 +405,7 @@
</reportElement>
<box leftPadding="2">
<pen lineWidth="1.0"/>
<topPen lineWidth="0.0"/>
<topPen lineWidth="1.0"/>
<leftPen lineWidth="1.0"/>
<bottomPen lineWidth="0.0"/>
<rightPen lineWidth="0.0"/>