비행건수 계획서 없는데 완료 카운트 되는 현상 수정

pav-server/src/main/java/com/palnet/biz/api/main/dash/controller/MainDashController.java

@@ -43,7 +43,7 @@ public class MainDashController {
 	 * @return
 	 */
 	@GetMapping(value = "/stcs/day")
-	@ApiOperation(value = "일 별 비행건수 통계")
+	@ApiOperation(value = "일 별 비행횟수 통계")
 	@Tag(name = "메인화면 컨트롤러", description = "메인화면 관련 API")
 	@ApiImplicitParam(name = "yyyymm",value = "날짜", dataTypeClass = String.class)
 	public ResponseEntity<? extends BasicResponse> stcsDay(String yyyymm) {
@@ -379,7 +379,7 @@ public class MainDashController {
 
 
 	@GetMapping("/stcs/dailyflight")
-	@ApiOperation(value = "일일 비행횟수 현황")
+	@ApiOperation(value = "일일 비행건수 현황")
 	@Tag(name = "메인화면 컨트롤러",description = "메인화면 관련 API")
 	public ResponseEntity<? extends BasicResponse> getDailyFlightNumOfStcs(){
 		List<MainDashFlightNumStcsModel> result = null;

pav-server/src/main/java/com/palnet/biz/api/main/dash/service/MainDashService.java

@@ -411,24 +411,25 @@ public class MainDashService {
 
 		// 1. 전일 , 금일, 명일(내일)
 		Instant yesterdayStart = Instant.now().minus(1, ChronoUnit.DAYS).truncatedTo(ChronoUnit.DAYS);
-		Instant yesterdayEnd = Instant.now().truncatedTo(ChronoUnit.DAYS).minus(1, ChronoUnit.SECONDS);
+		Instant yesterdayEnd = Instant.now().truncatedTo(ChronoUnit.DAYS);
 		Instant todayStart = Instant.now().truncatedTo(ChronoUnit.DAYS);
-		Instant todayEnd = Instant.now().plus(1, ChronoUnit.DAYS).minus(1, ChronoUnit.SECONDS);
+		Instant todayEnd = Instant.now().plus(1, ChronoUnit.DAYS).truncatedTo(ChronoUnit.DAYS);
 		Instant tomorrowStart = Instant.now().plus(1, ChronoUnit.DAYS).truncatedTo(ChronoUnit.DAYS);
-		Instant tomorrowEnd = Instant.now().plus(2, ChronoUnit.DAYS).minus(1, ChronoUnit.SECONDS);
+		Instant tomorrowEnd = Instant.now().plus(2, ChronoUnit.DAYS).truncatedTo(ChronoUnit.DAYS);
+		Instant tomorrowEnd2 = Instant.now().plus(2, ChronoUnit.DAYS).minus(1, ChronoUnit.SECONDS);
 
 		// 2. 비행계획서 승인 항목 : 비행계획서 제출기준(승인된 건수로봐도 동일)
 		int yesterdayCount = 0;
 		int todayCount = 0;
 		int tomorrowCount = 0;
 		if(serviceType != null && !serviceType.isEmpty()){
-			yesterdayCount = fltPlanBasRepository.countByAprvlYnAndAprvlDtBetweenAndServiceType("Y", yesterdayStart, yesterdayEnd, serviceType);
+			yesterdayCount = fltPlanBasRepository.countByAprvlYnAndSchFltStDtLessThanAndSchFltEndDtGreaterThanEqualAndServiceType("Y", yesterdayEnd, yesterdayStart, serviceType);
-			todayCount = fltPlanBasRepository.countByAprvlYnAndAprvlDtBetweenAndServiceType("Y", todayStart, todayEnd, serviceType);
+			todayCount = fltPlanBasRepository.countByAprvlYnAndSchFltStDtLessThanAndSchFltEndDtGreaterThanEqualAndServiceType("Y", todayEnd, todayStart, serviceType);
-			tomorrowCount = fltPlanBasRepository.countByAprvlYnAndAprvlDtBetweenAndServiceType("Y", tomorrowStart, tomorrowEnd, serviceType);
+			tomorrowCount = fltPlanBasRepository.countByAprvlYnAndSchFltStDtLessThanAndSchFltEndDtGreaterThanEqualAndServiceType("Y", tomorrowEnd, tomorrowStart, serviceType);
 		} else {
-			yesterdayCount = fltPlanBasRepository.countByAprvlYnAndAprvlDtBetween("Y", yesterdayStart, yesterdayEnd);
+			yesterdayCount = fltPlanBasRepository.countByAprvlYnAndSchFltStDtLessThanAndSchFltEndDtGreaterThanEqual("Y", yesterdayEnd, yesterdayStart);
-			todayCount = fltPlanBasRepository.countByAprvlYnAndAprvlDtBetween("Y", todayStart, todayEnd);
+			todayCount = fltPlanBasRepository.countByAprvlYnAndSchFltStDtLessThanAndSchFltEndDtGreaterThanEqual("Y", todayEnd, todayStart);
-			tomorrowCount = fltPlanBasRepository.countByAprvlYnAndAprvlDtBetween("Y", tomorrowStart, tomorrowEnd);
+			tomorrowCount = fltPlanBasRepository.countByAprvlYnAndSchFltStDtLessThanAndSchFltEndDtGreaterThanEqual("Y", tomorrowEnd, tomorrowStart);
 		}
 //		int yesterdayCount = serviceType != null && !serviceType.isEmpty()
 //				? fltPlanBasRepository.countByAprvlYnAndAprvlDtBetweenAndServiceType("Y", yesterdayStart, yesterdayEnd, serviceType);

pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java

@@ -2672,7 +2672,9 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
         builder.and(fpb.aprvlYn.eq("Y"));
         builder.and(fpccr.planSno.isNotNull());
         builder.and(ccb.statusCd.eq("99"));
-        builder.and(ccb.cntrlEndDt.between(start, end));
+//        builder.and(ccb.cntrlEndDt.between(start, end));
+		builder.and(fpb.schFltStDt.lt(end));
+		builder.and(fpb.schFltEndDt.goe(start));
         if (serviceType != null && !serviceType.isEmpty()) builder.and(fpb.serviceType.eq(serviceType));
 
         return query
@@ -2705,7 +2707,9 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
 		builder.and(fpccr.planSno.isNull());
 		builder.and(ccb.statusCd.isNull());
 		builder.and(ccb.cntrlId.isNull());
-		builder.and(fpb.aprvlDt.between(start, end));
+//		builder.and(fpb.aprvlDt.between(start, end));
+		builder.and(fpb.schFltStDt.lt(end));
+		builder.and(fpb.schFltEndDt.goe(start));
 		if (serviceType != null && !serviceType.isEmpty()) builder.and(fpb.serviceType.eq(serviceType));
 
 		return query

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

@@ -60,4 +60,7 @@ public interface FltPlanBasRepository extends JpaRepository<FltPlanBas, Integer>
     int countByAprvlYnAndAprvlDtBetween(String aprvlYn, Instant startDate, Instant endDate);
 
     int countByAprvlYnAndAprvlDtBetweenAndServiceType(String aprvlYn, Instant startDate, Instant endDate, String serviceType);
+
+    int countByAprvlYnAndSchFltStDtLessThanAndSchFltEndDtGreaterThanEqualAndServiceType(String aprvlYn, Instant targetEndDate, Instant targetStDate, String serviceType);
+    int countByAprvlYnAndSchFltStDtLessThanAndSchFltEndDtGreaterThanEqual(String aprvlYn, Instant targetEndDate, Instant targetStDate);
 }