조건절 변경

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 = "groupId",value = "그룹아이디", dataTypeClass = String.class)
-			@ApiImplicitParam(name = "type",value = "날짜형식", dataTypeClass = String.class)
 	})
 	public ResponseEntity<? extends BasicResponse> 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 = "groupId",value = "그룹아이디", dataTypeClass = String.class)
-			@ApiImplicitParam(name = "type",value = "날짜형식", dataTypeClass = String.class)
 	})
 	public ResponseEntity<? extends BasicResponse> currentFlightPlan(@RequestParam(required = false) String groupId){
 

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";

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;