瀏覽代碼

add default value to joinDate

develop
MSI\2Fi 4 月之前
父節點
當前提交
73c3ccd7cf
共有 2 個檔案被更改,包括 3 行新增3 行删除
  1. +2
    -2
      src/main/java/com/ffii/tsms/modules/common/mail/service/MailReminderService.kt
  2. +1
    -1
      src/main/java/com/ffii/tsms/modules/common/mail/web/models/WorkHourRecords.kt

+ 2
- 2
src/main/java/com/ffii/tsms/modules/common/mail/service/MailReminderService.kt 查看文件

@@ -148,7 +148,7 @@ open class MailReminderService(
key.second, // recordDate
key.first, // staffId
records.sumOf { it.hours },
key.third
key.third // joinDate
)
}
val goodStaffsList = filteredLastMonthDays.map { date ->
@@ -237,7 +237,7 @@ open class MailReminderService(
key.second, // recordDate
key.first, // staffId
records.sumOf { it.hours },
key.third
key.third // joinDate
)
}



+ 1
- 1
src/main/java/com/ffii/tsms/modules/common/mail/web/models/WorkHourRecords.kt 查看文件

@@ -12,7 +12,7 @@ data class WorkHourRecordsWithJoinDate(
val staffId: Long,
val recordDate: LocalDate,
val hours: Double,
val joinDate: LocalDate
val joinDate: LocalDate? = LocalDate.of(1970,1,1)
)

data class StaffRecords(


Loading…
取消
儲存