Merge branch 'dev/logbook/terapis' into dev/no-cron

This commit is contained in:
Salman Manoe 2024-10-22 08:58:30 +07:00
commit 49fe2ac9d1

View File

@ -2321,7 +2321,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
double persenJasaTerapis = Double.parseDouble(GetSettingDataFixed("persenJasaTerapis"));
double persenJasaTerapis24 = Double.parseDouble(GetSettingDataFixed("persenFfsTerapisTmt21Okt24"));
// Custom rule persentase jasa terapis 21 Oktober 2024
LocalDateTime tmtJasaTerapis24 = LocalDateTime.of(2024, 10, 21, 0, 0, 0, 0);
LocalDateTime tmtJasaTerapis24 = LocalDateTime.of(2024, 11, 1, 0, 0, 0, 0);
/*
* Persiapan filter logic remunerasi
*/
@ -2701,7 +2701,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
double persenJasaTerapis24 = Double.parseDouble(GetSettingDataFixed("persenFfsTerapisTmt21Okt24"));
double persenJasaLuarTerapis = Double.parseDouble(GetSettingDataFixed("persenJasaLuarTerapis"));
// Custom rule persentase jasa terapis 21 Oktober 2024
LocalDateTime tmtJasaTerapis24 = LocalDateTime.of(2024, 10, 21, 0, 0, 0, 0);
LocalDateTime tmtJasaTerapis24 = LocalDateTime.of(2024, 11, 1, 0, 0, 0, 0);
/*
* Persiapan filter logic remunerasi
*/
@ -2981,7 +2981,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
double persenJasaTerapis = Double.parseDouble(GetSettingDataFixed("persenJasaTerapis"));
double persenJasaTerapis24 = Double.parseDouble(GetSettingDataFixed("persenFfsTerapisTmt21Okt24"));
// Custom rule persentase jasa terapis 21 Oktober 2024
LocalDateTime tmtJasaTerapis24 = LocalDateTime.of(2024, 10, 21, 0, 0, 0, 0);
LocalDateTime tmtJasaTerapis24 = LocalDateTime.of(2024, 11, 1, 0, 0, 0, 0);
/*
* Persiapan filter logic remunerasi
*/