From 823909fa367c6a07d5c328cc730d4df88042ead8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?leehagjoon=28=EC=9D=B4=ED=95=99=EC=A4=80=29?= Date: Thu, 16 Nov 2023 15:25:23 +0900 Subject: [PATCH] =?UTF-8?q?[=EC=9D=BC=EC=9D=BC=20=EB=B9=84=ED=96=89?= =?UTF-8?q?=ED=9A=9F=EC=88=98=20=ED=98=84=ED=99=A9]=20-=20long=20->=20int?= =?UTF-8?q?=20=ED=83=80=EC=9E=85=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/MainDashFlightNumStcsModel.java | 6 ++--- .../main/dash/service/MainDashService.java | 22 +++++++++---------- .../repository/flt/FltPlanBasRepository.java | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pav-server/src/main/java/com/palnet/biz/api/main/dash/model/MainDashFlightNumStcsModel.java b/pav-server/src/main/java/com/palnet/biz/api/main/dash/model/MainDashFlightNumStcsModel.java index 29cf8009..d191d5dc 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/main/dash/model/MainDashFlightNumStcsModel.java +++ b/pav-server/src/main/java/com/palnet/biz/api/main/dash/model/MainDashFlightNumStcsModel.java @@ -21,13 +21,13 @@ public class MainDashFlightNumStcsModel { private String dateType = ""; @ApiParam(value = "계획",example = "전일(어제), 금일(오늘), 명일(내일) 비행계획서 목록") - private long flightPlan = 0; + private int flightPlan = 0; @ApiParam(value = "비행 완료",example = "전일(어제), 금일(오늘), 명일(내일) 비행완료 목록") - private long completeFlight = 0; + private int completeFlight = 0; @ApiParam(value = "미 비행",example = "전일(어제), 금일(오늘), 명일(내일) 미 비행 목록") - private long notFlight = 0; + private int notFlight = 0; @ApiParam(value = "비고",example = "전일(어제), 금일(오늘), 명일(내일) 비고") private double note = 0; 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 bd84b4ac..05e319ab 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 @@ -383,25 +383,25 @@ public class MainDashService { Instant tomorrowEnd = Instant.now().plus(2, ChronoUnit.DAYS).minus(1, ChronoUnit.SECONDS); // 2. 비행계획서 승인 항목 : 비행계획서 제출기준(승인된 건수로봐도 동일) - long yesterdayCount = fltPlanBasRepository.countByAprvlYnAndAprvlDtBetween("Y", yesterdayStart, yesterdayEnd); - long todayCount = fltPlanBasRepository.countByAprvlYnAndAprvlDtBetween("Y", todayStart, todayEnd); - long tomorrowCount = fltPlanBasRepository.countByAprvlYnAndAprvlDtBetween("Y", tomorrowStart, tomorrowEnd); + int yesterdayCount = fltPlanBasRepository.countByAprvlYnAndAprvlDtBetween("Y", yesterdayStart, yesterdayEnd); + int todayCount = fltPlanBasRepository.countByAprvlYnAndAprvlDtBetween("Y", todayStart, todayEnd); + int tomorrowCount = fltPlanBasRepository.countByAprvlYnAndAprvlDtBetween("Y", tomorrowStart, tomorrowEnd); // 3. 비행 완료 항목 : 실제 비행이 완료된 건수 - long yesterdayCompleteCount = query.completeFlight(yesterdayStart,yesterdayEnd).size(); - long todayCompleteCount = query.completeFlight(todayStart,todayEnd).size(); - long tomorrowCompleteCount = query.completeFlight(tomorrowStart,tomorrowEnd).size(); + int yesterdayCompleteCount = query.completeFlight(yesterdayStart,yesterdayEnd).size(); + int todayCompleteCount = query.completeFlight(todayStart,todayEnd).size(); + int tomorrowCompleteCount = query.completeFlight(tomorrowStart,tomorrowEnd).size(); // 4. 미 비행 항목 : 비행계획서는 제출했으나,실제 비행안한 건수 - long yesterdayNotFlight = query.notFlight(yesterdayStart,yesterdayEnd).size(); - long todayNotFlight = query.notFlight(todayStart, todayEnd).size(); - long tomorrowNotFlight = query.notFlight(tomorrowStart,tomorrowEnd).size(); + int yesterdayNotFlight = query.notFlight(yesterdayStart,yesterdayEnd).size(); + int todayNotFlight = query.notFlight(todayStart, todayEnd).size(); + int tomorrowNotFlight = query.notFlight(tomorrowStart,tomorrowEnd).size(); // 5. 비고 : 비행 완료 건수를 기준으로 상승 또는 하락폭 적용 // ex) 오늘 기준 오늘은 어제의 비행 완료 건수를 비교해서 적용 // 전일(어제)은 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 todayNotePercent = yesterdayCompleteCount != 0 ? ((double)(todayCompleteCount - yesterdayCompleteCount) / yesterdayCompleteCount) * 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; } - 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(); model.setDateType(dateType); model.setFlightPlan(flightPlanCount); 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 5d91b400..90cfc1d4 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 @@ -56,5 +56,5 @@ public interface FltPlanBasRepository extends JpaRepository @Query("SELECT f FROM FltPlanBas f WHERE f.aprvlYn = 'Y' AND f.aprvlDt IS NOT NULL AND f.aprvlDt >= :startDate AND f.aprvlDt < :endDate") List findApprovedFlightPlansByApprovalDate(Instant startDate, Instant endDate); - long countByAprvlYnAndAprvlDtBetween(String aprvlYn, Instant startDate, Instant endDate); + int countByAprvlYnAndAprvlDtBetween(String aprvlYn, Instant startDate, Instant endDate); }