From 7eea0a76de0f68366287221e68d30d3462a249a3 Mon Sep 17 00:00:00 2001 From: "MSI\\2Fi" Date: Tue, 20 Aug 2024 11:43:07 +0800 Subject: [PATCH] Update salary effective from local date to string --- .../ffii/tsms/modules/data/service/SalaryEffectiveService.kt | 2 +- .../tsms/modules/data/web/models/SalaryEffectiveResponse.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ffii/tsms/modules/data/service/SalaryEffectiveService.kt b/src/main/java/com/ffii/tsms/modules/data/service/SalaryEffectiveService.kt index 82adca7..2411719 100644 --- a/src/main/java/com/ffii/tsms/modules/data/service/SalaryEffectiveService.kt +++ b/src/main/java/com/ffii/tsms/modules/data/service/SalaryEffectiveService.kt @@ -57,7 +57,7 @@ open class SalaryEffectiveService( (result["salaryId"] as Int).toLong(), (result["lowerLimit"] as Int), (result["upperLimit"] as Int), - (result["date"] as java.sql.Date).toLocalDate(), + (result["date"] as java.sql.Date).toLocalDate().toString(), ) } return result diff --git a/src/main/java/com/ffii/tsms/modules/data/web/models/SalaryEffectiveResponse.kt b/src/main/java/com/ffii/tsms/modules/data/web/models/SalaryEffectiveResponse.kt index 3bd29e7..864bb21 100644 --- a/src/main/java/com/ffii/tsms/modules/data/web/models/SalaryEffectiveResponse.kt +++ b/src/main/java/com/ffii/tsms/modules/data/web/models/SalaryEffectiveResponse.kt @@ -8,5 +8,5 @@ data class SalaryEffectiveInfoResponse ( val salaryPoint: Long, val lowerLimit: Int, val upperLimit: Int, - val date: LocalDate + val date: String ) \ No newline at end of file