From 3b59ecffc931b53a40a147acf9ab46ada872b66c Mon Sep 17 00:00:00 2001 From: rosewiper Date: Tue, 6 Feb 2024 18:16:08 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EB=B0=9C=EC=86=A1=EA=B2=B0=EA=B3=BC=20?= =?UTF-8?q?=EA=B2=80=EC=83=89=20=EC=9D=BC=EC=9E=90=20=EA=B8=B0=EC=A4=80=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml index c76c5aee..9ffc98b9 100644 --- a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml @@ -446,6 +446,11 @@ AND DATE_FORMAT(REGDATE, '%Y-%m-%d') <= DATE_FORMAT(#endDate#, '%Y-%m-%d') ]]> + + + AND REGDATE BETWEEN DATE_ADD(DATE_FORMAT(NOW(), '%Y-%m-%d'), INTERVAL -1 DAY) and DATE_ADD(DATE_FORMAT(NOW(), '%Y-%m-%d'), INTERVAL 1 DAY) + + GROUP BY MSG_GROUP_ID ORDER BY 1=1 From 730084f1fbf0bda13d8604d2569b135e0eff17d3 Mon Sep 17 00:00:00 2001 From: rosewiper Date: Wed, 7 Feb 2024 11:06:56 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EB=B0=9C=EC=86=A1=EA=B2=B0=EA=B3=BC,=20?= =?UTF-8?q?=EC=98=88=EC=95=BD=EB=AC=B8=EC=9E=90=EA=B4=80=EB=A6=AC=20?= =?UTF-8?q?=EB=A9=94=EB=89=B4=20=EA=B2=80=EC=83=89=EC=9D=BC=EC=9E=90=20?= =?UTF-8?q?=EC=A7=80=EC=A0=95=20=20-=20=EA=B2=80=EC=83=89=EC=9D=BC?= =?UTF-8?q?=EC=9E=90=EA=B0=80=20=EC=97=86=EB=8A=94=20=EA=B2=BD=EC=9A=B0=20?= =?UTF-8?q?=EC=A0=84=EB=82=A0=20~=20=EA=B8=88=EC=9D=BC=20=EA=B8=B0?= =?UTF-8?q?=EA=B0=84=EC=9C=BC=EB=A1=9C=20=EA=B2=80=EC=83=89=EB=90=98?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=A7=80=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/sent/web/KakaoSentController.java | 24 ++++++++++ .../msgsent/web/MjonMsgSentController.java | 29 +++++++++++- .../web/MjonReservMsgController.java | 47 +++++++++++++++++++ .../sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml | 7 +-- 4 files changed, 100 insertions(+), 7 deletions(-) diff --git a/src/main/java/itn/let/kakao/user/sent/web/KakaoSentController.java b/src/main/java/itn/let/kakao/user/sent/web/KakaoSentController.java index cc9bf8a6..982fff2f 100644 --- a/src/main/java/itn/let/kakao/user/sent/web/KakaoSentController.java +++ b/src/main/java/itn/let/kakao/user/sent/web/KakaoSentController.java @@ -106,6 +106,30 @@ public class KakaoSentController { //기본 등록일자 정렬 if(kakaoSentVO.getSearchSortCnd().equals("")) kakaoSentVO.setSearchSortCnd("regdate"); + + + String startDate = kakaoSentVO.getStartDate(); + String endDate = kakaoSentVO.getEndDate(); + + if(startDate == null && endDate == null ) { + + Calendar cal = Calendar.getInstance(); + Date now = new Date(); + + SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd"); + + //종료일은 오늘날짜 + cal.setTime(now); + endDate = format.format(cal.getTime()); + + //시작일은 전날로 셋팅 + cal.add(Calendar.DATE, -1); + startDate = format.format(cal.getTime()); + + kakaoSentVO.setStartDate(startDate); + kakaoSentVO.setEndDate(endDate); + + } model.addAttribute("searchKeyword", kakaoSentVO.getSearchKeyword()); model.addAttribute("kakaoSentVO", kakaoSentVO); diff --git a/src/main/java/itn/let/mjo/msgsent/web/MjonMsgSentController.java b/src/main/java/itn/let/mjo/msgsent/web/MjonMsgSentController.java index 1e4e0875..d87a4345 100644 --- a/src/main/java/itn/let/mjo/msgsent/web/MjonMsgSentController.java +++ b/src/main/java/itn/let/mjo/msgsent/web/MjonMsgSentController.java @@ -225,6 +225,29 @@ private static final Logger logger = LoggerFactory.getLogger(MjonMsgSentControll } + String startDate = mjonMsgSentVO.getStartDate(); + String endDate = mjonMsgSentVO.getEndDate(); + + if(startDate == null && endDate == null ) { + + Calendar cal = Calendar.getInstance(); + Date now = new Date(); + + SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd"); + + //종료일은 오늘날짜 + cal.setTime(now); + endDate = format.format(cal.getTime()); + + //시작일은 전날로 셋팅 + cal.add(Calendar.DATE, -1); + startDate = format.format(cal.getTime()); + + mjonMsgSentVO.setStartDate(startDate); + mjonMsgSentVO.setEndDate(endDate); + + } + model.addAttribute("searchKeyword", mjonMsgSentVO.getSearchKeyword()); model.addAttribute("mjonMsgSentVO", mjonMsgSentVO); model.addAttribute("siteId", mjonMsgSentVO.getSiteId()); @@ -330,7 +353,11 @@ private static final Logger logger = LoggerFactory.getLogger(MjonMsgSentControll model.addAttribute("totalRecordCount", paginationInfo.getTotalRecordCount()); //발송 결과 성공 실패 건수 리스트 불러오기 - List resultMsgSucFailList = mjonMsgSentService.selectAllMsgSentSucFailList(resultAllSentList, mjonMsgSentVO); + List resultMsgSucFailList = new ArrayList(); + + if(resultAllSentList.size() > 0) { + resultMsgSucFailList = mjonMsgSentService.selectAllMsgSentSucFailList(resultAllSentList, mjonMsgSentVO); + } model.addAttribute("resultMsgSucFailList", resultMsgSucFailList); model.addAttribute("mjonMsgSentVO", mjonMsgSentVO); diff --git a/src/main/java/itn/let/mjo/reservmsg/web/MjonReservMsgController.java b/src/main/java/itn/let/mjo/reservmsg/web/MjonReservMsgController.java index 38025fc7..4923cee2 100644 --- a/src/main/java/itn/let/mjo/reservmsg/web/MjonReservMsgController.java +++ b/src/main/java/itn/let/mjo/reservmsg/web/MjonReservMsgController.java @@ -210,6 +210,30 @@ public class MjonReservMsgController { model.addAttribute("paginationInfo", paginationInfo); model.addAttribute("totalRecordCount", paginationInfo.getTotalRecordCount());*/ + + String startDate = mjonResvMsgVO.getStartDate(); + String endDate = mjonResvMsgVO.getEndDate(); + + if(startDate == null && endDate == null ) { + + Calendar cal = Calendar.getInstance(); + Date now = new Date(); + + SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd"); + + //종료일은 오늘날짜 + cal.setTime(now); + endDate = format.format(cal.getTime()); + + //시작일은 전날로 셋팅 + cal.add(Calendar.DATE, -1); + startDate = format.format(cal.getTime()); + + mjonResvMsgVO.setStartDate(startDate); + mjonResvMsgVO.setEndDate(endDate); + + } + model.addAttribute("searchKeyword", mjonResvMsgVO.getSearchKeyword()); model.addAttribute("mjonResvMsgVO", mjonResvMsgVO); model.addAttribute("siteId", mjonResvMsgVO.getSiteId()); @@ -1417,6 +1441,29 @@ public class MjonReservMsgController { //기본 등록일자 정렬 if(kakaoSentVO.getSearchSortCnd().equals("")) kakaoSentVO.setSearchSortCnd("regdate"); + + String startDate = kakaoSentVO.getStartDate(); + String endDate = kakaoSentVO.getEndDate(); + + if(startDate == null && endDate == null ) { + + Calendar cal = Calendar.getInstance(); + Date now = new Date(); + + SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd"); + + //종료일은 오늘날짜 + cal.setTime(now); + endDate = format.format(cal.getTime()); + + //시작일은 전날로 셋팅 + cal.add(Calendar.DATE, -1); + startDate = format.format(cal.getTime()); + + kakaoSentVO.setStartDate(startDate); + kakaoSentVO.setEndDate(endDate); + + } model.addAttribute("searchKeyword", kakaoSentVO.getSearchKeyword()); model.addAttribute("kakaoSentVO", kakaoSentVO); diff --git a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml index 9ffc98b9..bb6783c0 100644 --- a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml @@ -446,11 +446,6 @@ AND DATE_FORMAT(REGDATE, '%Y-%m-%d') <= DATE_FORMAT(#endDate#, '%Y-%m-%d') ]]> - - - AND REGDATE BETWEEN DATE_ADD(DATE_FORMAT(NOW(), '%Y-%m-%d'), INTERVAL -1 DAY) and DATE_ADD(DATE_FORMAT(NOW(), '%Y-%m-%d'), INTERVAL 1 DAY) - - GROUP BY MSG_GROUP_ID ORDER BY 1=1 @@ -816,7 +811,7 @@ AND DATE_FORMAT(REGDATE, '%Y-%m-%d') <= DATE_FORMAT(#endDate#, '%Y-%m-%d') ]]> - ORDER BY 1=1, MSG_ID DESC + ORDER BY 1=1, MSG_GROUP_ID DESC, MSG_ID DESC , curState $searchSortOrd$