From 5df7f26bb15c7d33811808455890dd03f4c4b3c2 Mon Sep 17 00:00:00 2001 From: minuk926 Date: Fri, 29 Apr 2022 20:20:56 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=EC=8B=AC=EC=82=AC=EC=9E=90=20-=20?= =?UTF-8?q?=EA=B1=B0=EC=A3=BC=EC=9E=90/=EC=9E=A5=EC=95=A0=EC=9D=B8=20?= =?UTF-8?q?=EC=8B=AC=EC=9D=98=EB=8C=80=EC=83=81=20=EC=A1=B0=ED=9A=8C=20?= =?UTF-8?q?=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/IResidentAndDisabledRepositoryImpl.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/xit/biz/ctgy/repository/IResidentAndDisabledRepositoryImpl.java b/src/main/java/com/xit/biz/ctgy/repository/IResidentAndDisabledRepositoryImpl.java index 7dfeb13..c3967d1 100644 --- a/src/main/java/com/xit/biz/ctgy/repository/IResidentAndDisabledRepositoryImpl.java +++ b/src/main/java/com/xit/biz/ctgy/repository/IResidentAndDisabledRepositoryImpl.java @@ -323,11 +323,10 @@ public class IResidentAndDisabledRepositoryImpl implements IResidentAndDisabledR BooleanBuilder builder = new BooleanBuilder(); builder.and(minSimsa680Sc.msDatagb.eq(dto.getMsDatagb())); - - // TODO : test를 위하 임시로 코멘트 처리 - //builder.and(minSimsaUser680Sc.msuUserid.eq(HeaderUtil.getUserId())); + builder.and(minSimsaUser680Sc.msuUserid.eq(HeaderUtil.getUserId())); + // TODO : 테스트를 위해 임시로 코멘트 처리 // 심의전 - builder.and(minSimsa680Sc.msResult.eq(CtgyConstants.Judge.RESULT_JUDGE_PRE.getCode())); + //builder.and(minSimsa680Sc.msResult.eq(CtgyConstants.Judge.RESULT_JUDGE_PRE.getCode())); return queryFactory .select(Projections.fields( @@ -351,7 +350,7 @@ public class IResidentAndDisabledRepositoryImpl implements IResidentAndDisabledR .on(minSimsa680Sc.msMaincode.eq(minSimsaUser680Sc.msuMaincode)) .where(builder) //.groupBy(minSimsa680Sc.msDatagb, minSimsa680Sc.msYear, minSimsaUser680Sc.msuUserid, minSimsa680Sc.msChasu, minSimsa680Sc.msSdate, minSimsa680Sc.msStartsi, minSimsa680Sc.msEdate, minSimsa680Sc.msCdate, minSimsa680Sc.msClosesi) - .orderBy(minSimsa680Sc.msYear.desc(), minSimsa680Sc.msChasu.desc()) + .orderBy(minSimsa680Sc.msSdate.asc(), minSimsa680Sc.msEdate.asc(), minSimsa680Sc.msSeq.asc()) .fetch(); } } \ No newline at end of file