pav
/
pav-be-kac-pal
9
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity
Browse Source

비행승인 연산 수정

pull/16/head
lkd9125(이경도) 10 months ago
parent
b47c6b2297
commit
679ca7d467
1 changed files with 11 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java

22
pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java
Unescape View File

@ -1424,7 +1424,7 @@ public class FltPlanQueryRepository {
* 비행승인 많은 기체 데이터, top 1
* @return
*/
public FlightStcsValueModel getFltPlanAprvnStaticStcs(boolean authCheck, String groupId){
public FlightStcsValueModel getFltPlanAprvnStaticStcs(boolean authCheck, String serviceType){
FlightStcsValueModel result = new FlightStcsValueModel();
QFltPlanArcrft qFltPlanArcrft = QFltPlanArcrft.fltPlanArcrft;
@ -1432,7 +1432,7 @@ public class FltPlanQueryRepository {
BooleanBuilder builder = new BooleanBuilder();
builder.and(qFltPlanBas.aprvlYn.eq("Y"));
if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId));
if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType));
if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken()));
@ -1456,9 +1456,9 @@ public class FltPlanQueryRepository {
if(result.getName().equals("")) result.setName(" ");
String idntfNum = result.getName();
result.setYear(getFltPlanAprvnYear(idntfNum, authCheck, groupId));
result.setMonth(getFltPlanAprvnMonth(idntfNum, authCheck, groupId));
result.setDay(getFltPlanAprvnDay(idntfNum, authCheck, groupId));
result.setYear(getFltPlanAprvnYear(idntfNum, authCheck, serviceType));
result.setMonth(getFltPlanAprvnMonth(idntfNum, authCheck, serviceType));
result.setDay(getFltPlanAprvnDay(idntfNum, authCheck, serviceType));
} else {
FlightStcsValueModel node = new FlightStcsValueModel();
@ -1473,14 +1473,14 @@ public class FltPlanQueryRepository {
return result;
}
private Long getFltPlanAprvnDay(String idntfNum, boolean authCheck, String groupId){
private Long getFltPlanAprvnDay(String idntfNum, boolean authCheck, String serviceType){
QFltPlanArcrft qFltPlanArcrft = QFltPlanArcrft.fltPlanArcrft;
QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas;
String dateFormat = "%Y-%m-%d";
BooleanBuilder builder = new BooleanBuilder();
if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId));
if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType));
if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken()));
builder.and(qFltPlanArcrft.idntfNum.eq(idntfNum));
builder.and(qFltPlanBas.aprvlYn.eq("Y"));
@ -1498,7 +1498,7 @@ public class FltPlanQueryRepository {
.fetchOne();
}
private Long getFltPlanAprvnMonth(String idntfNum, boolean authCheck, String groupId){
private Long getFltPlanAprvnMonth(String idntfNum, boolean authCheck, String serviceType){
QFltPlanArcrft qFltPlanArcrft = QFltPlanArcrft.fltPlanArcrft;
QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas;
@ -1508,7 +1508,7 @@ public class FltPlanQueryRepository {
builder.and(qFltPlanBas.aprvlYn.eq("Y"));
builder.and(qFltPlanBas.createDt.goe(LocalDate.now().minusMonths(1).atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant()));
builder.and(qFltPlanBas.createDt.loe(LocalDate.now().atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant()));
if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId));
if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType));
if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken()));
return query
@ -1522,7 +1522,7 @@ public class FltPlanQueryRepository {
.fetchOne();
}
private Long getFltPlanAprvnYear(String idntfNum, boolean authCheck, String groupId){
private Long getFltPlanAprvnYear(String idntfNum, boolean authCheck, String serviceType){
QFltPlanArcrft qFltPlanArcrft = QFltPlanArcrft.fltPlanArcrft;
QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas;
@ -1531,7 +1531,7 @@ public class FltPlanQueryRepository {
builder.and(qFltPlanBas.aprvlYn.eq("Y"));
builder.and(qFltPlanBas.createDt.goe(LocalDate.now().minusYears(1).atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant()));
builder.and(qFltPlanBas.createDt.loe(LocalDate.now().atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant()));
if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId));
if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType));
if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken()));
return query

Write Preview
Loading…
Cancel
Save