From 88298335cec9a60b8c4effcb9b112dd354ef1956 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: Thu, 13 Oct 2022 11:26:59 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EC=8A=B9=EC=9D=B8=EA=B4=80=EB=A6=AC=20?= =?UTF-8?q?=ED=91=9C=EC=B6=9C=EC=A1=B0=EA=B1=B4=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../palnet/biz/jpa/repository/pty/PtyGroupQueryRepository.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 fa8aa72..1d02c58 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 @@ -357,7 +357,7 @@ public class PtyGroupQueryRepository{ .on(cstmr.cstmrSno.eq(cstmrDtl.cstmrSno)) .where(builder) - .where(dtl.cstmrSno.ne(rq.getCstmrSno())) +// .where(dtl.cstmrSno.ne(rq.getCstmrSno())) // .where(dtl.groupAuthCd.ne("CREATER")) .where(dtl.groupAuthCd.ne("MASTER")) .orderBy(bas.createDt.desc()) From 00346c67e98b8088cd40f54a97c569ce38349e5c Mon Sep 17 00:00:00 2001 From: junheelee Date: Thu, 13 Oct 2022 11:34:02 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EC=8B=9D=EB=B3=84=EC=9E=A5=EC=B9=98=20mode?= =?UTF-8?q?l=EC=97=90=20cstmrSno=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/palnet/biz/api/bas/dron/model/BasIdntfModel.java | 1 + .../palnet/biz/jpa/repository/pty/PtyDronQueryRepository.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/palnet/biz/api/bas/dron/model/BasIdntfModel.java b/src/main/java/com/palnet/biz/api/bas/dron/model/BasIdntfModel.java index 950eced..561ef52 100644 --- a/src/main/java/com/palnet/biz/api/bas/dron/model/BasIdntfModel.java +++ b/src/main/java/com/palnet/biz/api/bas/dron/model/BasIdntfModel.java @@ -24,5 +24,6 @@ public class BasIdntfModel { private Date createDt; + private int cstmrSno; } diff --git a/src/main/java/com/palnet/biz/jpa/repository/pty/PtyDronQueryRepository.java b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyDronQueryRepository.java index 9606bb4..59d6693 100644 --- a/src/main/java/com/palnet/biz/jpa/repository/pty/PtyDronQueryRepository.java +++ b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyDronQueryRepository.java @@ -183,7 +183,8 @@ public class PtyDronQueryRepository{ idnt.createDt, idnt.updateDt, idnt.ownerNm, - idnt.hpno + idnt.hpno, + idnt.cstmrSno )).from(idnt) .where(builder) .orderBy(idnt.createDt.asc()) From 88e33fdd6f3930904184e9d83e5b8bc049a539c9 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: Thu, 13 Oct 2022 11:43:47 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EB=B9=84=ED=96=89=EC=9D=B4=EB=A0=A5=20?= =?UTF-8?q?=ED=98=84=ED=99=A9=20-=20=ED=91=9C=EC=B6=9C=EC=A1=B0=EA=B1=B4?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../palnet/biz/jpa/repository/flt/FltPlanBasRepository.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanBasRepository.java b/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanBasRepository.java index b385513..3601f22 100644 --- a/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanBasRepository.java +++ b/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanBasRepository.java @@ -40,11 +40,11 @@ public interface FltPlanBasRepository extends JpaRepository @Query("Select f from FltPlanBas f " + "where f.cstmrSno = :cstmrSno " + - "and f.delYn = 'N' " ) + "and f.aprvlYn = 'Y' " ) List findByPlanSno(@Param("cstmrSno")int cstmrSno); @Query("Select f from FltPlanBas f " + "where f.planSno = :planSno " + - "and f.delYn = 'N' " ) + "and f.aprvlYn = 'Y' " ) List findBasList(@Param("planSno")int planSno); }