소스 검색

email reminder to all staff and team

add_swagger
MSI\2Fi 9 달 전
부모
커밋
917593fa43
1개의 변경된 파일13개의 추가작업 그리고 3개의 파일을 삭제
  1. +13
    -3
      src/main/java/com/ffii/tsms/modules/common/mail/service/MailReminderService.kt

+ 13
- 3
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<Long> = staffs.map { it.id as Long }

// val timesheetByIdAndRecord = timesheet.groupBy { it.staff?.id to it.recordDate }


불러오는 중...
취소
저장