From 7a18e6e9603f75a7a4b0bee1e68b29e29e7197e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?junh=5Feee=28=EC=9D=B4=EC=A4=80=ED=9D=AC=29?= Date: Tue, 11 Oct 2022 17:30:46 +0900 Subject: [PATCH 1/2] =?UTF-8?q?groupAdminList=20rs=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bas/group/model/BasGroupJoinModel.java | 2 ++ .../pty/PtyGroupQueryRepository.java | 35 +++++++++++++++++-- 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupJoinModel.java b/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupJoinModel.java index 853d209..39e6f49 100644 --- a/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupJoinModel.java +++ b/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupJoinModel.java @@ -30,5 +30,7 @@ public class BasGroupJoinModel { private Date createDt; private Date updateDt; + + private String myGrouopAuthCd; } 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 ddc3fbe..4069258 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 @@ -20,6 +20,7 @@ import com.palnet.biz.api.bas.group.model.BasGroupModel; import com.palnet.biz.api.bas.group.model.BasGroupRqModel; import com.palnet.biz.api.bas.group.model.BasGroupUserListModel; import com.palnet.biz.api.bas.group.model.BasGroupUserModel; +import com.palnet.biz.jpa.entity.FltPlanArea; import com.palnet.biz.jpa.entity.QPtyCstmrBas; import com.palnet.biz.jpa.entity.QPtyCstmrDtl; import com.palnet.biz.jpa.entity.QPtyCstmrGroup; @@ -140,11 +141,39 @@ public class PtyGroupQueryRepository{ .orderBy(bas.createDt.desc()) .orderBy(bas.groupNm.asc()) .groupBy(bas.groupId) - .fetch(); + .fetch(); + + BooleanBuilder builder2 = new BooleanBuilder(); + builder2.and(bas.useYn.eq("Y")); + builder2.and(group.cstmrGroupSno.isNotNull()); + + List my = query.select(Projections.bean(BasGroupUserModel.class , + bas.groupId, + bas.groupNm, + group.cstmrGroupSno, + group.cstmrSno, + group.groupAuthCd + )).from(bas) + .where(builder2) + .leftJoin(group) + .on(bas.groupId.eq(group.groupId)) + .on(group.cstmrSno.eq(cstmrSno)) + .groupBy(bas.groupId) + .fetch(); - return result; - + + for(BasGroupJoinModel groupList: result) { + for(BasGroupUserModel myList: my) { + if(groupList.getGroupId().equals(myList.getGroupId())) { + groupList.setMyGrouopAuthCd(myList.getGroupAuthCd()); + } + } } + + + return result; + + } public List groupUserList(int cstmrSno){ QPtyGroupBas bas = QPtyGroupBas.ptyGroupBas; From c63cb5ffef7577a7748a977c84df3fb2fc355b89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?junh=5Feee=28=EC=9D=B4=EC=A4=80=ED=9D=AC=29?= Date: Tue, 11 Oct 2022 18:00:18 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EC=98=A4=ED=83=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/palnet/biz/api/bas/group/model/BasGroupJoinModel.java | 2 +- .../palnet/biz/jpa/repository/pty/PtyGroupQueryRepository.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupJoinModel.java b/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupJoinModel.java index 39e6f49..9f0bcf5 100644 --- a/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupJoinModel.java +++ b/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupJoinModel.java @@ -31,6 +31,6 @@ public class BasGroupJoinModel { private Date updateDt; - private String myGrouopAuthCd; + private String myGroupAuthCd; } 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 4069258..ad984af 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 @@ -165,14 +165,13 @@ public class PtyGroupQueryRepository{ for(BasGroupJoinModel groupList: result) { for(BasGroupUserModel myList: my) { if(groupList.getGroupId().equals(myList.getGroupId())) { - groupList.setMyGrouopAuthCd(myList.getGroupAuthCd()); + groupList.setMyGroupAuthCd(myList.getGroupAuthCd()); } } } return result; - } public List groupUserList(int cstmrSno){