From 1e2fe13cdcd2638f615b01ea1ae9dc46115fc254 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dhji=28=EC=A7=80=EB=8C=80=ED=95=9C=29?= Date: Thu, 23 Nov 2023 12:41:18 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B9=84=ED=96=89=EA=B1=B4=EC=88=98=20?= =?UTF-8?q?=EA=B3=84=ED=9A=8D=EC=84=9C=20=EC=97=86=EB=8A=94=EB=8D=B0=20?= =?UTF-8?q?=EC=99=84=EB=A3=8C=20=EC=B9=B4=EC=9A=B4=ED=8A=B8=20=EB=90=98?= =?UTF-8?q?=EB=8A=94=20=ED=98=84=EC=83=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dash/controller/MainDashController.java | 4 ++-- .../main/dash/service/MainDashService.java | 19 ++++++++++--------- .../ctr/CtrCntrlQueryRepository.java | 8 ++++++-- .../repository/flt/FltPlanBasRepository.java | 3 +++ 4 files changed, 21 insertions(+), 13 deletions(-) diff --git a/pav-server/src/main/java/com/palnet/biz/api/main/dash/controller/MainDashController.java b/pav-server/src/main/java/com/palnet/biz/api/main/dash/controller/MainDashController.java index 075dc3c2..d257a759 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/main/dash/controller/MainDashController.java +++ b/pav-server/src/main/java/com/palnet/biz/api/main/dash/controller/MainDashController.java @@ -43,7 +43,7 @@ public class MainDashController { * @return */ @GetMapping(value = "/stcs/day") - @ApiOperation(value = "일 별 비행건수 통계") + @ApiOperation(value = "일 별 비행횟수 통계") @Tag(name = "메인화면 컨트롤러", description = "메인화면 관련 API") @ApiImplicitParam(name = "yyyymm",value = "날짜", dataTypeClass = String.class) public ResponseEntity stcsDay(String yyyymm) { @@ -379,7 +379,7 @@ public class MainDashController { @GetMapping("/stcs/dailyflight") - @ApiOperation(value = "일일 비행횟수 현황") + @ApiOperation(value = "일일 비행건수 현황") @Tag(name = "메인화면 컨트롤러",description = "메인화면 관련 API") public ResponseEntity getDailyFlightNumOfStcs(){ List result = null; diff --git a/pav-server/src/main/java/com/palnet/biz/api/main/dash/service/MainDashService.java b/pav-server/src/main/java/com/palnet/biz/api/main/dash/service/MainDashService.java index 6444eef9..dfe6bae3 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/main/dash/service/MainDashService.java +++ b/pav-server/src/main/java/com/palnet/biz/api/main/dash/service/MainDashService.java @@ -411,24 +411,25 @@ public class MainDashService { // 1. 전일 , 금일, 명일(내일) 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 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 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. 비행계획서 승인 항목 : 비행계획서 제출기준(승인된 건수로봐도 동일) int yesterdayCount = 0; int todayCount = 0; int tomorrowCount = 0; if(serviceType != null && !serviceType.isEmpty()){ - yesterdayCount = fltPlanBasRepository.countByAprvlYnAndAprvlDtBetweenAndServiceType("Y", yesterdayStart, yesterdayEnd, serviceType); - todayCount = fltPlanBasRepository.countByAprvlYnAndAprvlDtBetweenAndServiceType("Y", todayStart, todayEnd, serviceType); - tomorrowCount = fltPlanBasRepository.countByAprvlYnAndAprvlDtBetweenAndServiceType("Y", tomorrowStart, tomorrowEnd, serviceType); + yesterdayCount = fltPlanBasRepository.countByAprvlYnAndSchFltStDtLessThanAndSchFltEndDtGreaterThanEqualAndServiceType("Y", yesterdayEnd, yesterdayStart, serviceType); + todayCount = fltPlanBasRepository.countByAprvlYnAndSchFltStDtLessThanAndSchFltEndDtGreaterThanEqualAndServiceType("Y", todayEnd, todayStart, serviceType); + tomorrowCount = fltPlanBasRepository.countByAprvlYnAndSchFltStDtLessThanAndSchFltEndDtGreaterThanEqualAndServiceType("Y", tomorrowEnd, tomorrowStart, serviceType); } else { - yesterdayCount = fltPlanBasRepository.countByAprvlYnAndAprvlDtBetween("Y", yesterdayStart, yesterdayEnd); - todayCount = fltPlanBasRepository.countByAprvlYnAndAprvlDtBetween("Y", todayStart, todayEnd); - tomorrowCount = fltPlanBasRepository.countByAprvlYnAndAprvlDtBetween("Y", tomorrowStart, tomorrowEnd); + yesterdayCount = fltPlanBasRepository.countByAprvlYnAndSchFltStDtLessThanAndSchFltEndDtGreaterThanEqual("Y", yesterdayEnd, yesterdayStart); + todayCount = fltPlanBasRepository.countByAprvlYnAndSchFltStDtLessThanAndSchFltEndDtGreaterThanEqual("Y", todayEnd, todayStart); + tomorrowCount = fltPlanBasRepository.countByAprvlYnAndSchFltStDtLessThanAndSchFltEndDtGreaterThanEqual("Y", tomorrowEnd, tomorrowStart); } // int yesterdayCount = serviceType != null && !serviceType.isEmpty() // ? fltPlanBasRepository.countByAprvlYnAndAprvlDtBetweenAndServiceType("Y", yesterdayStart, yesterdayEnd, serviceType); diff --git a/pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java b/pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java index af339f3d..a0625e8b 100644 --- a/pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java +++ b/pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java @@ -2672,7 +2672,9 @@ public List listCntrlHstry(String id){ builder.and(fpb.aprvlYn.eq("Y")); builder.and(fpccr.planSno.isNotNull()); builder.and(ccb.statusCd.eq("99")); - builder.and(ccb.cntrlEndDt.between(start, end)); +// builder.and(ccb.cntrlEndDt.between(start, end)); + builder.and(fpb.schFltStDt.lt(end)); + builder.and(fpb.schFltEndDt.goe(start)); if (serviceType != null && !serviceType.isEmpty()) builder.and(fpb.serviceType.eq(serviceType)); return query @@ -2705,7 +2707,9 @@ public List listCntrlHstry(String id){ builder.and(fpccr.planSno.isNull()); builder.and(ccb.statusCd.isNull()); builder.and(ccb.cntrlId.isNull()); - builder.and(fpb.aprvlDt.between(start, end)); +// builder.and(fpb.aprvlDt.between(start, end)); + builder.and(fpb.schFltStDt.lt(end)); + builder.and(fpb.schFltEndDt.goe(start)); if (serviceType != null && !serviceType.isEmpty()) builder.and(fpb.serviceType.eq(serviceType)); return query diff --git a/pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanBasRepository.java b/pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanBasRepository.java index 16d4475c..dfb9198d 100644 --- a/pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanBasRepository.java +++ b/pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanBasRepository.java @@ -60,4 +60,7 @@ public interface FltPlanBasRepository extends JpaRepository int countByAprvlYnAndAprvlDtBetween(String aprvlYn, Instant startDate, Instant endDate); int countByAprvlYnAndAprvlDtBetweenAndServiceType(String aprvlYn, Instant startDate, Instant endDate, String serviceType); + + int countByAprvlYnAndSchFltStDtLessThanAndSchFltEndDtGreaterThanEqualAndServiceType(String aprvlYn, Instant targetEndDate, Instant targetStDate, String serviceType); + int countByAprvlYnAndSchFltStDtLessThanAndSchFltEndDtGreaterThanEqual(String aprvlYn, Instant targetEndDate, Instant targetStDate); }