From c0e5634f3c1fc1d198ef92e0068462727f00f403 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?hagjoon=28=EC=9D=B4=ED=95=99=EC=A4=80=29?=
 <dlgkrwns@palnet.co.kr>
Date: Mon, 17 Oct 2022 11:04:39 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B9=84=ED=96=89=EC=9D=B4=EB=A0=A5=ED=98=84?=
 =?UTF-8?q?=ED=99=A9=20-=20=EC=8B=9D=EB=B3=84=EB=B2=88=ED=98=B8=20"PALDRON?=
 =?UTF-8?q?E"=20=EC=88=A8=EA=B9=80=20=EB=B0=8F=20=EC=B6=9C=EB=A0=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anls/hstry/service/AnlsHstryService.java  | 21 +++++++------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/palnet/biz/api/anls/hstry/service/AnlsHstryService.java b/src/main/java/com/palnet/biz/api/anls/hstry/service/AnlsHstryService.java
index a9c92f3..e41454f 100644
--- a/src/main/java/com/palnet/biz/api/anls/hstry/service/AnlsHstryService.java
+++ b/src/main/java/com/palnet/biz/api/anls/hstry/service/AnlsHstryService.java
@@ -1,14 +1,9 @@
 package com.palnet.biz.api.anls.hstry.service;
 
 import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
-import com.palnet.biz.api.comn.model.ComnPagingModel;
 import com.palnet.biz.api.comn.model.ComnPagingRs;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -25,15 +20,10 @@ import com.palnet.biz.api.acnt.jwt.utils.JwtTokenUtil;
 import com.palnet.biz.api.anls.hstry.model.AnlsHstryDetailModel;
 import com.palnet.biz.api.anls.hstry.model.AnlsHstryGroupModel;
 import com.palnet.biz.api.anls.hstry.model.AnlsHstryModel;
-import com.palnet.biz.api.anls.hstry.model.AnlsHstryRqModel;
-import com.palnet.biz.api.anls.hstry.model.AnlsHstryRsModel;
-import com.palnet.biz.jpa.entity.ComArcrftBas;
 import com.palnet.biz.jpa.entity.ComIdntfBas;
 import com.palnet.biz.jpa.entity.CtrCntrlBas;
-import com.palnet.biz.jpa.entity.CtrCntrlHstryArea;
 import com.palnet.biz.jpa.entity.FltPlanBas;
 import com.palnet.biz.jpa.entity.FltPlanPilot;
-import com.palnet.biz.jpa.entity.PtyCstmrGroup;
 import com.palnet.biz.jpa.repository.com.ComArcrftBasRepository;
 import com.palnet.biz.jpa.repository.com.ComIdntBasRepository;
 import com.palnet.biz.jpa.repository.ctr.CtrCntrlBasRepository;
@@ -44,7 +34,6 @@ import com.palnet.biz.jpa.repository.flt.FltPlanPilotRepository;
 import com.palnet.biz.jpa.repository.pty.PtyCstmrGroupRepository;
 import com.palnet.comn.code.ErrorCode;
 import com.palnet.comn.exception.CustomException;
-import com.palnet.comn.utils.DateUtils;
 
 @Service
 public class AnlsHstryService {
@@ -77,7 +66,7 @@ public class AnlsHstryService {
 	
 	@Autowired
 	private  JwtTokenUtil jwtTokenUtil;
-	
+
 	//비행이력현황 list
 	public ComnPagingRs<AnlsHstryModel> list(AnlsHstryGroupModel rq){
 		Integer cstmrSno = jwtTokenUtil.getCstmrSnoByToken();
@@ -126,7 +115,13 @@ public class AnlsHstryService {
 		} 
 				
 		PageImpl<AnlsHstryModel> result = query.listCntrlBasRs(rq, pageable);
-		
+
+		for(AnlsHstryModel model : result){
+			if(model.getIdntfNum().contains("PALDRONE")){
+				model.setIdntfNum(model.getIdntfNum().substring(9));
+			}
+		}
+
 		long total = query.countCntrlBasRs(rq, cstmrSno);
 		long totalPage = total % rq.getRecord() > 0 ? (total/rq.getRecord()) + 1 : total/rq.getRecord();
 		response.setItems(result.getContent());