From 7f62c384ca992a07e7becf2b464faccd238a2a00 Mon Sep 17 00:00:00 2001 From: "MSI\\derek" Date: Tue, 21 Jan 2025 15:27:21 +0800 Subject: [PATCH] exclude 3 staff for email reminder --- .../common/mail/service/MailReminderService.kt | 15 +++------------ 1 file changed, 3 insertions(+), 12 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 6370863..427eeda 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 @@ -128,7 +128,7 @@ open class MailReminderService( hours = it["hours"].toString().toDouble() ) } - val staffs = staffRepository.findAllByEmployTypeAndDeletedFalseAndDepartDateIsNull(FULLTIME) + val staffs = staffRepository.findAllByEmployTypeAndDeletedFalseAndDepartDateIsNull(FULLTIME).filter { it.staffId != "A003" && it.staffId != "A004" && it.staffId != "B011" } val teams = teamRepository.findAll().filter { team -> team.deleted == false // && ( team.code == "WY" || team.code == "TW" || team.code == "CH" || team.code == "MN" || team.code == "MC" ) } @@ -202,7 +202,7 @@ open class MailReminderService( hours = it["hours"].toString().toDouble() ) } - val staffs = staffRepository.findAllByEmployTypeAndDeletedFalseAndDepartDateIsNull(FULLTIME) + val staffs = staffRepository.findAllByEmployTypeAndDeletedFalseAndDepartDateIsNull(FULLTIME).filter { it.staffId != "A003" && it.staffId != "A004" && it.staffId != "B011" } val teams = teamRepository.findAll().filter { team -> team.deleted == false // && ( team.code == "WY" || team.code == "TW" || team.code == "CH" || team.code == "MN" || team.code == "MC" ) } @@ -307,16 +307,7 @@ 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" || -// staff?.team?.code == "MN" || -// staff?.team?.code == "MC" || -// staff?.team?.code == "CH" -// } // FT? FT? etc -// val staffs = staffRepository.findAllByEmployTypeAndDeletedFalseAndDepartDateIsNull(FULLTIME) + val staffs = staffRepository.findAllByEmployTypeAndDeletedFalseAndDepartDateIsNull(FULLTIME).filter { it.staffId != "A003" && it.staffId != "A004" && it.staffId != "B011" } val staffIds: List = staffs.map { it.id as Long } val timesheetByIdAndRecord = timesheet.groupBy { it.staffId to it.recordDate