| @@ -128,7 +128,7 @@ open class MailReminderService( | |||||
| hours = it["hours"].toString().toDouble() | 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 | val teams = teamRepository.findAll().filter { team -> team.deleted == false | ||||
| // && ( team.code == "WY" || team.code == "TW" || team.code == "CH" || team.code == "MN" || team.code == "MC" ) | // && ( 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() | 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 | val teams = teamRepository.findAll().filter { team -> team.deleted == false | ||||
| // && ( team.code == "WY" || team.code == "TW" || team.code == "CH" || team.code == "MN" || team.code == "MC" ) | // && ( 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 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<Long> = staffs.map { it.id as Long } | val staffIds: List<Long> = staffs.map { it.id as Long } | ||||
| val timesheetByIdAndRecord = timesheet.groupBy { | val timesheetByIdAndRecord = timesheet.groupBy { | ||||
| it.staffId to it.recordDate | it.staffId to it.recordDate | ||||