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 32500c8..8176238 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 @@ -63,7 +63,7 @@ open class SalaryEffectiveService( return result } - open fun saveSalaryEffective (staffId: Long, salaryId: Long): SalaryEffective? { + open fun saveSalaryEffective (staffId: Long, _startDate: LocalDate, salaryId: Long): SalaryEffective? { // val existSalaryEffective = findByStaffIdAndSalaryId(staffId, salaryId) // // logger.info(existSalaryEffective) @@ -81,7 +81,7 @@ open class SalaryEffectiveService( val salary = salaryRepository.findBySalaryPoint(salaryId).orElseThrow() val salaryEffective = SalaryEffective().apply { date = LocalDate.now() - startDate = LocalDate.now() + startDate = _startDate endDate = LocalDate.of(2124, 1, 1) this.staff = staff this.salary = salary @@ -162,7 +162,8 @@ open class SalaryEffectiveService( .groupBy { it.staffId } .map { (staffId, salaryData) -> StaffSalaryData(staffId, salaryData.sortedBy { it.financialYear }) } -// println(salaryEffectiveLists) + println("------------ salaryEffectiveLists ------------") + println(salaryEffectiveLists) return salaryEffectiveLists } 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 1358cec..ac09dd0 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 @@ -193,7 +193,7 @@ open class StaffsService( staffSkillsetRepository.save(ss) } } - salaryEffectiveService.saveSalaryEffective(staff.id!!, salary.salaryPoint.toLong()) + salaryEffectiveService.saveSalaryEffective(staff.id!!, req.joinDate ?: LocalDate.now(), salary.salaryPoint.toLong()) if (team != null) { val teamLog = TeamLog().apply { this.staff = staff