Merge branch 'develop' of http://gitea.palntour.com/pav/pav-be-kac.git into develop

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<? extends BasicResponse> fltStcs(FlightStcsRQ rq, @PathVariable String type){		
 
+		log.warn("type => {}", type);
+
 		FlightStcsModel result = new FlightStcsModel();
 
 		try {

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(" ");
 		}
 

pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java

@@ -1722,7 +1722,8 @@ public class FltPlanQueryRepository {
         List<FlightStcsValueModel> result = query
                 .select(
                         Projections.bean(FlightStcsValueModel.class,
-                        qFltPlanCtrCntrlRel.idntfNum.as("name") // 결과 객체의 프로퍼티 이름을 지정
+                        qFltPlanCtrCntrlRel.idntfNum.as("name"), // 결과 객체의 프로퍼티 이름을 지정
+                        qFltPlanBas.planSno.countDistinct().as("value")
                 )
                 )
                 .from(qFltPlanCtrCntrlRel)