|
|
|
@ -1930,7 +1930,7 @@ public class FltPlanQueryRepository {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public List<MainDashFlightListModel> getFlightDronList(String orderBy, String groupId){ |
|
|
|
|
public List<MainDashFlightListModel> getFlightDronList(String cptAuth, String serviceType){ |
|
|
|
|
|
|
|
|
|
QComIdntfBas cib = QComIdntfBas.comIdntfBas; |
|
|
|
|
QFltPlanArcrft fpa = QFltPlanArcrft.fltPlanArcrft; |
|
|
|
@ -1940,13 +1940,17 @@ public class FltPlanQueryRepository {
|
|
|
|
|
QCtrCntrlBas ccb = QCtrCntrlBas.ctrCntrlBas; |
|
|
|
|
|
|
|
|
|
Expression<Integer> groupOrder = new CaseBuilder() |
|
|
|
|
.when(pgb.groupNm.eq(orderBy)).then(0) |
|
|
|
|
.when(pgb.groupNm.eq(cptAuth)).then(0) |
|
|
|
|
.otherwise(1); |
|
|
|
|
|
|
|
|
|
BooleanBuilder builder = new BooleanBuilder(); |
|
|
|
|
|
|
|
|
|
if(!groupId.equals("all")) { |
|
|
|
|
builder.and(pgb.groupId.eq(groupId)); |
|
|
|
|
if(!serviceType.equals("all")) { |
|
|
|
|
builder.and(fpb.serviceType.contains(serviceType)); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if(!cptAuth.equals("KAC")) { |
|
|
|
|
builder.and(pgb.groupNm.eq("cptAuth")); |
|
|
|
|
} |
|
|
|
|
Instant now = Instant.now(); |
|
|
|
|
|
|
|
|
|