Merge branch 'master' into prod-deploy
This commit is contained in:
commit
b26fc737f8
@ -1,12 +1,10 @@
|
||||
package com.jasamedika.medifirst2000.interceptor;
|
||||
|
||||
import org.springframework.web.method.HandlerMethod;
|
||||
import org.springframework.web.servlet.HandlerInterceptor;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.lang.reflect.Method;
|
||||
|
||||
/**
|
||||
* Interceptor class for All annotation method controller @AppPermission
|
||||
@ -17,8 +15,6 @@ public class AppInterceptor implements HandlerInterceptor {
|
||||
|
||||
@Override
|
||||
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
|
||||
HandlerMethod hm = (HandlerMethod) handler;
|
||||
Method method = hm.getMethod();
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@ -343,6 +343,7 @@ public final class Master {
|
||||
}
|
||||
|
||||
public static final class Ruangan {
|
||||
public static final Integer CATHLAB = 703;
|
||||
public static final Integer[] GENETIKA = { 277, 563, 587 };
|
||||
public static final Integer[] ICU_NICU = { 328, 75, 707, 708 };
|
||||
public static final int KLINIK_FALSE_EMERGENCY = 309;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package com.jasamedika.medifirst2000.logging.dao;
|
||||
package com.jasamedika.medifirst2000.dao;
|
||||
|
||||
import com.jasamedika.medifirst2000.entities.JenisLog;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
@ -9,6 +9,4 @@ import org.springframework.data.jpa.repository.JpaRepository;
|
||||
* @since 31/01/2024
|
||||
*/
|
||||
public interface JenisLogDao extends JpaRepository<JenisLog, Long> {
|
||||
|
||||
boolean existsByJenisLog(String jenisLog);
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
package com.jasamedika.medifirst2000.service;
|
||||
|
||||
import com.jasamedika.medifirst2000.vo.JenisLogVO;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author Salman
|
||||
* @version 1.0.0
|
||||
* @since 02/02/2024
|
||||
*/
|
||||
public interface JenisLogService {
|
||||
|
||||
void save(List<JenisLogVO> vos);
|
||||
}
|
||||
@ -0,0 +1,39 @@
|
||||
package com.jasamedika.medifirst2000.service.impl;
|
||||
|
||||
import com.jasamedika.medifirst2000.converter.base.BaseVoConverter;
|
||||
import com.jasamedika.medifirst2000.entities.JenisLog;
|
||||
import com.jasamedika.medifirst2000.dao.JenisLogDao;
|
||||
import com.jasamedika.medifirst2000.service.JenisLogService;
|
||||
import com.jasamedika.medifirst2000.vo.JenisLogVO;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author Salman
|
||||
* @version 1.0.0
|
||||
* @since 02/02/2024
|
||||
*/
|
||||
@Service
|
||||
@Transactional
|
||||
public class JenisLogServiceImpl implements JenisLogService {
|
||||
|
||||
@Autowired
|
||||
private BaseVoConverter<JenisLogVO, JenisLog> jenisLogVoConverter;
|
||||
|
||||
@Autowired
|
||||
private JenisLogDao jenisLogDao;
|
||||
|
||||
@Override
|
||||
public void save(List<JenisLogVO> vos) {
|
||||
List<JenisLog> entities = new ArrayList<>();
|
||||
vos.forEach(vo -> {
|
||||
JenisLog entity = jenisLogVoConverter.transferVOToModel(vo, new JenisLog());
|
||||
entities.add(entity);
|
||||
});
|
||||
jenisLogDao.save(entities);
|
||||
}
|
||||
}
|
||||
@ -530,6 +530,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
|
||||
List<Integer> drKkPerinatologiList = pegawaiDao.getDokterByKelompokKerja(KK_PERINATOLOGI);
|
||||
List<Integer> drKkPatologiAnatomiList = pegawaiDao.getDokterByKelompokKerja(KK_PATOLOGI_ANATOMI);
|
||||
List<Integer> drKkGenetika = pegawaiDao.getDokterByKelompokKerja(KK_GENETIKA);
|
||||
List<Integer> drKkRadiologi = pegawaiDao.getDokterByKelompokKerja(KK_RADIOLOGI);
|
||||
List<Integer> laboranRadiologList = mapPegawaiLaboratRadiologiDao.findPegawaiLaboranRadiolog();
|
||||
List<Integer> idsRegDJPAdminNonPK = splitDataSettingDatafixed("admin_nonpk");
|
||||
List<Integer> idsRegDJPMedisUtama = splitDataSettingDatafixed("medis_utama");
|
||||
@ -545,11 +546,11 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
|
||||
List<Integer> idsMonitoringHemodinamikGagalOrgan = splitDataSettingDatafixed(
|
||||
"idMonitoringHemodinamikGagalOrgan");
|
||||
List<Integer> idProdukLabGenetikaLuarRuangan = splitDataSettingDatafixed("idProdukLabGenetikaLuarRuangan");
|
||||
if (pegawaiDao.getDokterByKelompokKerja(KK_PATOLOGI_ANATOMI).contains(idPegawai)) {
|
||||
if (drKkPatologiAnatomiList.contains(idPegawai)) {
|
||||
listDetailJenisProduk = idsRegDJPPenunjangPA;
|
||||
} else if (pegawaiDao.getDokterByKelompokKerja(KK_PATOLOGI_KLINIK).contains(idPegawai)) {
|
||||
listDetailJenisProduk = idsRegDJPPenunjangPK;
|
||||
} else if (pegawaiDao.getDokterByKelompokKerja(KK_RADIOLOGI).contains(idPegawai)) {
|
||||
} else if (drKkRadiologi.contains(idPegawai)) {
|
||||
listDetailJenisProduk = idsRegDJPPenunjangRad;
|
||||
} else {
|
||||
listDetailJenisProduk = idsRegDJPMedisUtama;
|
||||
@ -600,44 +601,55 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
|
||||
d.put("hargaJasa", 0.0);
|
||||
} else if (drKsmUmumList.contains(idPegawai) && ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) {
|
||||
d.put("hargaJasa", persenRemunDokterUmumHD / 100 * hargaJual);
|
||||
} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|
||||
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|
||||
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
|
||||
&& CommonUtil.isNotNullOrEmpty(d.get("idKelompokPasien"))
|
||||
&& Arrays.asList(KELOMPOK_BPJS).contains(Integer.parseInt(d.get("idKelompokPasien").toString()))
|
||||
&& DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) {
|
||||
double persenJasa = persenOperator / 100;
|
||||
d.put("hargaJasa", persenJasa * persenTarifIBS * hargaJual);
|
||||
} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|
||||
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|
||||
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
|
||||
&& CommonUtil.isNotNullOrEmpty(d.get("idKelompokPasien"))
|
||||
&& Arrays.asList(KELOMPOK_BPJS).contains(Integer.parseInt(d.get("idKelompokPasien").toString()))
|
||||
&& ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) {
|
||||
double persenJasa = persenAsistenIBS / 100;
|
||||
d.put("hargaJasa", persenJasa * persenTarifIBS * hargaJual);
|
||||
} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|
||||
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|
||||
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
|
||||
&& CommonUtil.isNotNullOrEmpty(d.get("idKelompokPasien"))
|
||||
&& Arrays.asList(KELOMPOK_BPJS).contains(Integer.parseInt(d.get("idKelompokPasien").toString()))
|
||||
&& DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) {
|
||||
double persenJasa = persenAnestesi / 100;
|
||||
d.put("hargaJasa", persenJasa * persenTarifIBS * hargaJual);
|
||||
} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen")) && DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))
|
||||
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|
||||
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
|
||||
&& DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))
|
||||
&& CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) {
|
||||
d.put("hargaJasa", persenOperator / 100
|
||||
* (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)));
|
||||
} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|
||||
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|
||||
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
|
||||
&& ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))
|
||||
&& CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) {
|
||||
d.put("hargaJasa", persenAsistenIBS / 100
|
||||
* (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)));
|
||||
} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen")) && DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))
|
||||
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|
||||
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
|
||||
&& DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))
|
||||
&& CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) {
|
||||
d.put("hargaJasa", persenAnestesi / 100
|
||||
* (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)));
|
||||
} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|
||||
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|
||||
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
|
||||
&& DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) {
|
||||
d.put("hargaJasa", persenOperator / 100 * hargaJual);
|
||||
} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|
||||
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|
||||
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
|
||||
&& ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) {
|
||||
d.put("hargaJasa", persenAsistenIBS / 100 * hargaJual);
|
||||
} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|
||||
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|
||||
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
|
||||
&& DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) {
|
||||
d.put("hargaJasa", persenAnestesi / 100 * hargaJual);
|
||||
} else if (RADIOLOGI.equals(d.get("idDepartemen"))) {
|
||||
@ -1122,6 +1134,10 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
|
||||
listPelayananRemun.add(next);
|
||||
capaianRemun += Double.parseDouble(next.get("hargaJasa").toString());
|
||||
}
|
||||
} else if (drKkRadiologi.contains(idPegawai) && (BEDAH_SENTRAL.equals(next.get("idDepartemen"))
|
||||
|| CATHLAB.equals(next.get("idRuangan")))) {
|
||||
listPelayananRemun.add(next);
|
||||
capaianRemun += Double.parseDouble(next.get("hargaJasa").toString());
|
||||
} else {
|
||||
/*
|
||||
* Selain dokter-dokter kk pediatrik gawat darurat
|
||||
@ -1239,6 +1255,10 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
|
||||
listPelayananRemun.add(next);
|
||||
capaianRemun += Double.parseDouble(next.get("hargaJasa").toString());
|
||||
}
|
||||
} else if (drKkRadiologi.contains(idPegawai) && (BEDAH_SENTRAL.equals(next.get("idDepartemen"))
|
||||
|| CATHLAB.equals(next.get("idRuangan")))) {
|
||||
listPelayananRemun.add(next);
|
||||
capaianRemun += Double.parseDouble(next.get("hargaJasa").toString());
|
||||
} else {
|
||||
/*
|
||||
* Selain dokter-dokter kk pediatrik gawat darurat
|
||||
@ -1353,6 +1373,9 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
|
||||
*/
|
||||
listPelayananFfs.add(next);
|
||||
}
|
||||
} else if (drKkRadiologi.contains(idPegawai) && (BEDAH_SENTRAL.equals(next.get("idDepartemen"))
|
||||
|| CATHLAB.equals(next.get("idRuangan")))) {
|
||||
listPelayananFfs.add(next);
|
||||
} else {
|
||||
/*
|
||||
* Selain dokter-dokter kk pediatrik gawat darurat
|
||||
@ -1819,7 +1842,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
|
||||
d.put("persenJasa", persenRemunDokterUmumHD + "%");
|
||||
if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
|
||||
d.put("hargaJasa", persenRemunDokterUmumHD / 100 * hargaJual);
|
||||
} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|
||||
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|
||||
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
|
||||
&& CommonUtil.isNotNullOrEmpty(d.get("idKelompokPasien"))
|
||||
&& Arrays.asList(KELOMPOK_BPJS).contains(Integer.parseInt(d.get("idKelompokPasien").toString()))
|
||||
&& DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) {
|
||||
@ -1828,7 +1852,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
|
||||
d.put("keterangan", "Dari " + persenTarifJasaBedah + "% tarif" + keteranganTambahan);
|
||||
if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
|
||||
d.put("hargaJasa", persenJasa * persenTarifIBS * hargaJual);
|
||||
} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|
||||
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|
||||
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
|
||||
&& CommonUtil.isNotNullOrEmpty(d.get("idKelompokPasien"))
|
||||
&& Arrays.asList(KELOMPOK_BPJS).contains(Integer.parseInt(d.get("idKelompokPasien").toString()))
|
||||
&& ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) {
|
||||
@ -1837,7 +1862,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
|
||||
d.put("keterangan", "Dari " + persenTarifJasaBedah + "% tarif" + keteranganTambahan);
|
||||
if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
|
||||
d.put("hargaJasa", persenJasa * persenTarifIBS * hargaJual);
|
||||
} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|
||||
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|
||||
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
|
||||
&& CommonUtil.isNotNullOrEmpty(d.get("idKelompokPasien"))
|
||||
&& Arrays.asList(KELOMPOK_BPJS).contains(Integer.parseInt(d.get("idKelompokPasien").toString()))
|
||||
&& DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) {
|
||||
@ -1846,7 +1872,9 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
|
||||
d.put("keterangan", "Dari " + persenTarifJasaBedah + "% tarif" + keteranganTambahan);
|
||||
if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
|
||||
d.put("hargaJasa", persenJasa * persenTarifIBS * hargaJual);
|
||||
} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen")) && DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))
|
||||
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|
||||
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
|
||||
&& DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))
|
||||
&& CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) {
|
||||
d.put("persenJasa", persenOperator + "%");
|
||||
d.put("keterangan", "Dari " + (100.0 - Double.parseDouble(d.get("persenSayatan").toString()))
|
||||
@ -1854,7 +1882,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
|
||||
if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
|
||||
d.put("hargaJasa", persenOperator / 100
|
||||
* (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)));
|
||||
} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|
||||
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|
||||
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
|
||||
&& ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))
|
||||
&& CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) {
|
||||
d.put("persenJasa", persenAsistenIBS + "%");
|
||||
@ -1863,7 +1892,9 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
|
||||
if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
|
||||
d.put("hargaJasa", persenAsistenIBS / 100
|
||||
* (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)));
|
||||
} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen")) && DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))
|
||||
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|
||||
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
|
||||
&& DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))
|
||||
&& CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) {
|
||||
d.put("persenJasa", persenAnestesi + "%");
|
||||
d.put("keterangan", "Dari " + (100.0 - Double.parseDouble(d.get("persenSayatan").toString()))
|
||||
@ -1871,17 +1902,20 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
|
||||
if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
|
||||
d.put("hargaJasa", persenAnestesi / 100
|
||||
* (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)));
|
||||
} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|
||||
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|
||||
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
|
||||
&& DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) {
|
||||
d.put("persenJasa", persenOperator + "%");
|
||||
if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
|
||||
d.put("hargaJasa", persenOperator / 100 * hargaJual);
|
||||
} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|
||||
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|
||||
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
|
||||
&& ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) {
|
||||
d.put("persenJasa", persenAsistenIBS + "%");
|
||||
if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
|
||||
d.put("hargaJasa", persenAsistenIBS / 100 * hargaJual);
|
||||
} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|
||||
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|
||||
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
|
||||
&& DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) {
|
||||
d.put("persenJasa", persenAnestesi + "%");
|
||||
if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
|
||||
@ -2169,7 +2203,9 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
|
||||
d.put("persenJasa", persenJasaDokterUmumHD + "%");
|
||||
if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
|
||||
d.put("hargaJasa", persenJasaDokterUmumHD / 100 * hargaJual);
|
||||
} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen")) && DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))
|
||||
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|
||||
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
|
||||
&& DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))
|
||||
&& CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) {
|
||||
d.put("persenJasa", persenOperator + "%");
|
||||
d.put("keterangan", "Dari " + (100.0 - Double.parseDouble(d.get("persenSayatan").toString()))
|
||||
@ -2177,7 +2213,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
|
||||
if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
|
||||
d.put("hargaJasa", persenOperator / 100
|
||||
* (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)));
|
||||
} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|
||||
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|
||||
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
|
||||
&& ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))
|
||||
&& CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) {
|
||||
d.put("persenJasa", persenAsistenIBS + "%");
|
||||
@ -2186,7 +2223,9 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
|
||||
if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
|
||||
d.put("hargaJasa", persenAsistenIBS / 100
|
||||
* (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)));
|
||||
} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen")) && DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))
|
||||
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|
||||
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
|
||||
&& DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))
|
||||
&& CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) {
|
||||
d.put("persenJasa", persenAnestesi + "%");
|
||||
d.put("keterangan", "Dari " + (100.0 - Double.parseDouble(d.get("persenSayatan").toString()))
|
||||
@ -2194,17 +2233,20 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
|
||||
if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
|
||||
d.put("hargaJasa", persenAnestesi / 100
|
||||
* (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)));
|
||||
} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|
||||
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|
||||
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
|
||||
&& DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) {
|
||||
d.put("persenJasa", persenOperator + "%");
|
||||
if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
|
||||
d.put("hargaJasa", persenOperator / 100 * hargaJual);
|
||||
} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|
||||
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|
||||
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
|
||||
&& ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) {
|
||||
d.put("persenJasa", persenAsistenIBS + "%");
|
||||
if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
|
||||
d.put("hargaJasa", persenAsistenIBS / 100 * hargaJual);
|
||||
} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|
||||
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|
||||
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
|
||||
&& DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) {
|
||||
d.put("persenJasa", persenAnestesi + "%");
|
||||
if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
|
||||
@ -2490,7 +2532,9 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
|
||||
d.put("persenJasa", persenJasaDokterUmumHD + "%");
|
||||
if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
|
||||
d.put("hargaJasa", persenJasaDokterUmumHD / 100 * hargaJual);
|
||||
} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen")) && DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))
|
||||
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|
||||
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
|
||||
&& DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))
|
||||
&& CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) {
|
||||
d.put("persenJasa", persenOperatorIBS + "%");
|
||||
d.put("keterangan", "Dari " + (100.0 - Double.parseDouble(d.get("persenSayatan").toString()))
|
||||
@ -2498,7 +2542,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
|
||||
if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
|
||||
d.put("hargaJasa", persenOperatorIBS / 100
|
||||
* (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)));
|
||||
} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|
||||
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|
||||
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
|
||||
&& ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))
|
||||
&& CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) {
|
||||
d.put("persenJasa", persenAsistenIBS + "%");
|
||||
@ -2507,7 +2552,9 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
|
||||
if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
|
||||
d.put("hargaJasa", persenAsistenIBS / 100
|
||||
* (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)));
|
||||
} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen")) && DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))
|
||||
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|
||||
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
|
||||
&& DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))
|
||||
&& CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) {
|
||||
d.put("persenJasa", persenAnestesi + "%");
|
||||
d.put("keterangan", "Dari " + (100.0 - Double.parseDouble(d.get("persenSayatan").toString()))
|
||||
@ -2515,17 +2562,20 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
|
||||
if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
|
||||
d.put("hargaJasa", persenAnestesi / 100
|
||||
* (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)));
|
||||
} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|
||||
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|
||||
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
|
||||
&& DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) {
|
||||
d.put("persenJasa", persenOperatorIBS + "%");
|
||||
if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
|
||||
d.put("hargaJasa", persenOperatorIBS / 100 * hargaJual);
|
||||
} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|
||||
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|
||||
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
|
||||
&& ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) {
|
||||
d.put("persenJasa", persenAsistenIBS + "%");
|
||||
if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
|
||||
d.put("hargaJasa", persenAsistenIBS / 100 * hargaJual);
|
||||
} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|
||||
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|
||||
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
|
||||
&& DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) {
|
||||
d.put("persenJasa", persenAnestesi + "%");
|
||||
if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
|
||||
|
||||
@ -3221,7 +3221,6 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
|
||||
result.put("pembulatan", "-");
|
||||
result.put("remunerasiKinerja", "-");
|
||||
result.put("feeForService", "-");
|
||||
result.put("remunerasiOperasional", "-");
|
||||
result.put("kelebihanJamKerja", "-");
|
||||
result.put("remunerasiManajerial", "-");
|
||||
result.put("remunerasiTambahanDiklitjar", "-");
|
||||
@ -3238,7 +3237,6 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
|
||||
result.put("simpananWajibKoperasiGaji", "-");
|
||||
result.put("pinjamanKoperasiGaji", "-");
|
||||
result.put("potonganPphRemunerasi", "-");
|
||||
result.put("potonganPphRemunerasiOperasional", "-");
|
||||
result.put("potonganObat", "-");
|
||||
result.put("potonganRawatInap", "-");
|
||||
result.put("potonganRawatJalan", "-");
|
||||
@ -3301,8 +3299,6 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
|
||||
result.put("remunerasiKinerja", 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.REMUNERASI_OPERASIONAL.equals(k.getIdKomponen())) {
|
||||
result.put("remunerasiOperasional", nf.format(k.getNominal()));
|
||||
} else if (Master.KomponenGaji.KELEBIHAN_JAM_KERJA.equals(k.getIdKomponen())) {
|
||||
result.put("kelebihanJamKerja", nf.format(k.getNominal()));
|
||||
} else if (Master.KomponenGaji.REMUNERASI_MANAJERIAL.equals(k.getIdKomponen())) {
|
||||
@ -3335,8 +3331,6 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
|
||||
result.put("pinjamanKoperasiGaji", nf.format(k.getNominal()));
|
||||
} else if (Master.KomponenGaji.POTONGAN_PPH_REMUNERASI.equals(k.getIdKomponen())) {
|
||||
result.put("potonganPphRemunerasi", nf.format(k.getNominal()));
|
||||
} else if (Master.KomponenGaji.POTONGAN_PPH_REMUNERASI_OPERASIONAL.equals(k.getIdKomponen())) {
|
||||
result.put("potonganPphRemunerasiOperasional", nf.format(k.getNominal()));
|
||||
} else if (Master.KomponenGaji.POTONGAN_OBAT.equals(k.getIdKomponen())) {
|
||||
result.put("potonganObat", nf.format(k.getNominal()));
|
||||
} else if (Master.KomponenGaji.POTONGAN_RAWAT_INAP.equals(k.getIdKomponen())) {
|
||||
@ -3476,8 +3470,6 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
|
||||
penerimaanDtoBuilder.remunerasiKinerja(nf.format(k.getNominal()));
|
||||
} else if (Master.KomponenGaji.FEE_FOR_SERVICE.equals(k.getIdKomponen())) {
|
||||
penerimaanDtoBuilder.feeForService(nf.format(k.getNominal()));
|
||||
} else if (Master.KomponenGaji.REMUNERASI_OPERASIONAL.equals(k.getIdKomponen())) {
|
||||
penerimaanDtoBuilder.remunerasiOperasional(nf.format(k.getNominal()));
|
||||
} else if (Master.KomponenGaji.KELEBIHAN_JAM_KERJA.equals(k.getIdKomponen())) {
|
||||
penerimaanDtoBuilder.kelebihanJamKerja(nf.format(k.getNominal()));
|
||||
} else if (Master.KomponenGaji.REMUNERASI_MANAJERIAL.equals(k.getIdKomponen())) {
|
||||
@ -3510,8 +3502,6 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
|
||||
potonganDtoBuilder.pinjamanKoperasiGaji(nf.format(k.getNominal()));
|
||||
} else if (Master.KomponenGaji.POTONGAN_PPH_REMUNERASI.equals(k.getIdKomponen())) {
|
||||
potonganDtoBuilder.potonganPphRemunerasi(nf.format(k.getNominal()));
|
||||
} else if (Master.KomponenGaji.POTONGAN_PPH_REMUNERASI_OPERASIONAL.equals(k.getIdKomponen())) {
|
||||
potonganDtoBuilder.potonganPphRemunerasiOperasional(nf.format(k.getNominal()));
|
||||
} else if (Master.KomponenGaji.POTONGAN_OBAT.equals(k.getIdKomponen())) {
|
||||
potonganDtoBuilder.potonganObat(nf.format(k.getNominal()));
|
||||
} else if (Master.KomponenGaji.POTONGAN_RAWAT_INAP.equals(k.getIdKomponen())) {
|
||||
@ -3555,10 +3545,10 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
|
||||
jumlahPenerimaanBersih = jumlahGajiBersih.add(jumlahRemunerasiBersih).add(jumlahUangMakanBersih);
|
||||
jumlahDtoBuilder.jumlahPenerimaanBersih(nf.format(jumlahPenerimaanBersih));
|
||||
}
|
||||
resultBuilder.pegawaiDto(pegawaiDtoBuilder.build());
|
||||
resultBuilder.penerimaanDto(penerimaanDtoBuilder.build());
|
||||
resultBuilder.potonganDto(potonganDtoBuilder.build());
|
||||
resultBuilder.jumlahDto(jumlahDtoBuilder.build());
|
||||
resultBuilder.pegawai(pegawaiDtoBuilder.build());
|
||||
resultBuilder.penerimaan(penerimaanDtoBuilder.build());
|
||||
resultBuilder.potongan(potonganDtoBuilder.build());
|
||||
resultBuilder.jumlah(jumlahDtoBuilder.build());
|
||||
}
|
||||
SlipHeaderDto result = resultBuilder.build();
|
||||
if (CommonUtil.isNullOrEmpty(result.getPegawai())) {
|
||||
|
||||
@ -96,8 +96,7 @@ public class AppInterceptor implements HandlerInterceptor {
|
||||
return potongan.toString();
|
||||
}
|
||||
|
||||
private boolean checkAuthSecure(HttpServletRequest request, HttpServletResponse response, String AlamatUrlForm,
|
||||
boolean supervisi) throws Exception {
|
||||
private boolean checkAuthSecure(HttpServletRequest request, HttpServletResponse response) throws Exception {
|
||||
Authentication authentication = tokenAuthenticationService.getAuthentication(request);
|
||||
namaUser = authentication.getName();
|
||||
loginUser = loginUserDao.findByNamaUser(namaUser);
|
||||
@ -176,7 +175,7 @@ public class AppInterceptor implements HandlerInterceptor {
|
||||
.findByAlamatUrlForm(filterUrlForm(AlamatUrlForm));
|
||||
if (CommonUtil.isNullOrEmpty(objekModulAplikasi))
|
||||
return true;
|
||||
if (!checkAuthSecure(request, response, AlamatUrlForm, false))
|
||||
if (!checkAuthSecure(request, response))
|
||||
return false;
|
||||
int resultUser = checkUserPermision(loginUser.get(0), objekModulAplikasi.get(0), action);
|
||||
if (resultUser == 0) {
|
||||
@ -228,7 +227,7 @@ public class AppInterceptor implements HandlerInterceptor {
|
||||
hm = (HandlerMethod) handler;
|
||||
method = hm.getMethod();
|
||||
} else {
|
||||
return checkAuthSecure(request, response, AlamatUrlForm, true);
|
||||
return checkAuthSecure(request, response);
|
||||
}
|
||||
boolean usingAnno = method != null && method.isAnnotationPresent(AppPermission.class);
|
||||
boolean postM = "POST".equals(methodHttp);
|
||||
@ -292,7 +291,12 @@ public class AppInterceptor implements HandlerInterceptor {
|
||||
: request.getHeader(Constants.HttpHeader.TGL_KIRIM);
|
||||
boolean notHttpOK = response.getStatus() >= HttpServletResponse.SC_BAD_REQUEST;
|
||||
boolean notLewatMenu = CommonUtil.isNullOrEmpty(AlamatUrlForm) || CommonUtil.isNullOrEmpty(KdRuangan);
|
||||
Integer ruanganAsalId = Integer.parseInt(KdRuangan);
|
||||
Integer ruanganAsalId;
|
||||
try {
|
||||
ruanganAsalId = Integer.parseInt(KdRuangan);
|
||||
} catch (NumberFormatException e) {
|
||||
ruanganAsalId = 0;
|
||||
}
|
||||
boolean adaError = CommonUtil.isNotNullOrEmpty(ex);
|
||||
if (notHttpOK || notLewatMenu || adaError)
|
||||
return;
|
||||
|
||||
@ -4,11 +4,17 @@
|
||||
package com.jasamedika.medifirst2000.dto;
|
||||
|
||||
import com.jasamedika.medifirst2000.helper.Caption;
|
||||
import lombok.*;
|
||||
|
||||
/**
|
||||
* @author Salman
|
||||
* @since May 16th, 2023
|
||||
*/
|
||||
@Getter
|
||||
@Setter
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@Builder
|
||||
public class SlipHeaderDto {
|
||||
@Caption(value = "Pegawai")
|
||||
private SlipPegawaiDto pegawai;
|
||||
@ -24,101 +30,4 @@ public class SlipHeaderDto {
|
||||
|
||||
@Caption(value = "Print")
|
||||
private String print;
|
||||
|
||||
public SlipHeaderDto() {
|
||||
}
|
||||
|
||||
public SlipHeaderDto(SlipPegawaiDto pegawai, SlipPenerimaanDto penerimaan, SlipPotonganDto potongan,
|
||||
SlipJumlahDto jumlah, String print) {
|
||||
super();
|
||||
this.pegawai = pegawai;
|
||||
this.penerimaan = penerimaan;
|
||||
this.potongan = potongan;
|
||||
this.jumlah = jumlah;
|
||||
this.print = print;
|
||||
}
|
||||
|
||||
public SlipPegawaiDto getPegawai() {
|
||||
return pegawai;
|
||||
}
|
||||
|
||||
public void setPegawai(SlipPegawaiDto pegawai) {
|
||||
this.pegawai = pegawai;
|
||||
}
|
||||
|
||||
public SlipPenerimaanDto getPenerimaan() {
|
||||
return penerimaan;
|
||||
}
|
||||
|
||||
public void setPenerimaan(SlipPenerimaanDto penerimaan) {
|
||||
this.penerimaan = penerimaan;
|
||||
}
|
||||
|
||||
public SlipPotonganDto getPotongan() {
|
||||
return potongan;
|
||||
}
|
||||
|
||||
public void setPotongan(SlipPotonganDto potongan) {
|
||||
this.potongan = potongan;
|
||||
}
|
||||
|
||||
public SlipJumlahDto getJumlah() {
|
||||
return jumlah;
|
||||
}
|
||||
|
||||
public void setJumlah(SlipJumlahDto jumlah) {
|
||||
this.jumlah = jumlah;
|
||||
}
|
||||
|
||||
public String getPrint() {
|
||||
return print;
|
||||
}
|
||||
|
||||
public void setPrint(String print) {
|
||||
this.print = print;
|
||||
}
|
||||
|
||||
public static SlipHeaderDtoBuilder builder() {
|
||||
return new SlipHeaderDtoBuilder();
|
||||
}
|
||||
|
||||
public static class SlipHeaderDtoBuilder {
|
||||
private SlipPegawaiDto pegawai;
|
||||
private SlipPenerimaanDto penerimaan;
|
||||
private SlipPotonganDto potongan;
|
||||
private SlipJumlahDto jumlah;
|
||||
private String print;
|
||||
|
||||
public SlipHeaderDtoBuilder() {
|
||||
}
|
||||
|
||||
public SlipHeaderDtoBuilder pegawaiDto(final SlipPegawaiDto pegawai) {
|
||||
this.pegawai = pegawai;
|
||||
return this;
|
||||
}
|
||||
|
||||
public SlipHeaderDtoBuilder penerimaanDto(final SlipPenerimaanDto penerimaan) {
|
||||
this.penerimaan = penerimaan;
|
||||
return this;
|
||||
}
|
||||
|
||||
public SlipHeaderDtoBuilder potonganDto(final SlipPotonganDto potongan) {
|
||||
this.potongan = potongan;
|
||||
return this;
|
||||
}
|
||||
|
||||
public SlipHeaderDtoBuilder jumlahDto(final SlipJumlahDto jumlah) {
|
||||
this.jumlah = jumlah;
|
||||
return this;
|
||||
}
|
||||
|
||||
public SlipHeaderDtoBuilder print(final String print) {
|
||||
this.print = print;
|
||||
return this;
|
||||
}
|
||||
|
||||
public SlipHeaderDto build() {
|
||||
return new SlipHeaderDto(this.pegawai, this.penerimaan, this.potongan, this.jumlah, this.print);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -61,10 +61,6 @@ public class SlipPenerimaanDto {
|
||||
@Builder.Default
|
||||
private String feeForService = "-";
|
||||
|
||||
@Caption(value = "Remunerasi Operasional")
|
||||
@Builder.Default
|
||||
private String remunerasiOperasional = "-";
|
||||
|
||||
@Caption(value = "Kelebihan Jam Kerja")
|
||||
@Builder.Default
|
||||
private String kelebihanJamKerja = "-";
|
||||
|
||||
@ -57,10 +57,6 @@ public class SlipPotonganDto {
|
||||
@Builder.Default
|
||||
private String potonganPphRemunerasi = "-";
|
||||
|
||||
@Caption(value = "Potongan PPH Remunerasi Operasional")
|
||||
@Builder.Default
|
||||
private String potonganPphRemunerasiOperasional = "-";
|
||||
|
||||
@Caption(value = "Potongan Obat")
|
||||
@Builder.Default
|
||||
private String potonganObat = "-";
|
||||
|
||||
@ -6,12 +6,12 @@ import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import org.hibernate.validator.constraints.NotBlank;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Id;
|
||||
import javax.persistence.Table;
|
||||
import javax.persistence.*;
|
||||
import javax.validation.constraints.Size;
|
||||
import java.io.Serializable;
|
||||
|
||||
import static javax.persistence.GenerationType.SEQUENCE;
|
||||
|
||||
/**
|
||||
* @author Salman
|
||||
* @version 1.0.0
|
||||
@ -25,10 +25,13 @@ public class JenisLog extends BaseActive implements Serializable {
|
||||
private static final long serialVersionUID = -5796583173860610757L;
|
||||
|
||||
@Id
|
||||
@Column(name = "id", columnDefinition = "bigserial")
|
||||
@GeneratedValue(strategy = SEQUENCE, generator = "sg_jenis_log_m")
|
||||
@SequenceGenerator(name = "sg_jenis_log_m", sequenceName = "jenis_log_m_seq", allocationSize = 1)
|
||||
@Column(name = "id")
|
||||
protected Long id;
|
||||
|
||||
@Column(nullable = false)
|
||||
@Column(length = 150, unique = true, nullable = false)
|
||||
@Size(max = 150)
|
||||
@NotBlank
|
||||
@Caption("Jenis Log")
|
||||
private String jenisLog;
|
||||
|
||||
@ -52,4 +52,9 @@ public class UserLogging extends BaseMaster {
|
||||
@Column(name = "keterangan", length = 200)
|
||||
@Caption(value = "Keterangan")
|
||||
private String keterangan;
|
||||
|
||||
@ManyToOne(fetch = LAZY)
|
||||
@JoinColumn(name = "jenislogfk")
|
||||
@Caption(value = "Jenis Log FK")
|
||||
private JenisLog jenisLogFk;
|
||||
}
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
package com.jasamedika.medifirst2000.vo;
|
||||
|
||||
import com.jasamedika.medifirst2000.base.vo.BaseActiveVO;
|
||||
import com.jasamedika.medifirst2000.helper.Caption;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
@ -12,7 +13,7 @@ import org.hibernate.validator.constraints.NotBlank;
|
||||
*/
|
||||
@Getter
|
||||
@Setter
|
||||
public class JenisLogVO {
|
||||
public class JenisLogVO extends BaseActiveVO {
|
||||
protected Long id;
|
||||
|
||||
@NotBlank
|
||||
|
||||
@ -96,8 +96,7 @@ public class AppInterceptor implements HandlerInterceptor {
|
||||
return potongan.toString();
|
||||
}
|
||||
|
||||
private boolean checkAuthSecure(HttpServletRequest request, HttpServletResponse response, String AlamatUrlForm,
|
||||
boolean supervisi) throws Exception {
|
||||
private boolean checkAuthSecure(HttpServletRequest request, HttpServletResponse response) throws Exception {
|
||||
Authentication authentication = tokenAuthenticationService.getAuthentication(request);
|
||||
namaUser = authentication.getName();
|
||||
loginUser = loginUserDao.findByNamaUser(namaUser);
|
||||
@ -176,7 +175,7 @@ public class AppInterceptor implements HandlerInterceptor {
|
||||
.findByAlamatUrlForm(filterUrlForm(AlamatUrlForm));
|
||||
if (CommonUtil.isNullOrEmpty(objekModulAplikasi))
|
||||
return true;
|
||||
if (!checkAuthSecure(request, response, AlamatUrlForm, false))
|
||||
if (!checkAuthSecure(request, response))
|
||||
return false;
|
||||
int resultUser = checkUserPermision(loginUser.get(0), objekModulAplikasi.get(0), action);
|
||||
if (resultUser == 0) {
|
||||
@ -228,7 +227,7 @@ public class AppInterceptor implements HandlerInterceptor {
|
||||
hm = (HandlerMethod) handler;
|
||||
method = hm.getMethod();
|
||||
} else {
|
||||
return checkAuthSecure(request, response, AlamatUrlForm, true);
|
||||
return checkAuthSecure(request, response);
|
||||
}
|
||||
boolean usingAnno = method != null && method.isAnnotationPresent(AppPermission.class);
|
||||
boolean postM = "POST".equals(methodHttp);
|
||||
@ -293,7 +292,12 @@ public class AppInterceptor implements HandlerInterceptor {
|
||||
: request.getHeader(Constants.HttpHeader.TGL_KIRIM);
|
||||
boolean notHttpOK = response.getStatus() >= HttpServletResponse.SC_BAD_REQUEST;
|
||||
boolean notLewatMenu = CommonUtil.isNullOrEmpty(AlamatUrlForm) || CommonUtil.isNullOrEmpty(KdRuangan);
|
||||
Integer ruanganAsalId = Integer.parseInt(KdRuangan);
|
||||
Integer ruanganAsalId;
|
||||
try {
|
||||
ruanganAsalId = Integer.parseInt(KdRuangan);
|
||||
} catch (NumberFormatException e) {
|
||||
ruanganAsalId = 0;
|
||||
}
|
||||
boolean adaError = CommonUtil.isNotNullOrEmpty(ex);
|
||||
if (notHttpOK || notLewatMenu || adaError)
|
||||
return;
|
||||
|
||||
@ -96,8 +96,7 @@ public class AppInterceptor implements HandlerInterceptor {
|
||||
return potongan.toString();
|
||||
}
|
||||
|
||||
private boolean checkAuthSecure(HttpServletRequest request, HttpServletResponse response, String AlamatUrlForm,
|
||||
boolean supervisi) throws Exception {
|
||||
private boolean checkAuthSecure(HttpServletRequest request, HttpServletResponse response) throws Exception {
|
||||
Authentication authentication = tokenAuthenticationService.getAuthentication(request);
|
||||
namaUser = authentication.getName();
|
||||
loginUser = loginUserDao.findByNamaUser(namaUser);
|
||||
@ -176,7 +175,7 @@ public class AppInterceptor implements HandlerInterceptor {
|
||||
.findByAlamatUrlForm(filterUrlForm(AlamatUrlForm));
|
||||
if (CommonUtil.isNullOrEmpty(objekModulAplikasi))
|
||||
return true;
|
||||
if (!checkAuthSecure(request, response, AlamatUrlForm, false))
|
||||
if (!checkAuthSecure(request, response))
|
||||
return false;
|
||||
int resultUser = checkUserPermision(loginUser.get(0), objekModulAplikasi.get(0), action);
|
||||
if (resultUser == 0) {
|
||||
@ -228,7 +227,7 @@ public class AppInterceptor implements HandlerInterceptor {
|
||||
hm = (HandlerMethod) handler;
|
||||
method = hm.getMethod();
|
||||
} else {
|
||||
return checkAuthSecure(request, response, AlamatUrlForm, true);
|
||||
return checkAuthSecure(request, response);
|
||||
}
|
||||
boolean usingAnno = method != null && method.isAnnotationPresent(AppPermission.class);
|
||||
boolean postM = "POST".equals(methodHttp);
|
||||
@ -292,7 +291,12 @@ public class AppInterceptor implements HandlerInterceptor {
|
||||
: request.getHeader(Constants.HttpHeader.TGL_KIRIM);
|
||||
boolean notHttpOK = response.getStatus() >= HttpServletResponse.SC_BAD_REQUEST;
|
||||
boolean notLewatMenu = CommonUtil.isNullOrEmpty(AlamatUrlForm) || CommonUtil.isNullOrEmpty(KdRuangan);
|
||||
Integer ruanganAsalId = Integer.parseInt(KdRuangan);
|
||||
Integer ruanganAsalId;
|
||||
try {
|
||||
ruanganAsalId = Integer.parseInt(KdRuangan);
|
||||
} catch (NumberFormatException e) {
|
||||
ruanganAsalId = 0;
|
||||
}
|
||||
boolean adaError = CommonUtil.isNotNullOrEmpty(ex);
|
||||
if (notHttpOK || notLewatMenu || adaError)
|
||||
return;
|
||||
|
||||
@ -96,8 +96,7 @@ public class AppInterceptor implements HandlerInterceptor {
|
||||
return potongan.toString();
|
||||
}
|
||||
|
||||
private boolean checkAuthSecure(HttpServletRequest request, HttpServletResponse response, String AlamatUrlForm,
|
||||
boolean supervisi) throws Exception {
|
||||
private boolean checkAuthSecure(HttpServletRequest request, HttpServletResponse response) throws Exception {
|
||||
Authentication authentication = tokenAuthenticationService.getAuthentication(request);
|
||||
namaUser = authentication.getName();
|
||||
loginUser = loginUserDao.findByNamaUser(namaUser);
|
||||
@ -176,7 +175,7 @@ public class AppInterceptor implements HandlerInterceptor {
|
||||
.findByAlamatUrlForm(filterUrlForm(AlamatUrlForm));
|
||||
if (CommonUtil.isNullOrEmpty(objekModulAplikasi))
|
||||
return true;
|
||||
if (!checkAuthSecure(request, response, AlamatUrlForm, false))
|
||||
if (!checkAuthSecure(request, response))
|
||||
return false;
|
||||
int resultUser = checkUserPermision(loginUser.get(0), objekModulAplikasi.get(0), action);
|
||||
if (resultUser == 0) {
|
||||
@ -228,7 +227,7 @@ public class AppInterceptor implements HandlerInterceptor {
|
||||
hm = (HandlerMethod) handler;
|
||||
method = hm.getMethod();
|
||||
} else {
|
||||
return checkAuthSecure(request, response, AlamatUrlForm, true);
|
||||
return checkAuthSecure(request, response);
|
||||
}
|
||||
boolean usingAnno = method != null && method.isAnnotationPresent(AppPermission.class);
|
||||
boolean postM = "POST".equals(methodHttp);
|
||||
@ -292,7 +291,12 @@ public class AppInterceptor implements HandlerInterceptor {
|
||||
: request.getHeader(Constants.HttpHeader.TGL_KIRIM);
|
||||
boolean notHttpOK = response.getStatus() >= HttpServletResponse.SC_BAD_REQUEST;
|
||||
boolean notLewatMenu = CommonUtil.isNullOrEmpty(AlamatUrlForm) || CommonUtil.isNullOrEmpty(KdRuangan);
|
||||
Integer ruanganAsalId = Integer.parseInt(KdRuangan);
|
||||
Integer ruanganAsalId;
|
||||
try {
|
||||
ruanganAsalId = Integer.parseInt(KdRuangan);
|
||||
} catch (NumberFormatException e) {
|
||||
ruanganAsalId = 0;
|
||||
}
|
||||
boolean adaError = CommonUtil.isNotNullOrEmpty(ex);
|
||||
if (notHttpOK || notLewatMenu || adaError)
|
||||
return;
|
||||
|
||||
@ -97,8 +97,7 @@ public class AppInterceptor implements HandlerInterceptor {
|
||||
return potongan.toString();
|
||||
}
|
||||
|
||||
private boolean checkAuthSecure(HttpServletRequest request, HttpServletResponse response, String AlamatUrlForm,
|
||||
boolean supervisi) throws Exception {
|
||||
private boolean checkAuthSecure(HttpServletRequest request, HttpServletResponse response) throws Exception {
|
||||
Authentication authentication = tokenAuthenticationService.getAuthentication(request);
|
||||
namaUser = authentication.getName();
|
||||
loginUser = loginUserDao.findByNamaUser(namaUser);
|
||||
@ -177,7 +176,7 @@ public class AppInterceptor implements HandlerInterceptor {
|
||||
.findByAlamatUrlForm(filterUrlForm(AlamatUrlForm));
|
||||
if (CommonUtil.isNullOrEmpty(objekModulAplikasi))
|
||||
return true;
|
||||
if (!checkAuthSecure(request, response, AlamatUrlForm, false))
|
||||
if (!checkAuthSecure(request, response))
|
||||
return false;
|
||||
int resultUser = checkUserPermision(loginUser.get(0), objekModulAplikasi.get(0), action);
|
||||
if (resultUser == 0) {
|
||||
@ -229,7 +228,7 @@ public class AppInterceptor implements HandlerInterceptor {
|
||||
hm = (HandlerMethod) handler;
|
||||
method = hm.getMethod();
|
||||
} else {
|
||||
return checkAuthSecure(request, response, AlamatUrlForm, true);
|
||||
return checkAuthSecure(request, response);
|
||||
}
|
||||
boolean usingAnno = method != null && method.isAnnotationPresent(AppPermission.class);
|
||||
boolean postM = "POST".equals(methodHttp);
|
||||
@ -293,7 +292,12 @@ public class AppInterceptor implements HandlerInterceptor {
|
||||
: request.getHeader(Constants.HttpHeader.TGL_KIRIM);
|
||||
boolean notHttpOK = response.getStatus() >= HttpServletResponse.SC_BAD_REQUEST;
|
||||
boolean notLewatMenu = CommonUtil.isNullOrEmpty(AlamatUrlForm) || CommonUtil.isNullOrEmpty(KdRuangan);
|
||||
Integer ruanganAsalId = Integer.parseInt(KdRuangan);
|
||||
Integer ruanganAsalId;
|
||||
try {
|
||||
ruanganAsalId = Integer.parseInt(KdRuangan);
|
||||
} catch (NumberFormatException e) {
|
||||
ruanganAsalId = 0;
|
||||
}
|
||||
boolean adaError = CommonUtil.isNotNullOrEmpty(ex);
|
||||
if (notHttpOK || notLewatMenu || adaError)
|
||||
return;
|
||||
|
||||
@ -96,8 +96,7 @@ public class AppInterceptor implements HandlerInterceptor {
|
||||
return potongan.toString();
|
||||
}
|
||||
|
||||
private boolean checkAuthSecure(HttpServletRequest request, HttpServletResponse response, String AlamatUrlForm,
|
||||
boolean supervisi) throws Exception {
|
||||
private boolean checkAuthSecure(HttpServletRequest request, HttpServletResponse response) throws Exception {
|
||||
Authentication authentication = tokenAuthenticationService.getAuthentication(request);
|
||||
namaUser = authentication.getName();
|
||||
loginUser = loginUserDao.findByNamaUser(namaUser);
|
||||
@ -176,7 +175,7 @@ public class AppInterceptor implements HandlerInterceptor {
|
||||
.findByAlamatUrlForm(filterUrlForm(AlamatUrlForm));
|
||||
if (CommonUtil.isNullOrEmpty(objekModulAplikasi))
|
||||
return true;
|
||||
if (!checkAuthSecure(request, response, AlamatUrlForm, false))
|
||||
if (!checkAuthSecure(request, response))
|
||||
return false;
|
||||
int resultUser = checkUserPermision(loginUser.get(0), objekModulAplikasi.get(0), action);
|
||||
if (resultUser == 0) {
|
||||
@ -228,7 +227,7 @@ public class AppInterceptor implements HandlerInterceptor {
|
||||
hm = (HandlerMethod) handler;
|
||||
method = hm.getMethod();
|
||||
} else {
|
||||
return checkAuthSecure(request, response, AlamatUrlForm, true);
|
||||
return checkAuthSecure(request, response);
|
||||
}
|
||||
boolean usingAnno = method != null && method.isAnnotationPresent(AppPermission.class);
|
||||
boolean postM = "POST".equals(methodHttp);
|
||||
@ -292,7 +291,12 @@ public class AppInterceptor implements HandlerInterceptor {
|
||||
: request.getHeader(Constants.HttpHeader.TGL_KIRIM);
|
||||
boolean notHttpOK = response.getStatus() >= HttpServletResponse.SC_BAD_REQUEST;
|
||||
boolean notLewatMenu = CommonUtil.isNullOrEmpty(AlamatUrlForm) || CommonUtil.isNullOrEmpty(KdRuangan);
|
||||
Integer ruanganAsalId = Integer.parseInt(KdRuangan);
|
||||
Integer ruanganAsalId;
|
||||
try {
|
||||
ruanganAsalId = Integer.parseInt(KdRuangan);
|
||||
} catch (NumberFormatException e) {
|
||||
ruanganAsalId = 0;
|
||||
}
|
||||
boolean adaError = CommonUtil.isNotNullOrEmpty(ex);
|
||||
if (notHttpOK || notLewatMenu || adaError)
|
||||
return;
|
||||
|
||||
@ -96,8 +96,7 @@ public class AppInterceptor implements HandlerInterceptor {
|
||||
return potongan.toString();
|
||||
}
|
||||
|
||||
private boolean checkAuthSecure(HttpServletRequest request, HttpServletResponse response, String AlamatUrlForm,
|
||||
boolean supervisi) throws Exception {
|
||||
private boolean checkAuthSecure(HttpServletRequest request, HttpServletResponse response) throws Exception {
|
||||
Authentication authentication = tokenAuthenticationService.getAuthentication(request);
|
||||
namaUser = authentication.getName();
|
||||
loginUser = loginUserDao.findByNamaUser(namaUser);
|
||||
@ -176,7 +175,7 @@ public class AppInterceptor implements HandlerInterceptor {
|
||||
.findByAlamatUrlForm(filterUrlForm(AlamatUrlForm));
|
||||
if (CommonUtil.isNullOrEmpty(objekModulAplikasi))
|
||||
return true;
|
||||
if (!checkAuthSecure(request, response, AlamatUrlForm, false))
|
||||
if (!checkAuthSecure(request, response))
|
||||
return false;
|
||||
int resultUser = checkUserPermision(loginUser.get(0), objekModulAplikasi.get(0), action);
|
||||
if (resultUser == 0) {
|
||||
@ -228,7 +227,7 @@ public class AppInterceptor implements HandlerInterceptor {
|
||||
hm = (HandlerMethod) handler;
|
||||
method = hm.getMethod();
|
||||
} else {
|
||||
return checkAuthSecure(request, response, AlamatUrlForm, true);
|
||||
return checkAuthSecure(request, response);
|
||||
}
|
||||
boolean usingAnno = method != null && method.isAnnotationPresent(AppPermission.class);
|
||||
boolean postM = "POST".equals(methodHttp);
|
||||
@ -292,7 +291,12 @@ public class AppInterceptor implements HandlerInterceptor {
|
||||
: request.getHeader(Constants.HttpHeader.TGL_KIRIM);
|
||||
boolean notHttpOK = response.getStatus() >= HttpServletResponse.SC_BAD_REQUEST;
|
||||
boolean notLewatMenu = CommonUtil.isNullOrEmpty(AlamatUrlForm) || CommonUtil.isNullOrEmpty(KdRuangan);
|
||||
Integer ruanganAsalId = Integer.parseInt(KdRuangan);
|
||||
Integer ruanganAsalId;
|
||||
try {
|
||||
ruanganAsalId = Integer.parseInt(KdRuangan);
|
||||
} catch (NumberFormatException e) {
|
||||
ruanganAsalId = 0;
|
||||
}
|
||||
boolean adaError = CommonUtil.isNotNullOrEmpty(ex);
|
||||
if (notHttpOK || notLewatMenu || adaError)
|
||||
return;
|
||||
|
||||
@ -18,7 +18,6 @@
|
||||
<field name="uangMakan" class="java.lang.String"/>
|
||||
<field name="potonganPph" class="java.lang.String"/>
|
||||
<field name="potonganPphRemunerasi" class="java.lang.String"/>
|
||||
<field name="potonganPphRemunerasiOperasional" class="java.lang.String"/>
|
||||
<field name="potonganUangMakan" class="java.lang.String"/>
|
||||
<field name="wakafDanLainLain" class="java.lang.String"/>
|
||||
<field name="simpananWajibKoperasiGaji" class="java.lang.String"/>
|
||||
@ -30,7 +29,6 @@
|
||||
<field name="periode" class="java.lang.String"/>
|
||||
<field name="tokoKoperasi" class="java.lang.String"/>
|
||||
<field name="potonganBpjsKesehatan" class="java.lang.String"/>
|
||||
<field name="remunerasiOperasional" class="java.lang.String"/>
|
||||
<field name="potonganBpjsKetenagakerjaan" class="java.lang.String"/>
|
||||
<field name="tunjanganIstriSuami" class="java.lang.String"/>
|
||||
<field name="tunjanganAnak" class="java.lang.String"/>
|
||||
@ -65,7 +63,7 @@
|
||||
<band splitType="Stretch"/>
|
||||
</background>
|
||||
<summary>
|
||||
<band height="580">
|
||||
<band height="568">
|
||||
<image>
|
||||
<reportElement x="0" y="0" width="505" height="38" isPrintWhenDetailOverflows="true" uuid="c4fbc1c2-32a1-42ec-a770-88149a0d9be1">
|
||||
<property name="com.jaspersoft.studio.unit.width" value="px"/>
|
||||
@ -966,52 +964,7 @@
|
||||
<text><![CDATA[REMUNERASI KINERJA (JKN)]]></text>
|
||||
</staticText>
|
||||
<textField>
|
||||
<reportElement positionType="Float" x="415" y="324" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="691034d4-39f1-4112-8837-f5bae3c15dd0"/>
|
||||
<box rightPadding="5">
|
||||
<rightPen lineWidth="1.0"/>
|
||||
</box>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{potonganPphRemunerasiOperasional}]]></textFieldExpression>
|
||||
</textField>
|
||||
<staticText>
|
||||
<reportElement positionType="Float" x="250" y="324" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="faf19b46-b635-4d01-9929-8cf6ece3f3be">
|
||||
<property name="com.jaspersoft.studio.unit.width" value="px"/>
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
<box leftPadding="2"/>
|
||||
<textElement verticalAlignment="Middle">
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<text><![CDATA[POTONGAN PPH REMUN OPERASIONAL]]></text>
|
||||
</staticText>
|
||||
<textField>
|
||||
<reportElement positionType="Float" x="160" y="324" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="9c98d874-4683-40c4-b33e-dfaf00568d71"/>
|
||||
<box rightPadding="5"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{remunerasiOperasional}]]></textFieldExpression>
|
||||
</textField>
|
||||
<staticText>
|
||||
<reportElement positionType="Float" x="0" y="324" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="7e4105ea-d5a6-4791-b67a-8beb891ce566">
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
<box leftPadding="2">
|
||||
<pen lineWidth="1.0"/>
|
||||
<topPen lineWidth="0.0"/>
|
||||
<leftPen lineWidth="1.0"/>
|
||||
<bottomPen lineWidth="0.0"/>
|
||||
<rightPen lineWidth="0.0"/>
|
||||
</box>
|
||||
<textElement verticalAlignment="Middle">
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<text><![CDATA[REMUNERASI OPS. (LEBIH DARI KMK)]]></text>
|
||||
</staticText>
|
||||
<textField>
|
||||
<reportElement positionType="Float" x="415" y="336" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="9db50f41-a032-4b9d-b990-e220861ae0a7"/>
|
||||
<reportElement positionType="Float" x="415" y="324" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="9db50f41-a032-4b9d-b990-e220861ae0a7"/>
|
||||
<box rightPadding="5">
|
||||
<rightPen lineWidth="1.0"/>
|
||||
</box>
|
||||
@ -1021,7 +974,7 @@
|
||||
<textFieldExpression><![CDATA[$F{potonganObat}]]></textFieldExpression>
|
||||
</textField>
|
||||
<staticText>
|
||||
<reportElement positionType="Float" x="250" y="336" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="2e6c88ec-86a9-4068-9720-655ee0e72c17">
|
||||
<reportElement positionType="Float" x="250" y="324" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="2e6c88ec-86a9-4068-9720-655ee0e72c17">
|
||||
<property name="com.jaspersoft.studio.unit.width" value="px"/>
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
@ -1047,7 +1000,7 @@
|
||||
<text><![CDATA[FFS (NON-JKN & FIXED PAY)]]></text>
|
||||
</staticText>
|
||||
<textField>
|
||||
<reportElement positionType="Float" x="415" y="348" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="22ba09f8-d054-423b-b201-428bb2c7bcef"/>
|
||||
<reportElement positionType="Float" x="415" y="336" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="22ba09f8-d054-423b-b201-428bb2c7bcef"/>
|
||||
<box rightPadding="5">
|
||||
<rightPen lineWidth="1.0"/>
|
||||
</box>
|
||||
@ -1057,7 +1010,7 @@
|
||||
<textFieldExpression><![CDATA[$F{potonganRawatInap}]]></textFieldExpression>
|
||||
</textField>
|
||||
<staticText>
|
||||
<reportElement positionType="Float" x="250" y="348" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="f5fcd811-bd8f-479a-afd8-1c253738734d">
|
||||
<reportElement positionType="Float" x="250" y="336" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="f5fcd811-bd8f-479a-afd8-1c253738734d">
|
||||
<property name="com.jaspersoft.studio.unit.width" value="px"/>
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
@ -1068,7 +1021,7 @@
|
||||
<text><![CDATA[POTONGAN RANAP]]></text>
|
||||
</staticText>
|
||||
<staticText>
|
||||
<reportElement positionType="Float" x="0" y="336" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="927c0314-12f4-42e1-8b35-fca6dd025a01">
|
||||
<reportElement positionType="Float" x="0" y="324" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="927c0314-12f4-42e1-8b35-fca6dd025a01">
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
<box leftPadding="2">
|
||||
@ -1083,7 +1036,7 @@
|
||||
<text><![CDATA[KELEBIHAN JAM KERJA]]></text>
|
||||
</staticText>
|
||||
<textField>
|
||||
<reportElement positionType="Float" x="415" y="360" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="5a846346-03f6-4281-adf1-dc7100508ef9"/>
|
||||
<reportElement positionType="Float" x="415" y="348" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="5a846346-03f6-4281-adf1-dc7100508ef9"/>
|
||||
<box rightPadding="5">
|
||||
<rightPen lineWidth="1.0"/>
|
||||
</box>
|
||||
@ -1093,7 +1046,7 @@
|
||||
<textFieldExpression><![CDATA[$F{potonganRawatJalan}]]></textFieldExpression>
|
||||
</textField>
|
||||
<staticText>
|
||||
<reportElement positionType="Float" x="250" y="360" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="c8df630e-92b1-4fcc-9ab9-8c3b927ba9af">
|
||||
<reportElement positionType="Float" x="250" y="348" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="c8df630e-92b1-4fcc-9ab9-8c3b927ba9af">
|
||||
<property name="com.jaspersoft.studio.unit.width" value="px"/>
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
@ -1104,7 +1057,7 @@
|
||||
<text><![CDATA[POTONGAN RAJAL]]></text>
|
||||
</staticText>
|
||||
<staticText>
|
||||
<reportElement positionType="Float" x="0" y="348" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="1f11dfbc-7335-463c-bad4-7f4dfcd06989">
|
||||
<reportElement positionType="Float" x="0" y="336" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="1f11dfbc-7335-463c-bad4-7f4dfcd06989">
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
<box leftPadding="2">
|
||||
@ -1119,7 +1072,7 @@
|
||||
<text><![CDATA[REMUNERASI TAMBAHAN]]></text>
|
||||
</staticText>
|
||||
<textField>
|
||||
<reportElement positionType="Float" x="415" y="372" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="4fb8cf0b-ce13-4838-9a26-478f9b36a4ec">
|
||||
<reportElement positionType="Float" x="415" y="360" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="4fb8cf0b-ce13-4838-9a26-478f9b36a4ec">
|
||||
<property name="com.jaspersoft.studio.unit.width" value="px"/>
|
||||
</reportElement>
|
||||
<box rightPadding="5">
|
||||
@ -1131,7 +1084,7 @@
|
||||
<textFieldExpression><![CDATA[$F{simpananWajibKoperasiRemunerasi}]]></textFieldExpression>
|
||||
</textField>
|
||||
<staticText>
|
||||
<reportElement positionType="Float" x="250" y="372" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="f40bbdd5-ab0b-463d-987d-9255331d3c04">
|
||||
<reportElement positionType="Float" x="250" y="360" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="f40bbdd5-ab0b-463d-987d-9255331d3c04">
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
<box topPadding="0" leftPadding="2" bottomPadding="0" rightPadding="0"/>
|
||||
@ -1141,7 +1094,7 @@
|
||||
<text><![CDATA[SIMPANAN WAJIB KOPERASI]]></text>
|
||||
</staticText>
|
||||
<staticText>
|
||||
<reportElement positionType="Float" x="10" y="360" width="150" height="12" isPrintWhenDetailOverflows="true" uuid="50dd487a-5c57-470f-ab78-87ef2d6361a6">
|
||||
<reportElement positionType="Float" x="10" y="348" width="150" height="12" isPrintWhenDetailOverflows="true" uuid="50dd487a-5c57-470f-ab78-87ef2d6361a6">
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
<box leftPadding="2">
|
||||
@ -1157,7 +1110,7 @@
|
||||
<text><![CDATA[REMUNERASI MANAJERIAL]]></text>
|
||||
</staticText>
|
||||
<textField>
|
||||
<reportElement positionType="Float" x="415" y="384" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="75a50fdd-acd2-4356-aaf2-a509cef3a2a3">
|
||||
<reportElement positionType="Float" x="415" y="372" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="75a50fdd-acd2-4356-aaf2-a509cef3a2a3">
|
||||
<property name="com.jaspersoft.studio.unit.width" value="px"/>
|
||||
</reportElement>
|
||||
<box rightPadding="5">
|
||||
@ -1169,7 +1122,7 @@
|
||||
<textFieldExpression><![CDATA[$F{pinjamanKoperasiRemunerasi}]]></textFieldExpression>
|
||||
</textField>
|
||||
<staticText>
|
||||
<reportElement positionType="Float" x="250" y="384" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="2a1d1f76-7a3b-48eb-96d4-bfabd6c46800">
|
||||
<reportElement positionType="Float" x="250" y="372" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="2a1d1f76-7a3b-48eb-96d4-bfabd6c46800">
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
<box topPadding="0" leftPadding="2" bottomPadding="0" rightPadding="0"/>
|
||||
@ -1179,7 +1132,7 @@
|
||||
<text><![CDATA[PINJAMAN KOPERASI]]></text>
|
||||
</staticText>
|
||||
<staticText>
|
||||
<reportElement positionType="Float" x="10" y="372" width="150" height="12" isPrintWhenDetailOverflows="true" uuid="a2580670-5302-4ba2-85db-0caa029f0ce5">
|
||||
<reportElement positionType="Float" x="10" y="360" width="150" height="12" isPrintWhenDetailOverflows="true" uuid="a2580670-5302-4ba2-85db-0caa029f0ce5">
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
<box leftPadding="2">
|
||||
@ -1195,7 +1148,7 @@
|
||||
<text><![CDATA[REMUNERASI DIKLITJAR]]></text>
|
||||
</staticText>
|
||||
<textField>
|
||||
<reportElement positionType="Float" x="415" y="396" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="7888f031-3a55-45d0-984d-f5f3d52e4755"/>
|
||||
<reportElement positionType="Float" x="415" y="384" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="7888f031-3a55-45d0-984d-f5f3d52e4755"/>
|
||||
<box rightPadding="5">
|
||||
<rightPen lineWidth="1.0"/>
|
||||
</box>
|
||||
@ -1205,7 +1158,7 @@
|
||||
<textFieldExpression><![CDATA[$F{tokoKoperasi}]]></textFieldExpression>
|
||||
</textField>
|
||||
<staticText>
|
||||
<reportElement positionType="Float" x="250" y="396" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="399aa6f2-dbcd-4bf4-a490-db90468db0ad"/>
|
||||
<reportElement positionType="Float" x="250" y="384" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="399aa6f2-dbcd-4bf4-a490-db90468db0ad"/>
|
||||
<box leftPadding="2"/>
|
||||
<textElement textAlignment="Left" verticalAlignment="Middle">
|
||||
<font size="8"/>
|
||||
@ -1213,7 +1166,7 @@
|
||||
<text><![CDATA[TOKO KOPERASI]]></text>
|
||||
</staticText>
|
||||
<staticText>
|
||||
<reportElement positionType="Float" x="10" y="384" width="150" height="12" isPrintWhenDetailOverflows="true" uuid="be732d3f-3ba0-41f4-bfd3-c46332cde9d3">
|
||||
<reportElement positionType="Float" x="10" y="372" width="150" height="12" isPrintWhenDetailOverflows="true" uuid="be732d3f-3ba0-41f4-bfd3-c46332cde9d3">
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
<box leftPadding="2">
|
||||
@ -1229,7 +1182,7 @@
|
||||
<text><![CDATA[LAIN-LAIN]]></text>
|
||||
</staticText>
|
||||
<textField>
|
||||
<reportElement positionType="Float" x="415" y="408" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="0f3ba575-c21c-4b64-8582-d0475d4fcd86"/>
|
||||
<reportElement positionType="Float" x="415" y="396" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="0f3ba575-c21c-4b64-8582-d0475d4fcd86"/>
|
||||
<box rightPadding="5">
|
||||
<rightPen lineWidth="1.0"/>
|
||||
</box>
|
||||
@ -1239,7 +1192,7 @@
|
||||
<textFieldExpression><![CDATA[$F{wakafDanLainLain}]]></textFieldExpression>
|
||||
</textField>
|
||||
<staticText>
|
||||
<reportElement positionType="Float" x="250" y="408" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="90fbc95c-e0a1-420e-8242-9d2098f57d87">
|
||||
<reportElement positionType="Float" x="250" y="396" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="90fbc95c-e0a1-420e-8242-9d2098f57d87">
|
||||
<property name="com.jaspersoft.studio.unit.width" value="px"/>
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
@ -1250,7 +1203,7 @@
|
||||
<text><![CDATA[WAKAF/DLL]]></text>
|
||||
</staticText>
|
||||
<staticText>
|
||||
<reportElement positionType="Float" x="160" y="396" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="dde2e5af-e351-4ed6-abc1-350b430cd120">
|
||||
<reportElement positionType="Float" x="160" y="384" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="dde2e5af-e351-4ed6-abc1-350b430cd120">
|
||||
<property name="com.jaspersoft.studio.unit.width" value="px"/>
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
@ -1261,7 +1214,7 @@
|
||||
<text><![CDATA[]]></text>
|
||||
</staticText>
|
||||
<staticText>
|
||||
<reportElement positionType="Float" x="0" y="396" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="cae85a74-eda2-4ea0-80f6-fe16d31c5950">
|
||||
<reportElement positionType="Float" x="0" y="384" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="cae85a74-eda2-4ea0-80f6-fe16d31c5950">
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
<box leftPadding="2">
|
||||
@ -1276,7 +1229,7 @@
|
||||
<text><![CDATA[]]></text>
|
||||
</staticText>
|
||||
<textField>
|
||||
<reportElement positionType="Float" x="415" y="420" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="056333fc-ef34-495d-bba4-4a0f6a2a7d7d">
|
||||
<reportElement positionType="Float" x="415" y="408" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="056333fc-ef34-495d-bba4-4a0f6a2a7d7d">
|
||||
<property name="com.jaspersoft.studio.unit.width" value="px"/>
|
||||
</reportElement>
|
||||
<box rightPadding="5">
|
||||
@ -1289,7 +1242,7 @@
|
||||
<textFieldExpression><![CDATA[$F{jumlahPotonganRemunerasi}]]></textFieldExpression>
|
||||
</textField>
|
||||
<staticText>
|
||||
<reportElement positionType="Float" x="250" y="420" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="70876ae2-7220-4cf9-ac91-6c9f5b075050">
|
||||
<reportElement positionType="Float" x="250" y="408" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="70876ae2-7220-4cf9-ac91-6c9f5b075050">
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
<box topPadding="0" leftPadding="2" bottomPadding="0" rightPadding="0">
|
||||
@ -1301,7 +1254,7 @@
|
||||
<text><![CDATA[JUMLAH POTONGAN REMUNERASI]]></text>
|
||||
</staticText>
|
||||
<textField>
|
||||
<reportElement positionType="Float" x="160" y="420" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="e9e195d1-ed12-4578-b646-ad0b1163324d">
|
||||
<reportElement positionType="Float" x="160" y="408" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="e9e195d1-ed12-4578-b646-ad0b1163324d">
|
||||
<property name="com.jaspersoft.studio.unit.x" value="px"/>
|
||||
</reportElement>
|
||||
<box rightPadding="5">
|
||||
@ -1313,7 +1266,7 @@
|
||||
<textFieldExpression><![CDATA[$F{jumlahRemunerasi}]]></textFieldExpression>
|
||||
</textField>
|
||||
<staticText>
|
||||
<reportElement positionType="Float" x="0" y="420" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="94481325-560d-46bb-8fdb-e1abdda79c3e">
|
||||
<reportElement positionType="Float" x="0" y="408" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="94481325-560d-46bb-8fdb-e1abdda79c3e">
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
<box leftPadding="2">
|
||||
@ -1328,7 +1281,7 @@
|
||||
<text><![CDATA[JUMLAH REMUNERASI BRUTO]]></text>
|
||||
</staticText>
|
||||
<textField>
|
||||
<reportElement positionType="Float" x="415" y="432" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="11b23983-6603-471e-ba02-11eda946fa47">
|
||||
<reportElement positionType="Float" x="415" y="420" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="11b23983-6603-471e-ba02-11eda946fa47">
|
||||
<property name="com.jaspersoft.studio.unit.width" value="px"/>
|
||||
</reportElement>
|
||||
<box rightPadding="5">
|
||||
@ -1341,7 +1294,7 @@
|
||||
<textFieldExpression><![CDATA[$F{jumlahRemunerasiBersih}]]></textFieldExpression>
|
||||
</textField>
|
||||
<staticText>
|
||||
<reportElement positionType="Float" x="0" y="432" width="400" height="12" isPrintWhenDetailOverflows="true" uuid="5fdc0254-2846-4c35-8453-beb6bd804764">
|
||||
<reportElement positionType="Float" x="0" y="420" width="400" height="12" isPrintWhenDetailOverflows="true" uuid="5fdc0254-2846-4c35-8453-beb6bd804764">
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
<box leftPadding="2">
|
||||
@ -1356,7 +1309,7 @@
|
||||
<text><![CDATA[JUMLAH REMUNERASI BERSIH YANG DITERIMA]]></text>
|
||||
</staticText>
|
||||
<staticText>
|
||||
<reportElement positionType="Float" x="0" y="444" width="505" height="12" isPrintWhenDetailOverflows="true" uuid="2714a3fa-f436-4bc6-bdfa-176d6f15bfc9">
|
||||
<reportElement positionType="Float" x="0" y="432" width="505" height="12" isPrintWhenDetailOverflows="true" uuid="2714a3fa-f436-4bc6-bdfa-176d6f15bfc9">
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
<box leftPadding="2">
|
||||
@ -1372,7 +1325,7 @@
|
||||
<text><![CDATA[C. UANG MAKAN]]></text>
|
||||
</staticText>
|
||||
<textField>
|
||||
<reportElement positionType="Float" x="415" y="456" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="8039ce3d-4f41-45ca-88e8-65d4853f72ac"/>
|
||||
<reportElement positionType="Float" x="415" y="444" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="8039ce3d-4f41-45ca-88e8-65d4853f72ac"/>
|
||||
<box rightPadding="5">
|
||||
<topPen lineWidth="1.0"/>
|
||||
<rightPen lineWidth="1.0"/>
|
||||
@ -1383,7 +1336,7 @@
|
||||
<textFieldExpression><![CDATA[$F{potonganUangMakan}]]></textFieldExpression>
|
||||
</textField>
|
||||
<staticText>
|
||||
<reportElement positionType="Float" x="250" y="456" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="2f7dc4d5-31a3-4078-84c1-e29868c46d1e">
|
||||
<reportElement positionType="Float" x="250" y="444" width="165" height="12" isPrintWhenDetailOverflows="true" uuid="2f7dc4d5-31a3-4078-84c1-e29868c46d1e">
|
||||
<property name="com.jaspersoft.studio.unit.width" value="px"/>
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
@ -1396,7 +1349,7 @@
|
||||
<text><![CDATA[POTONGAN UANG MAKAN]]></text>
|
||||
</staticText>
|
||||
<textField>
|
||||
<reportElement positionType="Float" x="160" y="456" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="2b243495-71ec-4bb7-900a-d77345fb331f"/>
|
||||
<reportElement positionType="Float" x="160" y="444" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="2b243495-71ec-4bb7-900a-d77345fb331f"/>
|
||||
<box rightPadding="5">
|
||||
<topPen lineWidth="1.0"/>
|
||||
</box>
|
||||
@ -1406,7 +1359,7 @@
|
||||
<textFieldExpression><![CDATA[$F{uangMakan}]]></textFieldExpression>
|
||||
</textField>
|
||||
<staticText>
|
||||
<reportElement positionType="Float" x="0" y="456" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="b73e63d9-c75a-4c4b-8eb2-20fd7d5d7f86">
|
||||
<reportElement positionType="Float" x="0" y="444" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="b73e63d9-c75a-4c4b-8eb2-20fd7d5d7f86">
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
<box leftPadding="2">
|
||||
@ -1422,7 +1375,7 @@
|
||||
<text><![CDATA[UANG MAKAN BRUTO]]></text>
|
||||
</staticText>
|
||||
<textField>
|
||||
<reportElement positionType="Float" x="415" y="468" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="d2959bf2-7cad-4da4-8bcf-6455965bd275">
|
||||
<reportElement positionType="Float" x="415" y="456" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="d2959bf2-7cad-4da4-8bcf-6455965bd275">
|
||||
<property name="com.jaspersoft.studio.unit.width" value="px"/>
|
||||
</reportElement>
|
||||
<box rightPadding="5">
|
||||
@ -1435,7 +1388,7 @@
|
||||
<textFieldExpression><![CDATA[$F{jumlahUangMakanBersih}]]></textFieldExpression>
|
||||
</textField>
|
||||
<staticText>
|
||||
<reportElement positionType="Float" x="0" y="468" width="400" height="12" isPrintWhenDetailOverflows="true" uuid="6e1e5438-0d8e-4e4a-a0b2-2cb9a4fde04c">
|
||||
<reportElement positionType="Float" x="0" y="456" width="400" height="12" isPrintWhenDetailOverflows="true" uuid="6e1e5438-0d8e-4e4a-a0b2-2cb9a4fde04c">
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
<box leftPadding="2">
|
||||
@ -1450,7 +1403,7 @@
|
||||
<text><![CDATA[JUMLAH UANG MAKAN BERSIH YANG DITERIMA]]></text>
|
||||
</staticText>
|
||||
<textField>
|
||||
<reportElement positionType="Float" x="415" y="480" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="f18d0b78-97b7-4f61-bd05-027770b1dd0e">
|
||||
<reportElement positionType="Float" x="415" y="468" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="f18d0b78-97b7-4f61-bd05-027770b1dd0e">
|
||||
<property name="com.jaspersoft.studio.unit.width" value="px"/>
|
||||
</reportElement>
|
||||
<box rightPadding="5">
|
||||
@ -1464,7 +1417,7 @@
|
||||
<textFieldExpression><![CDATA[$F{jumlahPenerimaanBersih}]]></textFieldExpression>
|
||||
</textField>
|
||||
<staticText>
|
||||
<reportElement positionType="Float" x="0" y="480" width="400" height="12" isPrintWhenDetailOverflows="true" uuid="1eca11e5-21d1-4fec-827e-727b229a243a">
|
||||
<reportElement positionType="Float" x="0" y="468" width="400" height="12" isPrintWhenDetailOverflows="true" uuid="1eca11e5-21d1-4fec-827e-727b229a243a">
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
<box leftPadding="2">
|
||||
@ -1479,7 +1432,7 @@
|
||||
<text><![CDATA[TOTAL BERSIH YANG DITERIMA (A + B + C)]]></text>
|
||||
</staticText>
|
||||
<staticText>
|
||||
<reportElement positionType="Float" x="0" y="492" width="505" height="20" isPrintWhenDetailOverflows="true" uuid="471a5378-4af0-4aa7-ae66-c10420c23ccc">
|
||||
<reportElement positionType="Float" x="0" y="480" width="505" height="20" isPrintWhenDetailOverflows="true" uuid="471a5378-4af0-4aa7-ae66-c10420c23ccc">
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
<property name="com.jaspersoft.studio.unit.width" value="px"/>
|
||||
<property name="com.jaspersoft.studio.unit.x" value="px"/>
|
||||
@ -1490,7 +1443,7 @@
|
||||
<text><![CDATA[Keterangan:]]></text>
|
||||
</staticText>
|
||||
<staticText>
|
||||
<reportElement positionType="Float" x="40" y="512" width="465" height="12" isPrintWhenDetailOverflows="true" uuid="4ea43ee2-0609-45b2-ad25-ab9b3fbdab99">
|
||||
<reportElement positionType="Float" x="40" y="500" width="465" height="12" isPrintWhenDetailOverflows="true" uuid="4ea43ee2-0609-45b2-ad25-ab9b3fbdab99">
|
||||
<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"/>
|
||||
@ -1501,7 +1454,7 @@
|
||||
<text><![CDATA[(JUMLAH GAJI BRUTO - JUMLAH POTONGAN GAJI)]]></text>
|
||||
</staticText>
|
||||
<staticText>
|
||||
<reportElement positionType="Float" x="0" y="512" width="40" height="12" isPrintWhenDetailOverflows="true" uuid="d4a16575-90de-4b75-a006-e58ea59426d8">
|
||||
<reportElement positionType="Float" x="0" y="500" width="40" height="12" isPrintWhenDetailOverflows="true" uuid="d4a16575-90de-4b75-a006-e58ea59426d8">
|
||||
<property name="com.jaspersoft.studio.unit.width" value="px"/>
|
||||
<property name="com.jaspersoft.studio.unit.x" value="px"/>
|
||||
</reportElement>
|
||||
@ -1511,7 +1464,7 @@
|
||||
<text><![CDATA[(1)]]></text>
|
||||
</staticText>
|
||||
<staticText>
|
||||
<reportElement positionType="Float" x="40" y="524" width="465" height="12" isPrintWhenDetailOverflows="true" uuid="9c9a06b5-9ac2-4c48-baf9-32d3252fe867">
|
||||
<reportElement positionType="Float" x="40" y="512" width="465" height="12" isPrintWhenDetailOverflows="true" uuid="9c9a06b5-9ac2-4c48-baf9-32d3252fe867">
|
||||
<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"/>
|
||||
@ -1522,7 +1475,7 @@
|
||||
<text><![CDATA[(JUMLAH REMUNERASI BRUTO - JUMLAH POTONGAN REMUNERASI)]]></text>
|
||||
</staticText>
|
||||
<staticText>
|
||||
<reportElement positionType="Float" x="0" y="524" width="40" height="12" isPrintWhenDetailOverflows="true" uuid="ed2244d8-eec5-4731-af81-6ab60f64a178">
|
||||
<reportElement positionType="Float" x="0" y="512" width="40" height="12" isPrintWhenDetailOverflows="true" uuid="ed2244d8-eec5-4731-af81-6ab60f64a178">
|
||||
<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"/>
|
||||
@ -1533,7 +1486,7 @@
|
||||
<text><![CDATA[(2)]]></text>
|
||||
</staticText>
|
||||
<staticText>
|
||||
<reportElement positionType="Float" x="40" y="536" width="465" height="12" isPrintWhenDetailOverflows="true" uuid="fb0d56d1-721e-4324-b10b-0cc3f011b898">
|
||||
<reportElement positionType="Float" x="40" y="524" width="465" height="12" isPrintWhenDetailOverflows="true" uuid="fb0d56d1-721e-4324-b10b-0cc3f011b898">
|
||||
<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"/>
|
||||
@ -1544,7 +1497,7 @@
|
||||
<text><![CDATA[(UANG MAKAN BRUTO - POTONGAN UANG MAKAN)]]></text>
|
||||
</staticText>
|
||||
<staticText>
|
||||
<reportElement positionType="Float" x="0" y="536" width="40" height="12" isPrintWhenDetailOverflows="true" uuid="6793e7d0-c8ff-4e8f-8089-a17f379abd45">
|
||||
<reportElement positionType="Float" x="0" y="524" width="40" height="12" isPrintWhenDetailOverflows="true" uuid="6793e7d0-c8ff-4e8f-8089-a17f379abd45">
|
||||
<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"/>
|
||||
@ -1555,7 +1508,7 @@
|
||||
<text><![CDATA[(3)]]></text>
|
||||
</staticText>
|
||||
<staticText>
|
||||
<reportElement positionType="Float" x="40" y="548" width="465" height="12" isPrintWhenDetailOverflows="true" uuid="a79a0b9b-c3cd-43e3-b8a7-3a3508f76170">
|
||||
<reportElement positionType="Float" x="40" y="536" width="465" height="12" isPrintWhenDetailOverflows="true" uuid="a79a0b9b-c3cd-43e3-b8a7-3a3508f76170">
|
||||
<property name="com.jaspersoft.studio.unit.width" value="px"/>
|
||||
<property name="com.jaspersoft.studio.unit.x" value="px"/>
|
||||
</reportElement>
|
||||
@ -1565,7 +1518,7 @@
|
||||
<text><![CDATA[(JUMLAH BERSIH A + JUMLAH BERSIH B + JUMLAH BERSIH C)]]></text>
|
||||
</staticText>
|
||||
<staticText>
|
||||
<reportElement positionType="Float" x="0" y="548" width="40" height="12" isPrintWhenDetailOverflows="true" uuid="7e59d156-7b57-4f78-9360-60f80aeb0552">
|
||||
<reportElement positionType="Float" x="0" y="536" width="40" height="12" isPrintWhenDetailOverflows="true" uuid="7e59d156-7b57-4f78-9360-60f80aeb0552">
|
||||
<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"/>
|
||||
@ -1589,7 +1542,7 @@
|
||||
<text><![CDATA[(1)]]></text>
|
||||
</staticText>
|
||||
<staticText>
|
||||
<reportElement positionType="Float" x="400" y="432" width="15" height="12" isPrintWhenDetailOverflows="true" uuid="50ba0c32-aa2f-4beb-8ad5-b3d9d6c8520b">
|
||||
<reportElement positionType="Float" x="400" y="420" width="15" height="12" isPrintWhenDetailOverflows="true" uuid="50ba0c32-aa2f-4beb-8ad5-b3d9d6c8520b">
|
||||
<property name="com.jaspersoft.studio.unit.width" value="px"/>
|
||||
<property name="com.jaspersoft.studio.unit.x" value="px"/>
|
||||
</reportElement>
|
||||
@ -1602,7 +1555,7 @@
|
||||
<text><![CDATA[(2)]]></text>
|
||||
</staticText>
|
||||
<staticText>
|
||||
<reportElement positionType="Float" x="400" y="468" width="15" height="12" isPrintWhenDetailOverflows="true" uuid="ac565196-1937-4f83-a200-51a353d03312">
|
||||
<reportElement positionType="Float" x="400" y="456" width="15" height="12" isPrintWhenDetailOverflows="true" uuid="ac565196-1937-4f83-a200-51a353d03312">
|
||||
<property name="com.jaspersoft.studio.unit.width" value="px"/>
|
||||
<property name="com.jaspersoft.studio.unit.x" value="px"/>
|
||||
</reportElement>
|
||||
@ -1615,7 +1568,7 @@
|
||||
<text><![CDATA[(3)]]></text>
|
||||
</staticText>
|
||||
<staticText>
|
||||
<reportElement positionType="Float" x="400" y="480" width="15" height="12" isPrintWhenDetailOverflows="true" uuid="eea87c44-436d-4e1c-8287-189c042c7cfe">
|
||||
<reportElement positionType="Float" x="400" y="468" width="15" height="12" isPrintWhenDetailOverflows="true" uuid="eea87c44-436d-4e1c-8287-189c042c7cfe">
|
||||
<property name="com.jaspersoft.studio.unit.width" value="px"/>
|
||||
<property name="com.jaspersoft.studio.unit.x" value="px"/>
|
||||
</reportElement>
|
||||
@ -1629,7 +1582,7 @@
|
||||
<text><![CDATA[(4)]]></text>
|
||||
</staticText>
|
||||
<staticText>
|
||||
<reportElement positionType="Float" x="0" y="360" width="10" height="12" isPrintWhenDetailOverflows="true" uuid="84f7a126-afcc-490d-a0c5-26d53126097a">
|
||||
<reportElement positionType="Float" x="0" y="348" width="10" height="12" isPrintWhenDetailOverflows="true" uuid="84f7a126-afcc-490d-a0c5-26d53126097a">
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
<box leftPadding="2">
|
||||
@ -1645,7 +1598,7 @@
|
||||
<text><![CDATA[]]></text>
|
||||
</staticText>
|
||||
<staticText>
|
||||
<reportElement positionType="Float" x="0" y="372" width="10" height="12" isPrintWhenDetailOverflows="true" uuid="5e182afc-8851-44be-bcf0-efba56536957">
|
||||
<reportElement positionType="Float" x="0" y="360" width="10" height="12" isPrintWhenDetailOverflows="true" uuid="5e182afc-8851-44be-bcf0-efba56536957">
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
<box leftPadding="2">
|
||||
@ -1661,7 +1614,7 @@
|
||||
<text><![CDATA[]]></text>
|
||||
</staticText>
|
||||
<staticText>
|
||||
<reportElement positionType="Float" x="0" y="384" width="10" height="12" isPrintWhenDetailOverflows="true" uuid="15a4f459-0832-471a-93c9-cb1e84cf2f75">
|
||||
<reportElement positionType="Float" x="0" y="372" width="10" height="12" isPrintWhenDetailOverflows="true" uuid="15a4f459-0832-471a-93c9-cb1e84cf2f75">
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
<box leftPadding="2">
|
||||
@ -1691,7 +1644,7 @@
|
||||
<text><![CDATA[]]></text>
|
||||
</staticText>
|
||||
<staticText>
|
||||
<reportElement positionType="Float" x="0" y="408" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="f196ad51-133b-4786-9ca5-957bce771c33">
|
||||
<reportElement positionType="Float" x="0" y="396" width="160" height="12" isPrintWhenDetailOverflows="true" uuid="f196ad51-133b-4786-9ca5-957bce771c33">
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
<box leftPadding="2">
|
||||
@ -1706,7 +1659,7 @@
|
||||
<text><![CDATA[]]></text>
|
||||
</staticText>
|
||||
<staticText>
|
||||
<reportElement positionType="Float" x="160" y="408" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="04249ff4-6c87-45ab-83dc-796e4487cf7e">
|
||||
<reportElement positionType="Float" x="160" y="396" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="04249ff4-6c87-45ab-83dc-796e4487cf7e">
|
||||
<property name="com.jaspersoft.studio.unit.width" value="px"/>
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
@ -1717,7 +1670,7 @@
|
||||
<text><![CDATA[]]></text>
|
||||
</staticText>
|
||||
<staticText>
|
||||
<reportElement positionType="Float" x="160" y="348" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="91d9fddb-aecb-4195-9907-8674e48152e1">
|
||||
<reportElement positionType="Float" x="160" y="336" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="91d9fddb-aecb-4195-9907-8674e48152e1">
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
<box leftPadding="2">
|
||||
@ -1763,7 +1716,7 @@
|
||||
<textFieldExpression><![CDATA[$F{feeForService}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement positionType="Float" x="160" y="336" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="5e218540-80a1-4365-a02d-d3cac783a799"/>
|
||||
<reportElement positionType="Float" x="160" y="324" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="5e218540-80a1-4365-a02d-d3cac783a799"/>
|
||||
<box rightPadding="5"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font size="8"/>
|
||||
@ -1771,7 +1724,7 @@
|
||||
<textFieldExpression><![CDATA[$F{kelebihanJamKerja}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement positionType="Float" x="160" y="360" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="cfb15f65-9400-43a6-956f-c6a41324d88a"/>
|
||||
<reportElement positionType="Float" x="160" y="348" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="cfb15f65-9400-43a6-956f-c6a41324d88a"/>
|
||||
<box rightPadding="5"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font size="8"/>
|
||||
@ -1779,7 +1732,7 @@
|
||||
<textFieldExpression><![CDATA[$F{remunerasiManajerial}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement positionType="Float" x="160" y="372" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="7e822573-0cf9-4db0-a4aa-95569b9ae4cc"/>
|
||||
<reportElement positionType="Float" x="160" y="360" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="7e822573-0cf9-4db0-a4aa-95569b9ae4cc"/>
|
||||
<box rightPadding="5"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font size="8"/>
|
||||
@ -1787,7 +1740,7 @@
|
||||
<textFieldExpression><![CDATA[$F{remunerasiTambahanDiklitjar}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement positionType="Float" x="160" y="384" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="4cf88571-18fd-423a-8d72-e65d0319c3b6"/>
|
||||
<reportElement positionType="Float" x="160" y="372" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="4cf88571-18fd-423a-8d72-e65d0319c3b6"/>
|
||||
<box rightPadding="5"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font size="8"/>
|
||||
@ -1795,7 +1748,7 @@
|
||||
<textFieldExpression><![CDATA[$F{remunerasiTambahanLain}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement positionType="Float" x="0" y="560" width="505" height="20" isPrintWhenDetailOverflows="true" uuid="2a9e3ee6-219d-4378-b7e7-345ef1bb7a87">
|
||||
<reportElement positionType="Float" x="0" y="548" width="505" height="20" isPrintWhenDetailOverflows="true" uuid="2a9e3ee6-219d-4378-b7e7-345ef1bb7a87">
|
||||
<property name="com.jaspersoft.studio.unit.width" value="px"/>
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
|
||||
@ -97,8 +97,7 @@ public class AppInterceptor implements HandlerInterceptor {
|
||||
return potongan.toString();
|
||||
}
|
||||
|
||||
private boolean checkAuthSecure(HttpServletRequest request, HttpServletResponse response, String AlamatUrlForm,
|
||||
boolean supervisi) throws Exception {
|
||||
private boolean checkAuthSecure(HttpServletRequest request, HttpServletResponse response) throws Exception {
|
||||
Authentication authentication = tokenAuthenticationService.getAuthentication(request);
|
||||
namaUser = authentication.getName();
|
||||
loginUser = loginUserDao.findByNamaUser(namaUser);
|
||||
@ -177,7 +176,7 @@ public class AppInterceptor implements HandlerInterceptor {
|
||||
.findByAlamatUrlForm(filterUrlForm(AlamatUrlForm));
|
||||
if (CommonUtil.isNullOrEmpty(objekModulAplikasi))
|
||||
return true;
|
||||
if (!checkAuthSecure(request, response, AlamatUrlForm, false))
|
||||
if (!checkAuthSecure(request, response))
|
||||
return false;
|
||||
int resultUser = checkUserPermision(loginUser.get(0), objekModulAplikasi.get(0), action);
|
||||
if (resultUser == 0) {
|
||||
@ -229,7 +228,7 @@ public class AppInterceptor implements HandlerInterceptor {
|
||||
hm = (HandlerMethod) handler;
|
||||
method = hm.getMethod();
|
||||
} else {
|
||||
return checkAuthSecure(request, response, AlamatUrlForm, true);
|
||||
return checkAuthSecure(request, response);
|
||||
}
|
||||
boolean usingAnno = method != null && method.isAnnotationPresent(AppPermission.class);
|
||||
boolean postM = "POST".equals(methodHttp);
|
||||
@ -293,7 +292,12 @@ public class AppInterceptor implements HandlerInterceptor {
|
||||
: request.getHeader(Constants.HttpHeader.TGL_KIRIM);
|
||||
boolean notHttpOK = response.getStatus() >= HttpServletResponse.SC_BAD_REQUEST;
|
||||
boolean notLewatMenu = CommonUtil.isNullOrEmpty(AlamatUrlForm) || CommonUtil.isNullOrEmpty(KdRuangan);
|
||||
Integer ruanganAsalId = Integer.parseInt(KdRuangan);
|
||||
Integer ruanganAsalId;
|
||||
try {
|
||||
ruanganAsalId = Integer.parseInt(KdRuangan);
|
||||
} catch (NumberFormatException e) {
|
||||
ruanganAsalId = 0;
|
||||
}
|
||||
boolean adaError = CommonUtil.isNotNullOrEmpty(ex);
|
||||
if (notHttpOK || notLewatMenu || adaError)
|
||||
return;
|
||||
|
||||
@ -0,0 +1,47 @@
|
||||
package com.jasamedika.medifirst2000.controller;
|
||||
|
||||
import com.jasamedika.medifirst2000.exception.ServiceVOException;
|
||||
import com.jasamedika.medifirst2000.service.JenisLogService;
|
||||
import com.jasamedika.medifirst2000.util.rest.RestUtil;
|
||||
import com.jasamedika.medifirst2000.vo.JenisLogVO;
|
||||
import org.slf4j.Logger;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.validation.Valid;
|
||||
import java.util.List;
|
||||
|
||||
import static org.slf4j.LoggerFactory.getLogger;
|
||||
import static org.springframework.http.HttpStatus.CREATED;
|
||||
import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR;
|
||||
import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
|
||||
import static org.springframework.web.bind.annotation.RequestMethod.POST;
|
||||
|
||||
/**
|
||||
* @author Salman
|
||||
* @version 1.0.0
|
||||
* @since 02/02/2024
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/log/jenis")
|
||||
public class JenisLogController {
|
||||
private static final Logger LOGGER = getLogger(JenisLogController.class);
|
||||
|
||||
@Autowired
|
||||
private JenisLogService jenisLogService;
|
||||
|
||||
@RequestMapping(method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
|
||||
public ResponseEntity<String> addVO(@Valid @RequestBody List<JenisLogVO> vos, HttpServletRequest request) {
|
||||
try {
|
||||
jenisLogService.save(vos);
|
||||
return RestUtil.getJsonResponse(CREATED.getReasonPhrase(), CREATED);
|
||||
} catch (ServiceVOException e) {
|
||||
LOGGER.error("Got exception {} when add jenis log", e.getMessage());
|
||||
return RestUtil.getJsonHttptatus(INTERNAL_SERVER_ERROR);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -96,8 +96,7 @@ public class AppInterceptor implements HandlerInterceptor {
|
||||
return potongan.toString();
|
||||
}
|
||||
|
||||
private boolean checkAuthSecure(HttpServletRequest request, HttpServletResponse response, String AlamatUrlForm,
|
||||
boolean supervisi) throws Exception {
|
||||
private boolean checkAuthSecure(HttpServletRequest request, HttpServletResponse response) throws Exception {
|
||||
Authentication authentication = tokenAuthenticationService.getAuthentication(request);
|
||||
namaUser = authentication.getName();
|
||||
loginUser = loginUserDao.findByNamaUser(namaUser);
|
||||
@ -176,7 +175,7 @@ public class AppInterceptor implements HandlerInterceptor {
|
||||
.findByAlamatUrlForm(filterUrlForm(AlamatUrlForm));
|
||||
if (CommonUtil.isNullOrEmpty(objekModulAplikasi))
|
||||
return true;
|
||||
if (!checkAuthSecure(request, response, AlamatUrlForm, false))
|
||||
if (!checkAuthSecure(request, response))
|
||||
return false;
|
||||
int resultUser = checkUserPermision(loginUser.get(0), objekModulAplikasi.get(0), action);
|
||||
if (resultUser == 0) {
|
||||
@ -228,7 +227,7 @@ public class AppInterceptor implements HandlerInterceptor {
|
||||
hm = (HandlerMethod) handler;
|
||||
method = hm.getMethod();
|
||||
} else {
|
||||
return checkAuthSecure(request, response, AlamatUrlForm, true);
|
||||
return checkAuthSecure(request, response);
|
||||
}
|
||||
boolean usingAnno = method != null && method.isAnnotationPresent(AppPermission.class);
|
||||
boolean postM = "POST".equals(methodHttp);
|
||||
@ -292,7 +291,12 @@ public class AppInterceptor implements HandlerInterceptor {
|
||||
: request.getHeader(Constants.HttpHeader.TGL_KIRIM);
|
||||
boolean notHttpOK = response.getStatus() >= HttpServletResponse.SC_BAD_REQUEST;
|
||||
boolean notLewatMenu = CommonUtil.isNullOrEmpty(AlamatUrlForm) || CommonUtil.isNullOrEmpty(KdRuangan);
|
||||
Integer ruanganAsalId = Integer.parseInt(KdRuangan);
|
||||
Integer ruanganAsalId;
|
||||
try {
|
||||
ruanganAsalId = Integer.parseInt(KdRuangan);
|
||||
} catch (NumberFormatException e) {
|
||||
ruanganAsalId = 0;
|
||||
}
|
||||
boolean adaError = CommonUtil.isNotNullOrEmpty(ex);
|
||||
if (notHttpOK || notLewatMenu || adaError)
|
||||
return;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user