From 2bb0b2cb11910957ce81f57344979a5e0995f4f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lkd9125=28=EC=9D=B4=EA=B2=BD=EB=8F=84=29?= Date: Wed, 15 Nov 2023 16:51:22 +0900 Subject: [PATCH] =?UTF-8?q?=EC=A1=B0=EA=B1=B4=EC=A0=88=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/api/main/dash/controller/MainDashController.java | 6 ++---- .../jpa/repository/ctr/CtrCntrlWarnLogQueryRepository.java | 2 +- .../biz/jpa/repository/flt/FltPlanQueryRepository.java | 2 +- 3 files changed, 4 insertions(+), 6 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 4ce48fd0..751eee05 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 @@ -343,8 +343,7 @@ public class MainDashController { @ApiOperation(value = "일일 비정상상황 통계") @Tag(name = "메인화면 컨트롤러", description = "메인화면 관련 API") @ApiImplicitParams({ - @ApiImplicitParam(name = "date",value = "날짜", dataTypeClass = String.class), - @ApiImplicitParam(name = "type",value = "날짜형식", dataTypeClass = String.class) + @ApiImplicitParam(name = "groupId",value = "그룹아이디", dataTypeClass = String.class) }) public ResponseEntity currentFlightWarn(@RequestParam(required = false) String groupId){ @@ -365,8 +364,7 @@ public class MainDashController { @ApiOperation(value = "일일 비행계획 통계") @Tag(name = "메인화면 컨트롤러", description = "메인화면 관련 API") @ApiImplicitParams({ - @ApiImplicitParam(name = "date",value = "날짜", dataTypeClass = String.class), - @ApiImplicitParam(name = "type",value = "날짜형식", dataTypeClass = String.class) + @ApiImplicitParam(name = "groupId",value = "그룹아이디", dataTypeClass = String.class) }) public ResponseEntity currentFlightPlan(@RequestParam(required = false) String groupId){ diff --git a/pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlWarnLogQueryRepository.java b/pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlWarnLogQueryRepository.java index 4825bda1..2cd4d36e 100644 --- a/pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlWarnLogQueryRepository.java +++ b/pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlWarnLogQueryRepository.java @@ -317,7 +317,7 @@ public class CtrCntrlWarnLogQueryRepository { private BooleanBuilder getCurrentBooleanBuilder(String groupId, boolean authCheck, String cate, QFltPlanBas qFltPlanBas, QCtrCntrlWarnLog qCtrCntrlWarnLog){ BooleanBuilder builder = new BooleanBuilder(); - builder.and(qFltPlanBas.groupId.eq(groupId)); + if(groupId != null && !(groupId.equals("")))builder.and(qFltPlanBas.groupId.eq(groupId)); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); String dateFormat = "%Y-%m-%d"; 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 c36f8063..bb96b935 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 @@ -1888,7 +1888,7 @@ public class FltPlanQueryRepository { private BooleanBuilder getCurrentBooleanBuilder(String groupId, boolean authCheck, String cate, QFltPlanBas qFltPlanBas){ BooleanBuilder builder = new BooleanBuilder(); - builder.and(qFltPlanBas.groupId.eq(groupId)); + if(groupId != null && !(groupId.equals("")))builder.and(qFltPlanBas.groupId.eq(groupId)); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); BooleanExpression dateExpression = null;