From 8223d15865a2e91edcf159752e1faf63c1abeebe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lkd9125=28=EC=9D=B4=EA=B2=BD=EB=8F=84=29?= Date: Fri, 17 Nov 2023 17:30:29 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=ED=8F=AC=EB=A7=B7=ED=8C=85=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../statistics/controller/MainStatisticsController.java | 3 ++- .../main/statistics/service/MainStatisticsService.java | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pav-server/src/main/java/com/palnet/biz/api/main/statistics/controller/MainStatisticsController.java b/pav-server/src/main/java/com/palnet/biz/api/main/statistics/controller/MainStatisticsController.java index 63c7177e..89ef0912 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/main/statistics/controller/MainStatisticsController.java +++ b/pav-server/src/main/java/com/palnet/biz/api/main/statistics/controller/MainStatisticsController.java @@ -8,7 +8,6 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import com.palnet.biz.api.comn.response.BasicResponse; @@ -63,6 +62,8 @@ public class MainStatisticsController { }) public ResponseEntity fltStcs(FlightStcsRQ rq, @PathVariable String type){ + log.warn("type => {}", type); + FlightStcsModel result = new FlightStcsModel(); try { diff --git a/pav-server/src/main/java/com/palnet/biz/api/main/statistics/service/MainStatisticsService.java b/pav-server/src/main/java/com/palnet/biz/api/main/statistics/service/MainStatisticsService.java index 47bfada4..256a32a0 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/main/statistics/service/MainStatisticsService.java +++ b/pav-server/src/main/java/com/palnet/biz/api/main/statistics/service/MainStatisticsService.java @@ -96,7 +96,7 @@ public class MainStatisticsService { if(paramStrings.length > 1) throw new NumberFormatException(); result[0] = ""; - result[1] = "%y"; + result[1] = "20%y"; break; default: @@ -189,7 +189,7 @@ public class MainStatisticsService { throw new CustomException(ErrorCode.NON_VALID_PARAMETER, rq.getCate(), rq.getDate()); } - for(FlightStcsValueModel node : resultList){ + for(FlightStcsValueModel node : resultList){ if(node.getName() == null || node.getName().equals("")) node.setName(" "); } @@ -255,7 +255,7 @@ public class MainStatisticsService { result.add(node); } - for(FlightStcsValueModel node : result){ + for(FlightStcsValueModel node : result){ if(node.getName() == null || node.getName().equals("")) node.setName(" "); } @@ -349,7 +349,7 @@ public class MainStatisticsService { throw new CustomException(ErrorCode.NON_VALID_PARAMETER, rq.getCate(), rq.getDate()); } - for(FlightStcsValueModel node : resultList){ + for(FlightStcsValueModel node : resultList){ if(node.getName() == null || node.getName().equals("")) node.setName(" "); } From f961187e2051946970ebd998bed0401a0cc9473f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lkd9125=28=EC=9D=B4=EA=B2=BD=EB=8F=84=29?= Date: Fri, 17 Nov 2023 17:39:28 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EB=B9=84=ED=96=89=EC=8B=A4=EC=A0=81=20top?= =?UTF-8?q?=205=20Value=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java b/pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java index 3fa50410..4d1e14d9 100644 --- a/pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java +++ b/pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java @@ -1722,7 +1722,8 @@ public class FltPlanQueryRepository { List result = query .select( Projections.bean(FlightStcsValueModel.class, - qFltPlanCtrCntrlRel.idntfNum.as("name") // 결과 객체의 프로퍼티 이름을 지정 + qFltPlanCtrCntrlRel.idntfNum.as("name"), // 결과 객체의 프로퍼티 이름을 지정 + qFltPlanBas.planSno.countDistinct().as("value") ) ) .from(qFltPlanCtrCntrlRel)