From 99e96e3dfed6110b8d746c1c8e08796752f4d0c8 Mon Sep 17 00:00:00 2001 From: itn Date: Wed, 6 Sep 2023 15:31:53 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=EC=A3=BC?= =?UTF-8?q?=EC=86=8C=EB=A1=9D=EA=B4=80=EB=A6=AC=20=EA=B8=B0=EA=B0=84?= =?UTF-8?q?=EA=B2=80=EC=83=89=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/itn/let/mjo/addr/service/AddrVO.java | 16 ++++- .../itn/let/mjo/addr/web/AddrController.java | 10 +++- .../sqlmap/let/mjo/addr/Addr_SQL_Mysql.xml | 30 +++++++--- .../WEB-INF/jsp/uss/ion/addr/AddrList.jsp | 58 ++++++++++++++++--- 4 files changed, 93 insertions(+), 21 deletions(-) diff --git a/src/main/java/itn/let/mjo/addr/service/AddrVO.java b/src/main/java/itn/let/mjo/addr/service/AddrVO.java index ad5913eb..4c864f1c 100644 --- a/src/main/java/itn/let/mjo/addr/service/AddrVO.java +++ b/src/main/java/itn/let/mjo/addr/service/AddrVO.java @@ -47,6 +47,8 @@ public class AddrVO extends ComDefaultVO{ private String searchAddrGrpId; private String startKeyword; + private String searchStartDate; + private String searchEndDate; private String[] excelDownTitles; @@ -62,7 +64,19 @@ public class AddrVO extends ComDefaultVO{ String[] memoList; private int dupliCnt; - + + public String getSearchStartDate() { + return searchStartDate; + } + public void setSearchStartDate(String searchStartDate) { + this.searchStartDate = searchStartDate; + } + public String getSearchEndDate() { + return searchEndDate; + } + public void setSearchEndDate(String searchEndDate) { + this.searchEndDate = searchEndDate; + } public int getDupliCnt() { return dupliCnt; } diff --git a/src/main/java/itn/let/mjo/addr/web/AddrController.java b/src/main/java/itn/let/mjo/addr/web/AddrController.java index 533f5692..7c7eb5f3 100644 --- a/src/main/java/itn/let/mjo/addr/web/AddrController.java +++ b/src/main/java/itn/let/mjo/addr/web/AddrController.java @@ -1,9 +1,6 @@ package itn.let.mjo.addr.web; import java.io.BufferedReader; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; import java.io.InputStreamReader; import java.io.OutputStream; import java.text.SimpleDateFormat; @@ -49,6 +46,7 @@ import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; import itn.com.cmm.EgovMessageSource; import itn.com.cmm.JsonResult; import itn.com.cmm.LoginVO; +import itn.com.cmm.util.MJUtil; import itn.com.cmm.util.RedirectUrlMaker; import itn.com.cmm.util.StringUtil; import itn.com.utl.fcc.service.EgovStringUtil; @@ -120,6 +118,12 @@ public class AddrController { addrVO.setSearchSortOrd("desc"); } + // 기간검색 설정 + String toDay = MJUtil.getTodayDate(); //오늘 + String beforeMonthDay = MJUtil.getBefore1MonthDate(); //한달 전 + if (null == addrVO.getSearchStartDate() || addrVO.getSearchStartDate().equals("")) { + addrVO.setSearchStartDate(beforeMonthDay); + } List addrList = addrService.selectAddrNewList(addrVO); diff --git a/src/main/resources/egovframework/sqlmap/let/mjo/addr/Addr_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/mjo/addr/Addr_SQL_Mysql.xml index 385f649f..b4431633 100644 --- a/src/main/resources/egovframework/sqlmap/let/mjo/addr/Addr_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/mjo/addr/Addr_SQL_Mysql.xml @@ -159,18 +159,25 @@ ON B.ADDR_GRP_ID = C.ADDR_GRP_ID WHERE 1=1 + AND (C.RECV_STATUS = 'Y' OR C.RECV_STATUS IS NULL) AND A.MBER_ID = #mberId# - - AND (C.RECV_STATUS = 'Y' OR C.RECV_STATUS IS NULL) - + + = DATE_FORMAT(#searchStartDate#, '%Y-%m-%d') + ]]> + + + + #addrIdList[]# - AND A.ADDR_GRP_ID = #addrGrpId# @@ -305,18 +312,25 @@ ON B.ADDR_GRP_ID = C.ADDR_GRP_ID WHERE 1=1 + AND (C.RECV_STATUS = 'Y' OR C.RECV_STATUS IS NULL) AND A.MBER_ID = #mberId# - - AND (C.RECV_STATUS = 'Y' OR C.RECV_STATUS IS NULL) - + + = DATE_FORMAT(#searchStartDate#, '%Y-%m-%d') + ]]> + + + + #addrIdList[]# - AND A.ADDR_GRP_ID = #addrGrpId# diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/addr/AddrList.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/addr/AddrList.jsp index 4872b163..d4bfcbcb 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/ion/addr/AddrList.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/addr/AddrList.jsp @@ -81,6 +81,8 @@ function linkPage(pageNo){ searchForm.pageUnit.value = $('#pageUnit').val(); searchForm.searchCondition.value = $('#searchCondition').val(); searchForm.searchKeyword.value = $('#searchKeyword').val(); + searchForm.searchStartDate.value = $('#searchStartDate').val(); + searchForm.searchEndDate.value = $('#searchEndDate').val(); searchForm.action = ""; searchForm.submit(); } @@ -112,9 +114,26 @@ function fnSelectMber(mberId) { document.memForm.submit(); } +//기간선택 select +function fnSetCalMonth(val) { + var form = document.listForm; + var today = new Date(); + + var year = today.getFullYear(); + var month = ("0"+(today.getMonth()+1)).slice(-2); + var date = ("0"+today.getDate()).slice(-2); + + var sDate = new Date(today.setMonth(today.getMonth() - val)); + + var sYear = sDate.getFullYear(); + var sMonth = ("0"+(sDate.getMonth()+1)).slice(-2); + var sDate = ("0"+sDate.getDate()).slice(-2); + + form.searchStartDate.value = sYear + "-" + sMonth + "-" + sDate; + form.searchEndDate.value = year + "-" + month + "-" + date; + +} - -
@@ -130,13 +149,32 @@ function fnSelectMber(mberId) {
+
+ + +
+ + +
+ ~ +
+ + +
+
+ - " maxlength="300" size="40"/> + " maxlength="300" size="20"/>
@@ -256,12 +294,14 @@ function fnSelectMber(mberId) {
- - - - - " /> - " /> + + + + + " /> + " /> + +