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 list(AnlsHstryGroupModel rq){ Integer cstmrSno = jwtTokenUtil.getCstmrSnoByToken(); @@ -126,7 +115,13 @@ public class AnlsHstryService { } PageImpl 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());