From 917593fa43f9162c5a375c41ac5c75fab04c292c Mon Sep 17 00:00:00 2001 From: "MSI\\2Fi" Date: Mon, 11 Nov 2024 09:55:05 +0800 Subject: [PATCH] email reminder to all staff and team --- .../common/mail/service/MailReminderService.kt | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/ffii/tsms/modules/common/mail/service/MailReminderService.kt b/src/main/java/com/ffii/tsms/modules/common/mail/service/MailReminderService.kt index f3784bc..8e0de40 100644 --- a/src/main/java/com/ffii/tsms/modules/common/mail/service/MailReminderService.kt +++ b/src/main/java/com/ffii/tsms/modules/common/mail/service/MailReminderService.kt @@ -135,7 +135,8 @@ open class MailReminderService( } // val timesheet = timesheetRepository.findByDeletedFalseAndRecordDateBetweenOrderByRecordDate(filteredLastMonthDays.first(),filteredLastMonthDays.last()) val staffs = staffRepository.findAllByEmployTypeAndDeletedFalseAndDepartDateIsNull(FULLTIME) - val teams = teamRepository.findAll().filter { team -> team.deleted == false && ( team.code == "WY" || team.code == "TW") } + val teams = teamRepository.findAll().filter { team -> team.deleted == false && ( team.code == "WY" || team.code == "TW" || team.code == "CH" || team.code == "MN" || team.code == "MC" ) } +// val teams = teamRepository.findAll().filter { team -> team.deleted == false } for (team in teams) { // if (team.id?.toInt() != 5) continue // remove this when finishes @@ -224,7 +225,8 @@ open class MailReminderService( } // val timesheet = timesheetRepository.findByDeletedFalseAndRecordDateBetweenOrderByRecordDate(firstDay, today) val staffs = staffRepository.findAllByEmployTypeAndDeletedFalseAndDepartDateIsNull(FULLTIME) - val teams = teamRepository.findAll().filter { team -> team.deleted == false && ( team.code == "WY" || team.code == "TW" )} + val teams = teamRepository.findAll().filter { team -> team.deleted == false && ( team.code == "WY" || team.code == "TW" || team.code == "CH" || team.code == "MN" || team.code == "MC" )} +// val teams = teamRepository.findAll().filter { team -> team.deleted == false } val dateList = generateSequence(firstDay) { it.plusDays(1) } .takeWhile { it <= today } @@ -333,7 +335,15 @@ open class MailReminderService( ) } // val timesheet = timesheetRepository.findByDeletedFalseAndRecordDateBetweenOrderByRecordDate(sevenDaysBefore, fourDaysBefore) - val staffs = staffRepository.findAllByEmployTypeAndDeletedFalseAndDepartDateIsNull(FULLTIME).filter { staff: Staff? -> staff?.team?.code == "WY" || staff?.team?.code == "TW" } // FT? FT? etc + val staffs = staffRepository.findAllByEmployTypeAndDeletedFalseAndDepartDateIsNull(FULLTIME).filter { + staff: Staff? -> + staff?.team?.code == "WY" || + staff?.team?.code == "TW" || + staff?.team?.code == "MN" || + staff?.team?.code == "MC" || + staff?.team?.code == "CH" + } // FT? FT? etc +// val staffs = staffRepository.findAllByEmployTypeAndDeletedFalseAndDepartDateIsNull(FULLTIME) val staffIds: List = staffs.map { it.id as Long } // val timesheetByIdAndRecord = timesheet.groupBy { it.staff?.id to it.recordDate }