From b050ee9223f14ff6cede9d2e1766c3314dd3281f 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 15:42:09 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B7=B8=EB=A3=B9=20=EB=AA=A9=EB=A1=9D=20-=20?= =?UTF-8?q?=EA=B0=80=EC=9E=85=EC=9D=BC=EC=8B=9C=20=EA=B8=B0=EC=A4=80=20?= =?UTF-8?q?=EB=82=B4=EB=A6=BC=EC=B0=A8=EC=88=9C=20=EB=90=98=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20,=20=EC=95=B1=EA=B6=8C=ED=95=9C=EC=9C=BC=EB=A1=9C?= =?UTF-8?q?=20=EC=9D=B8=ED=95=B4=20=EB=8B=A4=EC=88=98=EC=9D=98=20=EB=AA=A9?= =?UTF-8?q?=EB=A1=9D=EC=9D=B4=20=EC=B6=9C=EB=A0=A5=EB=90=98=EB=8A=94=20?= =?UTF-8?q?=EA=B2=BD=EC=9A=B0=EB=8F=84=20sort=EB=A5=BC=20=ED=86=B5?= =?UTF-8?q?=ED=95=B4=20=EA=B0=80=EC=9E=85=EC=9D=BC=EC=8B=9C=20=EA=B8=B0?= =?UTF-8?q?=EC=A4=80=20=EB=82=B4=EB=A6=BC=EC=B0=A8=EC=88=9C=20=EC=A0=95?= =?UTF-8?q?=EB=A0=AC=20=EB=90=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bas/group/service/BasGroupService.java | 27 +++++++++++++++---- .../pty/PtyGroupQueryRepository.java | 4 +-- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupService.java b/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupService.java index a2362cf..904fff3 100644 --- a/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupService.java +++ b/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupService.java @@ -1,5 +1,7 @@ package com.palnet.biz.api.bas.group.service; +import java.util.Collections; +import java.util.Comparator; import java.util.List; import java.util.Optional; import java.util.UUID; @@ -10,16 +12,12 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.palnet.biz.api.anls.hstry.model.AnlsHstryModel; -import com.palnet.biz.api.anls.hstry.model.AnlsHstryRqModel; +import com.palnet.biz.api.acnt.jwt.utils.JwtTokenUtil; import com.palnet.biz.api.bas.group.model.BasGroupJoinModel; import com.palnet.biz.api.bas.group.model.BasGroupModel; import com.palnet.biz.api.bas.group.model.BasGroupRqModel; -import com.palnet.biz.jpa.entity.CtrCntrlBas; import com.palnet.biz.jpa.entity.PtyCstmrGroup; import com.palnet.biz.jpa.entity.PtyGroupBas; -import com.palnet.biz.jpa.repository.ctr.CtrCntrlBasRepository; -import com.palnet.biz.jpa.repository.ctr.CtrCntrlQueryRepository; import com.palnet.biz.jpa.repository.pty.PtyCstmrGroupRepository; import com.palnet.biz.jpa.repository.pty.PtyGroupBasRepository; import com.palnet.biz.jpa.repository.pty.PtyGroupQueryRepository; @@ -41,6 +39,9 @@ public class BasGroupService { @Autowired private PtyCstmrGroupRepository ptyCstmrGroupRepository; + @Autowired + private JwtTokenUtil jwtTokenUtil; + public String createid() { @@ -77,8 +78,24 @@ public class BasGroupService { */ public List groupList(int cstmrSno){ + String appAuth = jwtTokenUtil.getUserAuthByToken(); + List resultList = query.groupList(cstmrSno); + if("SUPER".equals(appAuth) || "ADMIN".equals(appAuth)) { + + Comparator comparator = (o1, o2) -> { + if (DateUtils.diffSecond(o1.getJoinDt(), o2.getJoinDt()) < 0) { + return -1; + } else if(DateUtils.diffSecond(o1.getJoinDt(), o2.getJoinDt()) > 0) { + return 1; + } + return 0; + }; + + Collections.sort(resultList, comparator); + } + return resultList; } 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 942c913..df09823 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 @@ -131,7 +131,7 @@ public class PtyGroupQueryRepository{ .leftJoin(group) .on(bas.groupId.eq(group.groupId)) .where(builder) -// .orderBy(group.joinDt.desc()) + .orderBy(group.joinDt.desc()) // .orderBy(bas.createDt.desc()) .orderBy(bas.groupNm.asc()) .groupBy(bas.groupId) @@ -147,7 +147,7 @@ public class PtyGroupQueryRepository{ .leftJoin(group) .on(bas.groupId.eq(group.groupId)) .where(bas.useYn.eq("Y")) -// .orderBy(group.joinDt.desc()) + .orderBy(group.joinDt.desc()) // .orderBy(bas.createDt.desc()) .orderBy(bas.groupNm.asc()) .groupBy(bas.groupId)