From de802ffe917c9699371f312d8e4ed77e2eddf1bf 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: Wed, 21 Sep 2022 17:33:59 +0900 Subject: [PATCH 1/5] =?UTF-8?q?=EB=B9=84=ED=96=89=20=EC=9D=B4=EB=A0=A5=20?= =?UTF-8?q?=ED=98=84=ED=99=A9=20,=20=EB=B9=84=ED=96=89=20=EC=8B=9C?= =?UTF-8?q?=EB=AE=AC=EB=A0=88=EC=9D=B4=EC=85=98=20=EA=B8=B0=EB=A1=9D=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20-=20=EA=B2=80=EC=83=89=EC=A1=B0=EA=B1=B4?= =?UTF-8?q?=EC=9D=98=20=EB=82=A0=EC=A7=9C=EB=A5=BC=20=EB=8B=B9=EC=9D=BC?= =?UTF-8?q?=EB=A1=9C=20=EC=84=A4=EC=A0=95=EC=8B=9C=20=EA=B2=80=EC=83=89=20?= =?UTF-8?q?=EC=95=88=EB=90=98=EB=8A=94=20=EB=B2=84=EA=B7=B8=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20,=20=EC=A0=95=EB=A0=AC=EA=B8=B0=EC=A4=80=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hstry/controller/AnlsHstryController.java | 2 - .../smlt/controller/AnlsSmltController.java | 1 + .../ctr/CtrCntrlQueryRepository.java | 49 ++++++++++++++----- 3 files changed, 39 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/palnet/biz/api/anls/hstry/controller/AnlsHstryController.java b/src/main/java/com/palnet/biz/api/anls/hstry/controller/AnlsHstryController.java index 384bbad..c4ad11c 100644 --- a/src/main/java/com/palnet/biz/api/anls/hstry/controller/AnlsHstryController.java +++ b/src/main/java/com/palnet/biz/api/anls/hstry/controller/AnlsHstryController.java @@ -41,7 +41,6 @@ public class AnlsHstryController { List result = null; log.debug("JSON>>>>>>>>" , JsonUtils.toJson(rq)); - log.debug("Param" + rq.getStDate() + "::" + rq.getEndDate()); //입력값 검증 @@ -86,7 +85,6 @@ public class AnlsHstryController { @GetMapping(value = "/log/{id}") public ResponseEntity log(@PathVariable String id) { List result = null; - try { result = service.hstryList(id); diff --git a/src/main/java/com/palnet/biz/api/anls/smlt/controller/AnlsSmltController.java b/src/main/java/com/palnet/biz/api/anls/smlt/controller/AnlsSmltController.java index 0e513f7..c808e69 100644 --- a/src/main/java/com/palnet/biz/api/anls/smlt/controller/AnlsSmltController.java +++ b/src/main/java/com/palnet/biz/api/anls/smlt/controller/AnlsSmltController.java @@ -45,6 +45,7 @@ public class AnlsSmltController { List result = null; log.debug("JSON>>>>>>>>" , JsonUtils.toJson(rq)); + log.info("test"); log.debug("Param" + rq.getStDate() + "::" + rq.getEndDate()); //입력값 검증 diff --git a/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java b/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java index 47c2716..a11eb94 100644 --- a/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java +++ b/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java @@ -1,6 +1,8 @@ package com.palnet.biz.jpa.repository.ctr; import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; import java.util.List; import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrGroupModel; @@ -59,11 +61,22 @@ public class CtrCntrlQueryRepository{ builder.and(qCntrlBasEntity.statusCd.eq("99")); log.debug("Params ===> " +rq.toString()); - - + if(rq.getStDate().equals(rq.getEndDate())) { + log.info("시작 날짜와 종료 날짜가 동일합니다"); + Calendar std = Calendar.getInstance(); + std.setTime(DateUtils.stringToDate(rq.getStDate())); + std.add(Calendar.DATE, -1); + Calendar end = Calendar.getInstance(); + end.setTime(DateUtils.stringToDate(rq.getEndDate())); + end.add(Calendar.DATE, 1); + Date stDate = std.getTime(); + Date endDate = end.getTime(); + builder.and(qCntrlBasEntity.cntrlStDt.after(stDate)); + builder.and(qCntrlBasEntity.cntrlEndDt.before(endDate)); + } else { builder.and(qCntrlBasEntity.cntrlStDt.after(DateUtils.stringToDate(rq.getStDate()))); - builder.and(qCntrlBasEntity.cntrlStDt.before(DateUtils.stringToDate(rq.getEndDate()))); - + builder.and(qCntrlBasEntity.cntrlEndDt.before(DateUtils.stringToDate(rq.getEndDate()))); + } if(!StringUtils.isEmpty(rq.getSearch1())) { builder.and(qCntrlBasEntity.idntfNum.like("%" + rq.getSearch1() + "%")); } @@ -114,7 +127,7 @@ public class CtrCntrlQueryRepository{ .leftJoin(qPtyCstmrGroupEntity) .on(qFltPlanBasEntity.groupId.eq(qPtyCstmrGroupEntity.groupId)) .where(builder) - .orderBy(qCntrlBasEntity.cntrlStDt.desc()) + .orderBy(qCntrlBasEntity.cntrlStDt.asc()) .fetch(); for(AnlsHstryModel model: queryList) { @@ -167,12 +180,26 @@ public List listCntrlBasRs(AnlsHstryGroupModel rq, int cstmrSn } else { builder.and(qComArcrftBasEntity.groupId.eq(rq.getGroupId())); } - if(rq.getStDate() != null) { - builder.and(qCntrlBasEntity.cntrlStDt.after(DateUtils.stringToDate(rq.getStDate()))); - } - if(rq.getEndDate() != null) { - builder.and(qCntrlBasEntity.cntrlStDt.before(DateUtils.stringToDate(rq.getEndDate()))); - } + + if(rq.getStDate().equals(rq.getEndDate())) { + log.info("시작 날짜와 종료 날짜가 동일합니다"); + Calendar std = Calendar.getInstance(); + std.setTime(DateUtils.stringToDate(rq.getStDate())); + std.add(Calendar.DATE, -1); + Calendar end = Calendar.getInstance(); + end.setTime(DateUtils.stringToDate(rq.getEndDate())); + end.add(Calendar.DATE, 1); + Date stDate = std.getTime(); + Date endDate = end.getTime(); + builder.and(qCntrlBasEntity.cntrlStDt.after(stDate)); + builder.and(qCntrlBasEntity.cntrlEndDt.before(endDate)); + } + else if (rq.getStDate() != null) { + builder.and(qCntrlBasEntity.cntrlStDt.after(DateUtils.stringToDate(rq.getStDate()))); + } + else if(rq.getEndDate() != null) { + builder.and(qCntrlBasEntity.cntrlStDt.before(DateUtils.stringToDate(rq.getEndDate()))); + } if(!StringUtils.isEmpty(rq.getSearch1())) { builder.and(qCntrlBasEntity.idntfNum.like("%" + rq.getSearch1() + "%")); } From acaf4ab9b0812f76cd156009565f93a5f08a5522 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: Wed, 21 Sep 2022 17:44:54 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=EB=B9=84=ED=96=89=EC=9D=B4=EB=A0=A5=20?= =?UTF-8?q?=EC=A1=B0=EA=B1=B4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jpa/repository/ctr/CtrCntrlQueryRepository.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java b/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java index a11eb94..300b16e 100644 --- a/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java +++ b/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java @@ -62,7 +62,6 @@ public class CtrCntrlQueryRepository{ builder.and(qCntrlBasEntity.statusCd.eq("99")); log.debug("Params ===> " +rq.toString()); if(rq.getStDate().equals(rq.getEndDate())) { - log.info("시작 날짜와 종료 날짜가 동일합니다"); Calendar std = Calendar.getInstance(); std.setTime(DateUtils.stringToDate(rq.getStDate())); std.add(Calendar.DATE, -1); @@ -73,10 +72,13 @@ public class CtrCntrlQueryRepository{ Date endDate = end.getTime(); builder.and(qCntrlBasEntity.cntrlStDt.after(stDate)); builder.and(qCntrlBasEntity.cntrlEndDt.before(endDate)); - } else { - builder.and(qCntrlBasEntity.cntrlStDt.after(DateUtils.stringToDate(rq.getStDate()))); - builder.and(qCntrlBasEntity.cntrlEndDt.before(DateUtils.stringToDate(rq.getEndDate()))); - } + } + else if (rq.getStDate() != null) { + builder.and(qCntrlBasEntity.cntrlStDt.after(DateUtils.stringToDate(rq.getStDate()))); + } + else if(rq.getEndDate() != null) { + builder.and(qCntrlBasEntity.cntrlStDt.before(DateUtils.stringToDate(rq.getEndDate()))); + } if(!StringUtils.isEmpty(rq.getSearch1())) { builder.and(qCntrlBasEntity.idntfNum.like("%" + rq.getSearch1() + "%")); } @@ -182,7 +184,6 @@ public List listCntrlBasRs(AnlsHstryGroupModel rq, int cstmrSn } if(rq.getStDate().equals(rq.getEndDate())) { - log.info("시작 날짜와 종료 날짜가 동일합니다"); Calendar std = Calendar.getInstance(); std.setTime(DateUtils.stringToDate(rq.getStDate())); std.add(Calendar.DATE, -1); From 4eae482b04870a3747744fc93f04bff8563ec62e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=B0=95=EC=9E=AC=EC=9A=B0?= <박재우@DESKTOP-EF7ECBO> Date: Thu, 22 Sep 2022 10:29:25 +0900 Subject: [PATCH 3/5] =?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=EB=AA=A9=EB=A1=9D=20-=20=EA=B2=80?= =?UTF-8?q?=EC=83=89=EC=A1=B0=EA=B1=B4=20=EC=98=A4=EB=A5=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/ctr/CtrCntrlQueryRepository.java | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java b/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java index 300b16e..3290def 100644 --- a/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java +++ b/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java @@ -183,24 +183,13 @@ public List listCntrlBasRs(AnlsHstryGroupModel rq, int cstmrSn builder.and(qComArcrftBasEntity.groupId.eq(rq.getGroupId())); } - if(rq.getStDate().equals(rq.getEndDate())) { - Calendar std = Calendar.getInstance(); - std.setTime(DateUtils.stringToDate(rq.getStDate())); - std.add(Calendar.DATE, -1); Calendar end = Calendar.getInstance(); end.setTime(DateUtils.stringToDate(rq.getEndDate())); end.add(Calendar.DATE, 1); - Date stDate = std.getTime(); Date endDate = end.getTime(); - builder.and(qCntrlBasEntity.cntrlStDt.after(stDate)); - builder.and(qCntrlBasEntity.cntrlEndDt.before(endDate)); - } - else if (rq.getStDate() != null) { builder.and(qCntrlBasEntity.cntrlStDt.after(DateUtils.stringToDate(rq.getStDate()))); - } - else if(rq.getEndDate() != null) { - builder.and(qCntrlBasEntity.cntrlStDt.before(DateUtils.stringToDate(rq.getEndDate()))); - } + builder.and(qCntrlBasEntity.cntrlEndDt.before(endDate)); + if(!StringUtils.isEmpty(rq.getSearch1())) { builder.and(qCntrlBasEntity.idntfNum.like("%" + rq.getSearch1() + "%")); } From 38ba4076eed309793f048159c5487c22afd4b4d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=B0=95=EC=9E=AC=EC=9A=B0?= <박재우@DESKTOP-EF7ECBO> Date: Thu, 22 Sep 2022 10:40:57 +0900 Subject: [PATCH 4/5] =?UTF-8?q?=EB=B9=84=ED=96=89=20=EC=8B=9C=EB=AE=AC?= =?UTF-8?q?=EB=A0=88=EC=9D=B4=EC=85=98=20-=20=EA=B2=80=EC=83=89=20?= =?UTF-8?q?=EC=A1=B0=EA=B1=B4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ctr/CtrCntrlQueryRepository.java | 24 +++++-------------- 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java b/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java index 3290def..b1e14b0 100644 --- a/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java +++ b/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java @@ -61,24 +61,12 @@ public class CtrCntrlQueryRepository{ builder.and(qCntrlBasEntity.statusCd.eq("99")); log.debug("Params ===> " +rq.toString()); - if(rq.getStDate().equals(rq.getEndDate())) { - Calendar std = Calendar.getInstance(); - std.setTime(DateUtils.stringToDate(rq.getStDate())); - std.add(Calendar.DATE, -1); - Calendar end = Calendar.getInstance(); - end.setTime(DateUtils.stringToDate(rq.getEndDate())); - end.add(Calendar.DATE, 1); - Date stDate = std.getTime(); - Date endDate = end.getTime(); - builder.and(qCntrlBasEntity.cntrlStDt.after(stDate)); - builder.and(qCntrlBasEntity.cntrlEndDt.before(endDate)); - } - else if (rq.getStDate() != null) { - builder.and(qCntrlBasEntity.cntrlStDt.after(DateUtils.stringToDate(rq.getStDate()))); - } - else if(rq.getEndDate() != null) { - builder.and(qCntrlBasEntity.cntrlStDt.before(DateUtils.stringToDate(rq.getEndDate()))); - } + Calendar end = Calendar.getInstance(); + end.setTime(DateUtils.stringToDate(rq.getEndDate())); + end.add(Calendar.DATE, 1); + Date endDate = end.getTime(); + builder.and(qCntrlBasEntity.cntrlStDt.after(DateUtils.stringToDate(rq.getStDate()))); + builder.and(qCntrlBasEntity.cntrlEndDt.before(endDate)); if(!StringUtils.isEmpty(rq.getSearch1())) { builder.and(qCntrlBasEntity.idntfNum.like("%" + rq.getSearch1() + "%")); } From 9dcb7115f703679485d35bc76de2b81afa178012 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, 22 Sep 2022 11:18:56 +0900 Subject: [PATCH 5/5] =?UTF-8?q?=EB=B9=84=ED=96=89=20=EA=B3=84=ED=9A=8D=20?= =?UTF-8?q?=EB=AA=A9=EB=A1=9D=20-=20=EA=B2=80=EC=83=89=20=EC=A1=B0?= =?UTF-8?q?=EA=B1=B4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jpa/repository/flt/FltPlanQueryRepository.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java b/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java index 48c6256..3db59aa 100644 --- a/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java +++ b/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java @@ -2,6 +2,7 @@ package com.palnet.biz.jpa.repository.flt; import com.palnet.biz.api.bas.flight.model.*; import com.palnet.biz.jpa.entity.*; +import com.palnet.comn.utils.DateUtils; import com.querydsl.core.BooleanBuilder; import com.querydsl.core.group.GroupBy; import com.querydsl.core.types.Predicate; @@ -12,6 +13,7 @@ import lombok.extern.log4j.Log4j2; import org.springframework.stereotype.Repository; + import java.util.List; @Log4j2 @@ -41,12 +43,9 @@ public class FltPlanQueryRepository { } } - if (rq.getSchFltEndDt() != null) { - builder.and(bas.schFltStDt.goe(rq.getSchFltStDt())); - } - if (rq.getSchFltStDt() != null) { - builder.and(bas.schFltEndDt.loe(rq.getSchFltEndDt())); - } + builder.and(bas.schFltStDt.goe(rq.getSchFltStDt())); + builder.and(bas.schFltStDt.before(rq.getSchFltEndDt())); + // if ("Y".equals(rq.getAprvlYn()) || "N".equals(rq.getAprvlYn())) { // builder.and(bas.aprvlYn.eq(rq.getAprvlYn())); // }