|
|
|
@ -304,27 +304,18 @@ public class MainDashService {
|
|
|
|
|
|
|
|
|
|
// 2. 비행계획서 승인 항목 : 비행계획서 제출기준(승인된 건수로봐도 동일)
|
|
|
|
|
long yesterdayCount = fltPlanBasRepository.countByAprvlYnAndAprvlDtBetween("Y", yesterdayStart, yesterdayEnd); |
|
|
|
|
log.info("yesterdayCount: {}", yesterdayCount); |
|
|
|
|
long todayCount = fltPlanBasRepository.countByAprvlYnAndAprvlDtBetween("Y", todayStart, todayEnd); |
|
|
|
|
log.info("todayCount: {}", todayCount); |
|
|
|
|
long tomorrowCount = fltPlanBasRepository.countByAprvlYnAndAprvlDtBetween("Y", tomorrowStart, tomorrowEnd); |
|
|
|
|
log.info("tomorrowCount: {}", tomorrowCount); |
|
|
|
|
|
|
|
|
|
// 3. 비행 완료 항목 : 실제 비행이 완료된 건수
|
|
|
|
|
long yesterdayCompleteCount = query.completeFlight(yesterdayStart,yesterdayEnd).size(); |
|
|
|
|
log.info("yesterdayCompleteCount: {}", yesterdayCompleteCount); |
|
|
|
|
long todayCompleteCount = query.completeFlight(todayStart,todayEnd).size(); |
|
|
|
|
log.info("todayCompleteCount: {}", todayCompleteCount); |
|
|
|
|
long tomorrowCompleteCount = query.completeFlight(tomorrowStart,tomorrowEnd).size(); |
|
|
|
|
log.info("tomorrowCompleteCount: {}", tomorrowCompleteCount); |
|
|
|
|
|
|
|
|
|
// 4. 미 비행 항목 : 비행계획서는 제출했으나,실제 비행안한 건수
|
|
|
|
|
long yesterdayNotFlight = query.notFlight(yesterdayStart,yesterdayEnd).size(); |
|
|
|
|
log.info("yesterdayNotFlight : {} ", yesterdayNotFlight); |
|
|
|
|
long todayNotFlight = query.notFlight(todayStart, todayEnd).size(); |
|
|
|
|
log.info("todayNotFlight : {} ", todayNotFlight); |
|
|
|
|
long tomorrowNotFlight = query.notFlight(tomorrowStart,tomorrowEnd).size(); |
|
|
|
|
log.info("tomorrowNotFlight : {} ", tomorrowNotFlight); |
|
|
|
|
|
|
|
|
|
// 5. 비고 : 비행 완료 건수를 기준으로 상승 또는 하락폭 적용
|
|
|
|
|
// ex) 오늘 기준 오늘은 어제의 비행 완료 건수를 비교해서 적용
|
|
|
|
@ -332,11 +323,8 @@ public class MainDashService {
|
|
|
|
|
// 명일(내일)은 오늘 비행 완료 건수를 비교해서 적용
|
|
|
|
|
long yesterdayNote = yesterdayCompleteCount - query.completeFlight(yesterdayStart.minus(1, ChronoUnit.DAYS), yesterdayEnd.minus(1, ChronoUnit.DAYS)).size(); |
|
|
|
|
double yesterdayNotePercent = yesterdayCompleteCount != 0 ? ((double) yesterdayNote / yesterdayCompleteCount) * 100.0 : 0.0; |
|
|
|
|
log.info("yesterdayNotePercent: {} ", yesterdayNotePercent); |
|
|
|
|
double todayNotePercent = yesterdayCompleteCount != 0 ? ((double)(todayCompleteCount - yesterdayCompleteCount) / yesterdayCompleteCount) * 100.0 : 0.0; |
|
|
|
|
log.info("todayNotePercent: {} ", todayNotePercent); |
|
|
|
|
double tomorrowNotePercent = todayCompleteCount != 0 ? ((double) (tomorrowCompleteCount - todayCompleteCount) / todayCompleteCount) * 100.0 : 0.0; |
|
|
|
|
log.info("tomorrowNotePercent: {} ", tomorrowNotePercent); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|