From f1e94b6998d7e59bc0d76451cf4a5ecceb4cfa19 Mon Sep 17 00:00:00 2001
From: hagjoon <dlgkrwns@palnet.co.kr>
Date: Thu, 6 Oct 2022 16:25:34 +0900
Subject: [PATCH] =?UTF-8?q?main=20-=20=EA=B7=B8=EB=A3=B9=EC=A0=95=EB=B3=B4?=
 =?UTF-8?q?=20=EB=82=B4=EA=B0=80=20=EC=83=9D=EC=84=B1=ED=95=9C=20=EA=B7=B8?=
 =?UTF-8?q?=EB=A3=B9=20=EC=B5=9C=EC=8B=A0=EC=88=9C=EC=9C=BC=EB=A1=9C=20?=
 =?UTF-8?q?=EC=A0=95=EB=A0=AC=20=EB=B0=8F=203=EA=B0=9C=EC=94=A9=20?=
 =?UTF-8?q?=EC=B6=9C=EB=A0=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/dash/service/MainDashService.java    | 23 ++++++---------
 .../pty/PtyGroupQueryRepository.java          | 28 +++++++++++++++++++
 2 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/palnet/biz/api/main/dash/service/MainDashService.java b/src/main/java/com/palnet/biz/api/main/dash/service/MainDashService.java
index e8bc430..9783c4c 100644
--- a/src/main/java/com/palnet/biz/api/main/dash/service/MainDashService.java
+++ b/src/main/java/com/palnet/biz/api/main/dash/service/MainDashService.java
@@ -6,18 +6,17 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import com.palnet.biz.api.bas.group.model.BasGroupModel;
+import com.palnet.biz.jpa.repository.pty.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.palnet.biz.api.bas.group.model.BasGroupJoinModel;
 import com.palnet.biz.api.main.dash.model.MainDashListModel;
 import com.palnet.biz.api.main.dash.model.MainDashStcsModel;
 import com.palnet.biz.jpa.repository.ctr.CtrCntrlBasRepository;
 import com.palnet.biz.jpa.repository.ctr.CtrCntrlQueryRepository;
-import com.palnet.biz.jpa.repository.pty.PtyDronQueryRepository;
-import com.palnet.biz.jpa.repository.pty.PtyGroupQueryRepository;
 
 @Service
 public class MainDashService {
@@ -35,6 +34,8 @@ public class MainDashService {
 	
 	@Autowired
 	private CtrCntrlQueryRepository query;
+
+
 	
 	
 	/**
@@ -66,22 +67,16 @@ public class MainDashService {
 	 * TOP3 가입 그룹 리스트 표출
 	 */
 	public List<Map> mainDashGroupList(int cstmrSno){
-		
-		List<BasGroupJoinModel> queryList = ptyGroupQueryRepository.joinList(cstmrSno);
+
+		List<BasGroupModel> queryList = ptyGroupQueryRepository.groupTop3(cstmrSno);
 		List<Map> resultList = new ArrayList<Map>();
-		
-		int cnt = 0;
-		for(BasGroupJoinModel model : queryList) {
-			
-			if(cnt == 3) {
-				break;
-			}
-			
+
+		for(BasGroupModel model : queryList) {
+
 			Map<String , Object> data = new HashMap<String , Object>();
 			data.put("groupId", model.getGroupId());
 			data.put("groupNm", model.getGroupNm());
 			data.put("createDt", model.getCreateDt());
-			data.put("joinDt" , model.getJoinDt());
 			resultList.add(data);
 		}
 		resultList = resultList.stream().sorted((o2, o1) -> o1.get("createDt").toString().compareTo(o2.get("createDt").toString())).collect(Collectors.toList());
diff --git a/src/main/java/com/palnet/biz/jpa/repository/pty/PtyGroupQueryRepository.java b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyGroupQueryRepository.java
index 240ce84..3530d87 100644
--- a/src/main/java/com/palnet/biz/jpa/repository/pty/PtyGroupQueryRepository.java
+++ b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyGroupQueryRepository.java
@@ -480,4 +480,32 @@ public class PtyGroupQueryRepository{
         }
         return result;
     }
+
+	public List<BasGroupModel> groupTop3(int cstmrSno){
+
+		QPtyGroupBas bas = QPtyGroupBas.ptyGroupBas;
+		QPtyCstmrGroup dtl = QPtyCstmrGroup.ptyCstmrGroup;
+
+		BooleanBuilder builder = new BooleanBuilder();
+		builder.and(bas.useYn.eq("Y"));
+		builder.and(dtl.cstmrSno.eq(cstmrSno));
+		builder.and(dtl.groupAuthCd.eq("MASTER"));
+
+		List<BasGroupModel> result =
+				query.select(Projections.bean(BasGroupModel.class ,
+								bas.groupId,
+								bas.groupNm,
+								bas.groupTypeCd,
+								bas.createDt
+						)).from(bas)
+						.leftJoin(dtl)
+						.on(bas.groupId.eq(dtl.groupId))
+						.where(builder)
+						.limit(3)
+						.orderBy(bas.createDt.desc())
+						.fetch();
+
+		return result;
+
+	}
 }