Просмотр исходного кода

Add del salary effective record

tags/Baseline_30082024_BACKEND_UAT
MSI\2Fi 1 год назад
Родитель
Сommit
a9be800a86
3 измененных файлов: 10 добавлений и 3 удалений
  1. +7
    -1
      src/main/java/com/ffii/tsms/modules/data/service/SalaryEffectiveService.kt
  2. +1
    -1
      src/main/java/com/ffii/tsms/modules/data/service/StaffsService.kt
  3. +2
    -1
      src/main/java/com/ffii/tsms/modules/data/web/models/NewStaffRequest.kt

+ 7
- 1
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


+ 1
- 1
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)
}


+ 2
- 1
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(


Загрузка…
Отмена
Сохранить