From 683e0a8b0890f3010b59ff4d4b1e596fdf2ef9f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?qkr7828=28=EB=B0=95=EC=9E=AC=EC=9A=B0=29?=
 <박재우@DESKTOP-EF7ECBO>
Date: Fri, 7 Oct 2022 14:58:28 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B9=84=ED=96=89=20=EC=8B=9C=EB=AE=AC?=
 =?UTF-8?q?=EB=A0=88=EC=9D=B4=EC=85=98=20=EC=A0=95=EB=A0=AC=EA=B8=B0?=
 =?UTF-8?q?=EC=A4=80=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anls/smlt/service/AnlsSmltService.java    | 20 +++++++++----------
 .../ctr/CtrCntrlQueryRepository.java          |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

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<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;
 	}
 	
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) {