|
|
|
@ -31,12 +31,16 @@ import com.palnet.biz.api.ctr.cntrl.model.CtrCntrlDtlModel;
|
|
|
|
|
import com.palnet.biz.api.ctr.cntrl.model.CtrCntrlEndModel; |
|
|
|
|
import com.palnet.biz.api.main.dash.model.MainDashStcsModel; |
|
|
|
|
import com.palnet.biz.jpa.entity.ComArcrftBas; |
|
|
|
|
import com.palnet.biz.jpa.entity.ComIdntfBas; |
|
|
|
|
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.QComArcrftBas; |
|
|
|
|
import com.palnet.biz.jpa.entity.QComIdntfBas; |
|
|
|
|
import com.palnet.biz.jpa.entity.QCtrCntrlBas; |
|
|
|
|
import com.palnet.biz.jpa.entity.QCtrCntrlHstry; |
|
|
|
|
import com.palnet.biz.jpa.entity.QCtrCntrlHstryArea; |
|
|
|
|
import com.palnet.biz.jpa.entity.QFltPlanBas; |
|
|
|
|
import com.palnet.biz.jpa.entity.QFltPlanCtrCntrlRel; |
|
|
|
|
import com.palnet.biz.jpa.entity.QPtyCstmrBas; |
|
|
|
|
import com.palnet.biz.jpa.entity.QPtyCstmrGroup; |
|
|
|
@ -171,7 +175,6 @@ public class CtrCntrlQueryRepository{
|
|
|
|
|
BooleanBuilder builder = new BooleanBuilder(); |
|
|
|
|
|
|
|
|
|
builder.and(qCntrlBasEntity.statusCd.eq("99")); |
|
|
|
|
log.debug("Params ===> " +rq.toString()); |
|
|
|
|
Calendar end = Calendar.getInstance(); |
|
|
|
|
end.setTime(DateUtils.stringToDate(rq.getEndDate())); |
|
|
|
|
end.add(Calendar.DATE, 1); |
|
|
|
@ -256,12 +259,17 @@ public class CtrCntrlQueryRepository{
|
|
|
|
|
|
|
|
|
|
return result; |
|
|
|
|
} |
|
|
|
|
public List<AnlsHstryModel> cntrlBasNormalHstryList(AnlsHstryGroupModel rq, String idntfNum){ |
|
|
|
|
public List<AnlsHstryModel> cntrlBasNormalHstryList(AnlsHstryGroupModel rq, List<ComIdntfBas> idntfList, List<FltPlanBas> basResult, List<FltPlanBas> pilotResult){ |
|
|
|
|
|
|
|
|
|
QCtrCntrlBas qCntrlBasEntity = QCtrCntrlBas.ctrCntrlBas; |
|
|
|
|
QCtrCntrlHstryArea qCntrlHstryAreaEntity = QCtrCntrlHstryArea.ctrCntrlHstryArea; |
|
|
|
|
QFltPlanCtrCntrlRel qFltPlanCtrCntrlRelEntity = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; |
|
|
|
|
QFltPlanBas qFltPlanBasEntity = QFltPlanBas.fltPlanBas; |
|
|
|
|
|
|
|
|
|
BooleanBuilder builder = new BooleanBuilder(); |
|
|
|
|
BooleanBuilder idntfBuilder = new BooleanBuilder(); |
|
|
|
|
BooleanBuilder basBuilder = new BooleanBuilder(); |
|
|
|
|
BooleanBuilder pilotBuilder = new BooleanBuilder(); |
|
|
|
|
|
|
|
|
|
Calendar end = Calendar.getInstance(); |
|
|
|
|
end.setTime(DateUtils.stringToDate(rq.getEndDate())); |
|
|
|
@ -271,7 +279,16 @@ public List<AnlsHstryModel> cntrlBasNormalHstryList(AnlsHstryGroupModel rq, Stri
|
|
|
|
|
builder.and(qCntrlBasEntity.cntrlEndDt.before(endDate)); |
|
|
|
|
|
|
|
|
|
builder.and(qCntrlBasEntity.statusCd.eq("99")); |
|
|
|
|
builder.and(qCntrlBasEntity.idntfNum.eq(idntfNum)); |
|
|
|
|
for(ComIdntfBas list : idntfList) { |
|
|
|
|
idntfBuilder.and(qCntrlBasEntity.idntfNum.eq(list.getIdntfNum())); |
|
|
|
|
} |
|
|
|
|
for(FltPlanBas list : basResult) { |
|
|
|
|
basBuilder.and(qFltPlanCtrCntrlRelEntity.planSno.eq(list.getPlanSno())); |
|
|
|
|
} |
|
|
|
|
for(FltPlanBas list : pilotResult) { |
|
|
|
|
pilotBuilder.and(qFltPlanCtrCntrlRelEntity.planSno.eq(list.getPlanSno())); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if(!StringUtils.isEmpty(rq.getSearch1())) { |
|
|
|
|
builder.and(qCntrlBasEntity.idntfNum.like("%" + rq.getSearch1() + "%")); |
|
|
|
|
} |
|
|
|
@ -313,7 +330,15 @@ public List<AnlsHstryModel> cntrlBasNormalHstryList(AnlsHstryGroupModel rq, Stri
|
|
|
|
|
.leftJoin(qCntrlHstryAreaEntity) |
|
|
|
|
.on(qCntrlBasEntity.cntrlId.eq(qCntrlHstryAreaEntity.cntrlId)) |
|
|
|
|
.on(qCntrlHstryAreaEntity.actnType.eq("01")) |
|
|
|
|
.where(builder) |
|
|
|
|
.leftJoin(qFltPlanCtrCntrlRelEntity) |
|
|
|
|
.on(qCntrlBasEntity.cntrlId.eq(qFltPlanCtrCntrlRelEntity.cntrlId)) |
|
|
|
|
.leftJoin(qFltPlanBasEntity) |
|
|
|
|
.on(qFltPlanCtrCntrlRelEntity.planSno.eq(qFltPlanBasEntity.planSno)) |
|
|
|
|
.where((builder) |
|
|
|
|
.and( |
|
|
|
|
(idntfBuilder) |
|
|
|
|
.or(basBuilder) |
|
|
|
|
.or(pilotBuilder))) |
|
|
|
|
.orderBy(qCntrlBasEntity.cntrlStDt.asc()) |
|
|
|
|
.fetch(); |
|
|
|
|
|
|
|
|
@ -355,7 +380,6 @@ public List<AnlsHstryModel> cntrlBasNormalHstryList(AnlsHstryGroupModel rq, Stri
|
|
|
|
|
|
|
|
|
|
BooleanBuilder builder = new BooleanBuilder(); |
|
|
|
|
|
|
|
|
|
log.debug("Params ===> " +rq.toString()); |
|
|
|
|
Calendar end = Calendar.getInstance(); |
|
|
|
|
end.setTime(DateUtils.stringToDate(rq.getEndDate())); |
|
|
|
|
end.add(Calendar.DATE, 1); |
|
|
|
@ -449,7 +473,7 @@ public List<AnlsHstryModel> cntrlBasNormalHstryList(AnlsHstryGroupModel rq, Stri
|
|
|
|
|
|
|
|
|
|
BooleanBuilder builder = new BooleanBuilder(); |
|
|
|
|
|
|
|
|
|
log.debug("Params ===> " +rq.toString()); |
|
|
|
|
|
|
|
|
|
Calendar end = Calendar.getInstance(); |
|
|
|
|
end.setTime(DateUtils.stringToDate(rq.getEndDate())); |
|
|
|
|
end.add(Calendar.DATE, 1); |
|
|
|
@ -545,7 +569,6 @@ public List<AnlsHstryModel> cntrlBasNormalPlanList(AnlsHstryRqModel rq, int plan
|
|
|
|
|
|
|
|
|
|
BooleanBuilder builder = new BooleanBuilder(); |
|
|
|
|
|
|
|
|
|
log.debug("Params ===> " +rq.toString()); |
|
|
|
|
Calendar end = Calendar.getInstance(); |
|
|
|
|
end.setTime(DateUtils.stringToDate(rq.getEndDate())); |
|
|
|
|
end.add(Calendar.DATE, 1); |
|
|
|
|