diff --git a/src/main/java/com/palnet/biz/api/anls/smlt/service/AnlsSmltService.java b/src/main/java/com/palnet/biz/api/anls/smlt/service/AnlsSmltService.java index 635633b..26d2f4c 100644 --- a/src/main/java/com/palnet/biz/api/anls/smlt/service/AnlsSmltService.java +++ b/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())); } - Comparator 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 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; } diff --git a/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java b/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java index f71edd1..a873ca4 100644 --- a/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java +++ b/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(qCntrlHstryAreaEntity.actnType.eq("01")) .where(builder) - .orderBy(qCntrlBasEntity.cntrlStDt.desc()) + .orderBy(qCntrlBasEntity.cntrlStDt.asc()) .fetch(); for(AnlsHstryModel model: queryList) {