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/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); } 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()) 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 ac14041..d698117 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())