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

Update service jatah cuti dan izin

Browse Source 
Perbaikan perhitungan cuti terpakai dua tahun sebelumnya
This commit is contained in:
Salman Manoe 2025-01-16 15:29:05 +07:00
parent fd37577c0b
commit df5ae6f118
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/JatahCutiDanIzinServiceImpl.java
View File

@ -287,7 +287,7 @@ public class JatahCutiDanIzinServiceImpl implements JatahCutiDanIzinService {
if (dataCutiN2 > 0) { if (dataCutiN2 > 0) {
if (allCutiTerpakai >= dataCutiN2) { if (allCutiTerpakai >= dataCutiN2) {
if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2)
+ difCutiTerpakai(cutiTerpakaiN1, dataCutiB1) < 12) { + difCutiTerpakai(cutiTerpakaiN1, dataCutiB1) < dataCutiN2) {
jatahCutiTerpakaiN2 = difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) jatahCutiTerpakaiN2 = difCutiTerpakai(cutiTerpakaiN2, dataCutiB2)
+ difCutiTerpakai(cutiTerpakaiN1, dataCutiB1); + difCutiTerpakai(cutiTerpakaiN1, dataCutiB1);
} else { } else {
@ -295,14 +295,15 @@ public class JatahCutiDanIzinServiceImpl implements JatahCutiDanIzinService {
} }
} else { } else {
if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2)
+ difCutiTerpakai(cutiTerpakaiN1, dataCutiB1) < 12) { + difCutiTerpakai(cutiTerpakaiN1, dataCutiB1) < dataCutiN2) {
jatahCutiTerpakaiN2 = difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) jatahCutiTerpakaiN2 = difCutiTerpakai(cutiTerpakaiN2, dataCutiB2)
+ difCutiTerpakai(cutiTerpakaiN1, dataCutiB1); + difCutiTerpakai(cutiTerpakaiN1, dataCutiB1);
} else { } else {
jatahCutiTerpakaiN2 = allCutiTerpakai; jatahCutiTerpakaiN2 = allCutiTerpakai;
} }
} }
if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) + difCutiTerpakai(cutiTerpakaiN1, dataCutiB1) < 12) { if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2)
+ difCutiTerpakai(cutiTerpakaiN1, dataCutiB1) < dataCutiN2) {
if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) > 0) { if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) > 0) {
sisaCutiN2 = 0; // hangus sisaCutiN2 = 0; // hangus
} else { } else {

4
jasamedika-config/src/main/resources/jdbc.development.properties
View File

@ -8,11 +8,11 @@ hibernate.show_sql = true
hikari.config.maximum.pool.size = 5 hikari.config.maximum.pool.size = 5
# DB Development # DB Development
jdbc.url = jdbc:postgresql://192.168.12.3:5432/rsab_hk_24_08_20 jdbc.url = jdbc:postgresql://192.168.12.3:5432/rsab_hk_25_01_14
jdbc.username = smart_user jdbc.username = smart_user
jdbc.password = 1miwhir3yr jdbc.password = 1miwhir3yr
jdbc.serverName = 192.168.12.3 jdbc.serverName = 192.168.12.3
jdbc.databaseName = rsab_hk_24_08_20 jdbc.databaseName = rsab_hk_25_01_14
jdbc.portNumber = 5432 jdbc.portNumber = 5432
corePoolSizeAsyncConfigurer = 5 corePoolSizeAsyncConfigurer = 5