|
|
@ -383,25 +383,25 @@ public class MainDashService { |
|
|
|
Instant tomorrowEnd = Instant.now().plus(2, ChronoUnit.DAYS).minus(1, ChronoUnit.SECONDS); |
|
|
|
Instant tomorrowEnd = Instant.now().plus(2, ChronoUnit.DAYS).minus(1, ChronoUnit.SECONDS); |
|
|
|
|
|
|
|
|
|
|
|
// 2. 비행계획서 승인 항목 : 비행계획서 제출기준(승인된 건수로봐도 동일)
|
|
|
|
// 2. 비행계획서 승인 항목 : 비행계획서 제출기준(승인된 건수로봐도 동일)
|
|
|
|
long yesterdayCount = fltPlanBasRepository.countByAprvlYnAndAprvlDtBetween("Y", yesterdayStart, yesterdayEnd); |
|
|
|
int yesterdayCount = fltPlanBasRepository.countByAprvlYnAndAprvlDtBetween("Y", yesterdayStart, yesterdayEnd); |
|
|
|
long todayCount = fltPlanBasRepository.countByAprvlYnAndAprvlDtBetween("Y", todayStart, todayEnd); |
|
|
|
int todayCount = fltPlanBasRepository.countByAprvlYnAndAprvlDtBetween("Y", todayStart, todayEnd); |
|
|
|
long tomorrowCount = fltPlanBasRepository.countByAprvlYnAndAprvlDtBetween("Y", tomorrowStart, tomorrowEnd); |
|
|
|
int tomorrowCount = fltPlanBasRepository.countByAprvlYnAndAprvlDtBetween("Y", tomorrowStart, tomorrowEnd); |
|
|
|
|
|
|
|
|
|
|
|
// 3. 비행 완료 항목 : 실제 비행이 완료된 건수
|
|
|
|
// 3. 비행 완료 항목 : 실제 비행이 완료된 건수
|
|
|
|
long yesterdayCompleteCount = query.completeFlight(yesterdayStart,yesterdayEnd).size(); |
|
|
|
int yesterdayCompleteCount = query.completeFlight(yesterdayStart,yesterdayEnd).size(); |
|
|
|
long todayCompleteCount = query.completeFlight(todayStart,todayEnd).size(); |
|
|
|
int todayCompleteCount = query.completeFlight(todayStart,todayEnd).size(); |
|
|
|
long tomorrowCompleteCount = query.completeFlight(tomorrowStart,tomorrowEnd).size(); |
|
|
|
int tomorrowCompleteCount = query.completeFlight(tomorrowStart,tomorrowEnd).size(); |
|
|
|
|
|
|
|
|
|
|
|
// 4. 미 비행 항목 : 비행계획서는 제출했으나,실제 비행안한 건수
|
|
|
|
// 4. 미 비행 항목 : 비행계획서는 제출했으나,실제 비행안한 건수
|
|
|
|
long yesterdayNotFlight = query.notFlight(yesterdayStart,yesterdayEnd).size(); |
|
|
|
int yesterdayNotFlight = query.notFlight(yesterdayStart,yesterdayEnd).size(); |
|
|
|
long todayNotFlight = query.notFlight(todayStart, todayEnd).size(); |
|
|
|
int todayNotFlight = query.notFlight(todayStart, todayEnd).size(); |
|
|
|
long tomorrowNotFlight = query.notFlight(tomorrowStart,tomorrowEnd).size(); |
|
|
|
int tomorrowNotFlight = query.notFlight(tomorrowStart,tomorrowEnd).size(); |
|
|
|
|
|
|
|
|
|
|
|
// 5. 비고 : 비행 완료 건수를 기준으로 상승 또는 하락폭 적용
|
|
|
|
// 5. 비고 : 비행 완료 건수를 기준으로 상승 또는 하락폭 적용
|
|
|
|
// ex) 오늘 기준 오늘은 어제의 비행 완료 건수를 비교해서 적용
|
|
|
|
// ex) 오늘 기준 오늘은 어제의 비행 완료 건수를 비교해서 적용
|
|
|
|
// 전일(어제)은 2일전 비행 완료 건수를 비교해서 적용
|
|
|
|
// 전일(어제)은 2일전 비행 완료 건수를 비교해서 적용
|
|
|
|
// 명일(내일)은 오늘 비행 완료 건수를 비교해서 적용
|
|
|
|
// 명일(내일)은 오늘 비행 완료 건수를 비교해서 적용
|
|
|
|
long yesterdayNote = yesterdayCompleteCount - query.completeFlight(yesterdayStart.minus(1, ChronoUnit.DAYS), yesterdayEnd.minus(1, ChronoUnit.DAYS)).size(); |
|
|
|
int 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; |
|
|
|
double yesterdayNotePercent = yesterdayCompleteCount != 0 ? ((double) yesterdayNote / yesterdayCompleteCount) * 100.0 : 0.0; |
|
|
|
double todayNotePercent = yesterdayCompleteCount != 0 ? ((double)(todayCompleteCount - yesterdayCompleteCount) / yesterdayCompleteCount) * 100.0 : 0.0; |
|
|
|
double todayNotePercent = yesterdayCompleteCount != 0 ? ((double)(todayCompleteCount - yesterdayCompleteCount) / yesterdayCompleteCount) * 100.0 : 0.0; |
|
|
|
double tomorrowNotePercent = todayCompleteCount != 0 ? ((double) (tomorrowCompleteCount - todayCompleteCount) / todayCompleteCount) * 100.0 : 0.0; |
|
|
|
double tomorrowNotePercent = todayCompleteCount != 0 ? ((double) (tomorrowCompleteCount - todayCompleteCount) / todayCompleteCount) * 100.0 : 0.0; |
|
|
@ -416,7 +416,7 @@ public class MainDashService { |
|
|
|
return result; |
|
|
|
return result; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private MainDashFlightNumStcsModel createModel(String dateType, long flightPlanCount, long completeCount, long notFlight, double note) { |
|
|
|
private MainDashFlightNumStcsModel createModel(String dateType, int flightPlanCount, int completeCount, int notFlight, double note) { |
|
|
|
MainDashFlightNumStcsModel model = new MainDashFlightNumStcsModel(); |
|
|
|
MainDashFlightNumStcsModel model = new MainDashFlightNumStcsModel(); |
|
|
|
model.setDateType(dateType); |
|
|
|
model.setDateType(dateType); |
|
|
|
model.setFlightPlan(flightPlanCount); |
|
|
|
model.setFlightPlan(flightPlanCount); |
|
|
|