From a9be800a86181b877d081e2b8ce6533d4ba1d23b Mon Sep 17 00:00:00 2001
From: "MSI\\2Fi" <jason.tom@2fi-solutions.com.hk>
Date: Wed, 14 Aug 2024 17:45:51 +0800
Subject: [PATCH] Add del salary effective record

---
 .../tsms/modules/data/service/SalaryEffectiveService.kt   | 8 +++++++-
 .../com/ffii/tsms/modules/data/service/StaffsService.kt   | 2 +-
 .../ffii/tsms/modules/data/web/models/NewStaffRequest.kt  | 3 ++-
 3 files changed, 10 insertions(+), 3 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 6186df6..82adca7 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
@@ -94,8 +94,14 @@ open class SalaryEffectiveService(
 
 
 
-    open fun updateSalaryEffective(staffId: Long, salaryEffectiveInfo: List<SalaryEffectiveInfo>?){
+    open fun updateSalaryEffective(staffId: Long, salaryEffectiveInfo: List<SalaryEffectiveInfo>?, delSalaryEffectiveInfo: List<Long>?){
+        delSalaryEffectiveInfo?.forEach { item ->
+            salaryEffectiveRepository.deleteById(item)
+        }
+
         salaryEffectiveInfo?.forEachIndexed { index, item ->
+            //            println("================ $staffId ===========================")
+            //            println("salaryPoint: $item.salaryPoint")
             val staff = staffRepository.findById(staffId).orElseThrow()
             val salary = salaryRepository.findBySalaryPoint(item.salaryPoint).orElseThrow()
             val salaryEffective: SalaryEffective
diff --git a/src/main/java/com/ffii/tsms/modules/data/service/StaffsService.kt b/src/main/java/com/ffii/tsms/modules/data/service/StaffsService.kt
index d8737a1..2c2ec8f 100644
--- a/src/main/java/com/ffii/tsms/modules/data/service/StaffsService.kt
+++ b/src/main/java/com/ffii/tsms/modules/data/service/StaffsService.kt
@@ -227,7 +227,7 @@ open class StaffsService(
         }
 
 //        salaryEffectiveService.saveSalaryEffective(staff.id!!, salary.salaryPoint.toLong())
-//        salaryEffectiveService.updateSalaryEffective(staff.id!!, req.salaryEffectiveInfo?.sortedBy { it.date })
+        salaryEffectiveService.updateSalaryEffective(staff.id!!, req.salaryEffectiveInfo?.sortedBy { it.date }, req.delSalaryEffectiveInfo)
 
         return staffRepository.save(staff)
     }
diff --git a/src/main/java/com/ffii/tsms/modules/data/web/models/NewStaffRequest.kt b/src/main/java/com/ffii/tsms/modules/data/web/models/NewStaffRequest.kt
index 2c044c5..895183c 100644
--- a/src/main/java/com/ffii/tsms/modules/data/web/models/NewStaffRequest.kt
+++ b/src/main/java/com/ffii/tsms/modules/data/web/models/NewStaffRequest.kt
@@ -37,7 +37,8 @@ data class NewStaffRequest(
     val departDate: LocalDate?,
     val departReason: String?,
     val remark: String?,
-    val salaryEffectiveInfo: List<SalaryEffectiveInfo>?
+    val salaryEffectiveInfo: List<SalaryEffectiveInfo>?,
+    val delSalaryEffectiveInfo: List<Long>?
 )
 
 data class SalaryEffectiveInfo(