Преглед на файлове

filter Team HO for email

(cherry picked from commit b10788b806)
develop
MSI\derek преди 7 месеца
родител
ревизия
d7d40a3a22
променени са 1 файла, в които са добавени 3 реда и са изтрити 3 реда
  1. +3
    -3
      src/main/java/com/ffii/tsms/modules/common/mail/service/MailReminderService.kt

+ 3
- 3
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).filter { it.staffId != "A003" && it.staffId != "A004" && it.staffId != "B011" }
val staffs = staffRepository.findAllByEmployTypeAndDeletedFalseAndDepartDateIsNull(FULLTIME).filter { it.staffId != "A003" && it.staffId != "A004" && it.staffId != "B011" }.filter{ it.team.code != "HO"}
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).filter { it.staffId != "A003" && it.staffId != "A004" && it.staffId != "B011" }
val staffs = staffRepository.findAllByEmployTypeAndDeletedFalseAndDepartDateIsNull(FULLTIME).filter { it.staffId != "A003" && it.staffId != "A004" && it.staffId != "B011" }.filter{ it.team.code != "HO"}
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,7 +307,7 @@ open class MailReminderService(
)
}
// val timesheet = timesheetRepository.findByDeletedFalseAndRecordDateBetweenOrderByRecordDate(sevenDaysBefore, fourDaysBefore)
val staffs = staffRepository.findAllByEmployTypeAndDeletedFalseAndDepartDateIsNull(FULLTIME).filter { it.staffId != "A003" && it.staffId != "A004" && it.staffId != "B011" }
val staffs = staffRepository.findAllByEmployTypeAndDeletedFalseAndDepartDateIsNull(FULLTIME).filter { it.staffId != "A003" && it.staffId != "A004" && it.staffId != "B011" }.filter{ it.team.code != "HO"}
val staffIds: List<Long> = staffs.map { it.id as Long }
val timesheetByIdAndRecord = timesheet.groupBy {
it.staffId to it.recordDate


Зареждане…
Отказ
Запис