Browse Source

비행 시뮬레이션 정렬기준 수정

Test
qkr7828(박재우) 2 years ago
parent
commit
683e0a8b08
  1. 20
      src/main/java/com/palnet/biz/api/anls/smlt/service/AnlsSmltService.java
  2. 2
      src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java

20
src/main/java/com/palnet/biz/api/anls/smlt/service/AnlsSmltService.java

@ -106,18 +106,18 @@ public class AnlsSmltService {
resultList.addAll(query.cntrlBasNormalPlanList(rq, list.getPlanSno())); resultList.addAll(query.cntrlBasNormalPlanList(rq, list.getPlanSno()));
} }
Comparator<AnlsHstryModel> comparator = (o1, o2) -> {
if (DateUtils.diffSecond(o1.getCntrlStDt(), o2.getCntrlStDt()) < 0) {
return 1;
} else if(DateUtils.diffSecond(o1.getCntrlStDt(), o2.getCntrlStDt()) > 0) {
return -1;
}
return 0;
};
Collections.sort(resultList, comparator);
} }
Comparator<AnlsHstryModel> comparator = (o1, o2) -> {
if (DateUtils.diffSecond(o1.getCntrlStDt(), o2.getCntrlStDt()) < 0) {
return 1;
} else if(DateUtils.diffSecond(o1.getCntrlStDt(), o2.getCntrlStDt()) > 0) {
return -1;
}
return 0;
};
Collections.sort(resultList, comparator);
return resultList; return resultList;
} }

2
src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java

@ -127,7 +127,7 @@ public class CtrCntrlQueryRepository{
.on(qCntrlBasEntity.cntrlId.eq(qCntrlHstryAreaEntity.cntrlId)) .on(qCntrlBasEntity.cntrlId.eq(qCntrlHstryAreaEntity.cntrlId))
.on(qCntrlHstryAreaEntity.actnType.eq("01")) .on(qCntrlHstryAreaEntity.actnType.eq("01"))
.where(builder) .where(builder)
.orderBy(qCntrlBasEntity.cntrlStDt.desc()) .orderBy(qCntrlBasEntity.cntrlStDt.asc())
.fetch(); .fetch();
for(AnlsHstryModel model: queryList) { for(AnlsHstryModel model: queryList) {

Loading…
Cancel
Save