|
|
@ -411,24 +411,25 @@ public class MainDashService { |
|
|
|
|
|
|
|
|
|
|
|
// 1. 전일 , 금일, 명일(내일)
|
|
|
|
// 1. 전일 , 금일, 명일(내일)
|
|
|
|
Instant yesterdayStart = Instant.now().minus(1, ChronoUnit.DAYS).truncatedTo(ChronoUnit.DAYS); |
|
|
|
Instant yesterdayStart = Instant.now().minus(1, ChronoUnit.DAYS).truncatedTo(ChronoUnit.DAYS); |
|
|
|
Instant yesterdayEnd = Instant.now().truncatedTo(ChronoUnit.DAYS).minus(1, ChronoUnit.SECONDS); |
|
|
|
Instant yesterdayEnd = Instant.now().truncatedTo(ChronoUnit.DAYS); |
|
|
|
Instant todayStart = Instant.now().truncatedTo(ChronoUnit.DAYS); |
|
|
|
Instant todayStart = Instant.now().truncatedTo(ChronoUnit.DAYS); |
|
|
|
Instant todayEnd = Instant.now().plus(1, ChronoUnit.DAYS).minus(1, ChronoUnit.SECONDS); |
|
|
|
Instant todayEnd = Instant.now().plus(1, ChronoUnit.DAYS).truncatedTo(ChronoUnit.DAYS); |
|
|
|
Instant tomorrowStart = Instant.now().plus(1, ChronoUnit.DAYS).truncatedTo(ChronoUnit.DAYS); |
|
|
|
Instant tomorrowStart = Instant.now().plus(1, ChronoUnit.DAYS).truncatedTo(ChronoUnit.DAYS); |
|
|
|
Instant tomorrowEnd = Instant.now().plus(2, ChronoUnit.DAYS).minus(1, ChronoUnit.SECONDS); |
|
|
|
Instant tomorrowEnd = Instant.now().plus(2, ChronoUnit.DAYS).truncatedTo(ChronoUnit.DAYS); |
|
|
|
|
|
|
|
Instant tomorrowEnd2 = Instant.now().plus(2, ChronoUnit.DAYS).minus(1, ChronoUnit.SECONDS); |
|
|
|
|
|
|
|
|
|
|
|
// 2. 비행계획서 승인 항목 : 비행계획서 제출기준(승인된 건수로봐도 동일)
|
|
|
|
// 2. 비행계획서 승인 항목 : 비행계획서 제출기준(승인된 건수로봐도 동일)
|
|
|
|
int yesterdayCount = 0; |
|
|
|
int yesterdayCount = 0; |
|
|
|
int todayCount = 0; |
|
|
|
int todayCount = 0; |
|
|
|
int tomorrowCount = 0; |
|
|
|
int tomorrowCount = 0; |
|
|
|
if(serviceType != null && !serviceType.isEmpty()){ |
|
|
|
if(serviceType != null && !serviceType.isEmpty()){ |
|
|
|
yesterdayCount = fltPlanBasRepository.countByAprvlYnAndAprvlDtBetweenAndServiceType("Y", yesterdayStart, yesterdayEnd, serviceType); |
|
|
|
yesterdayCount = fltPlanBasRepository.countByAprvlYnAndSchFltStDtLessThanAndSchFltEndDtGreaterThanEqualAndServiceType("Y", yesterdayEnd, yesterdayStart, serviceType); |
|
|
|
todayCount = fltPlanBasRepository.countByAprvlYnAndAprvlDtBetweenAndServiceType("Y", todayStart, todayEnd, serviceType); |
|
|
|
todayCount = fltPlanBasRepository.countByAprvlYnAndSchFltStDtLessThanAndSchFltEndDtGreaterThanEqualAndServiceType("Y", todayEnd, todayStart, serviceType); |
|
|
|
tomorrowCount = fltPlanBasRepository.countByAprvlYnAndAprvlDtBetweenAndServiceType("Y", tomorrowStart, tomorrowEnd, serviceType); |
|
|
|
tomorrowCount = fltPlanBasRepository.countByAprvlYnAndSchFltStDtLessThanAndSchFltEndDtGreaterThanEqualAndServiceType("Y", tomorrowEnd, tomorrowStart, serviceType); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
yesterdayCount = fltPlanBasRepository.countByAprvlYnAndAprvlDtBetween("Y", yesterdayStart, yesterdayEnd); |
|
|
|
yesterdayCount = fltPlanBasRepository.countByAprvlYnAndSchFltStDtLessThanAndSchFltEndDtGreaterThanEqual("Y", yesterdayEnd, yesterdayStart); |
|
|
|
todayCount = fltPlanBasRepository.countByAprvlYnAndAprvlDtBetween("Y", todayStart, todayEnd); |
|
|
|
todayCount = fltPlanBasRepository.countByAprvlYnAndSchFltStDtLessThanAndSchFltEndDtGreaterThanEqual("Y", todayEnd, todayStart); |
|
|
|
tomorrowCount = fltPlanBasRepository.countByAprvlYnAndAprvlDtBetween("Y", tomorrowStart, tomorrowEnd); |
|
|
|
tomorrowCount = fltPlanBasRepository.countByAprvlYnAndSchFltStDtLessThanAndSchFltEndDtGreaterThanEqual("Y", tomorrowEnd, tomorrowStart); |
|
|
|
} |
|
|
|
} |
|
|
|
// int yesterdayCount = serviceType != null && !serviceType.isEmpty()
|
|
|
|
// int yesterdayCount = serviceType != null && !serviceType.isEmpty()
|
|
|
|
// ? fltPlanBasRepository.countByAprvlYnAndAprvlDtBetweenAndServiceType("Y", yesterdayStart, yesterdayEnd, serviceType);
|
|
|
|
// ? fltPlanBasRepository.countByAprvlYnAndAprvlDtBetweenAndServiceType("Y", yesterdayStart, yesterdayEnd, serviceType);
|
|
|
|