From 94c13d02ea4fe816560652da7bc0310484e94644 Mon Sep 17 00:00:00 2001 From: ijunho Date: Wed, 10 Sep 2025 12:38:11 +0900 Subject: [PATCH 1/6] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=20=EB=B0=9C?= =?UTF-8?q?=EC=86=A1=EA=B2=B0=EA=B3=BC=20>=20=EC=88=98=EC=8B=A0=EB=B2=88?= =?UTF-8?q?=ED=98=B8=20=EA=B2=80=EC=83=89=EC=9E=90=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java | 6 ++++++ .../egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml | 3 +++ src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp | 3 ++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java b/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java index d25a9490..27c38095 100644 --- a/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java +++ b/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java @@ -34,6 +34,7 @@ import org.springframework.stereotype.Service; import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl; import egovframework.rte.fdl.idgnr.EgovIdGnrService; +import itn.com.cmm.util.StringUtil; import itn.com.cmm.util.StringUtil2; import itn.let.cmm.vo.FileInfoVO; import itn.let.fax.addr.service.FaxAddrGroupVO; @@ -126,6 +127,11 @@ public class MjonMsgSentServiceImpl extends EgovAbstractServiceImpl implements Map resultMap = new HashMap(); + //수신번호 검색 시 번호 포멧 통일 + if("4".equals(mjonMsgSentVO.getSearchCondition()) && StringUtil.isNotEmpty(mjonMsgSentVO.getSearchKeyword())) { + mjonMsgSentVO.setSearchKeyword(mjonMsgSentVO.getSearchKeyword().trim().replace("-", "")); + } + // 목록 List resultList = mjonMsgSentDAO.selectAllMsgSentList_advc(mjonMsgSentVO); 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 b93540e7..d8bb7ed9 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 @@ -473,6 +473,9 @@ AND B.SMS_TXT LIKE CONCAT('%', #searchKeyword#, '%') + + AND A.CALL_TO LIKE CONCAT('%', #searchKeyword#, '%') + AND B.RESERVE_YN = #searchCondition01# diff --git a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp index 457aed8f..09b78b35 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp @@ -888,10 +888,11 @@ function subContent(){
- +
From 7663b6f0825ecdb9623b28da996f339454580691 Mon Sep 17 00:00:00 2001 From: subsub Date: Mon, 27 Oct 2025 11:34:23 +0900 Subject: [PATCH 2/6] =?UTF-8?q?=EB=A7=9E=EC=B6=A4=EC=A0=9C=EC=9E=91=20?= =?UTF-8?q?=EC=9A=94=EC=B2=AD=20=ED=8C=9D=EC=97=85=20=EC=95=88=EB=82=B4?= =?UTF-8?q?=EB=AC=B8=EA=B5=AC=20=EC=B6=94=EA=B0=80,=20=EC=A0=9C=EA=B3=B5?= =?UTF-8?q?=EB=B0=A9=EB=B2=95=20=EC=B9=B4=EC=B9=B4=EC=98=A4=ED=86=A1=20?= =?UTF-8?q?=EB=AC=B8=EA=B5=AC=20=EB=AC=B8=EC=9E=90=EB=A1=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/jsp/web/custom/MsgCustomPopupAjax.jsp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/custom/MsgCustomPopupAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/custom/MsgCustomPopupAjax.jsp index aea1c83a..839b455a 100644 --- a/src/main/webapp/WEB-INF/jsp/web/custom/MsgCustomPopupAjax.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/custom/MsgCustomPopupAjax.jsp @@ -5,6 +5,11 @@ <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +