diff --git a/.claude/.gitignore b/.claude/.gitignore index 53ced0f0..6dfd1063 100644 --- a/.claude/.gitignore +++ b/.claude/.gitignore @@ -1 +1,2 @@ /settings.local.json +/mcp_settings.json diff --git a/pom.xml b/pom.xml index c7ddbe01..0f11dcba 100644 --- a/pom.xml +++ b/pom.xml @@ -146,7 +146,7 @@ mysql mysql-connector-java - 5.1.31 + 5.1.49 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/egovProps/globals_dev.properties b/src/main/resources/egovframework/egovProps/globals_dev.properties index 344ef3a8..b8d6649f 100644 --- a/src/main/resources/egovframework/egovProps/globals_dev.properties +++ b/src/main/resources/egovframework/egovProps/globals_dev.properties @@ -28,7 +28,7 @@ Globals.Env = dev # mysql Globals.DriverClassName=com.mysql.jdbc.Driver -Globals.Url=jdbc:mysql://192.168.0.60:3308/mjon_advc +Globals.Url=jdbc:mysql://192.168.0.60:3308/mjon_advc?useUnicode=true&connectionCollation=utf8mb4_unicode_ci&serverTimezone=Asia/Seoul #Globals.Url=jdbc:mysql://139.150.73.12:3306/mjon Globals.UserName= mjonUr Globals.Password= mjon!@#$ diff --git a/src/main/resources/egovframework/egovProps/globals_local.properties b/src/main/resources/egovframework/egovProps/globals_local.properties index 338e88a2..c240387d 100644 --- a/src/main/resources/egovframework/egovProps/globals_local.properties +++ b/src/main/resources/egovframework/egovProps/globals_local.properties @@ -28,8 +28,10 @@ Globals.Env = local # mysql Globals.DriverClassName=com.mysql.jdbc.Driver -Globals.Url=jdbc:mysql://192.168.0.60:3308/mjon_advc -#Globals.Url=jdbc:mysql://192.168.0.60:3308/mjon +#Globals.Url=jdbc:mysql://192.168.0.60:3308/mjon_advc +#Globals.Url=jdbc:mysql://192.168.0.60:3308/mjon_advc?characterEncoding=UTF-8&useUnicode=true&serverTimezone=Asia/Seoul +Globals.Url=jdbc:mysql://192.168.0.60:3308/mjon_advc?useUnicode=true&connectionCollation=utf8mb4_unicode_ci&serverTimezone=Asia/Seoul + Globals.UserName= mjonUr Globals.Password= mjon!@#$ #Globals.Url=jdbc:mysql://192.168.0.125:3306/mjon diff --git a/src/main/resources/egovframework/egovProps/globals_prod.properties b/src/main/resources/egovframework/egovProps/globals_prod.properties index 68ca97df..518daf29 100644 --- a/src/main/resources/egovframework/egovProps/globals_prod.properties +++ b/src/main/resources/egovframework/egovProps/globals_prod.properties @@ -27,7 +27,7 @@ Globals.Env = prod # mysql Globals.DriverClassName=com.mysql.jdbc.Driver -Globals.Url=jdbc:mysql://10.12.107.14:3306/mjon_advc +Globals.Url=jdbc:mysql://10.12.107.14:3306/mjon_advc?useUnicode=true&connectionCollation=utf8mb4_unicode_ci&serverTimezone=Asia/Seoul Globals.UserName= mjonUr Globals.Password= mjon!@#$ diff --git a/src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml index c5119e08..f6c8ffa1 100644 --- a/src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml @@ -1409,7 +1409,7 @@ C.YELLOW_ID AS yellowId FROM MJ_MSG_GROUP_DATA B INNER JOIN ( - select MSG_GROUP_ID, MSG_TYPE, DEL_FLAG, MSG_NOTICETALK_SENDER_KEY, BIZ_KAKAO_RESEND_YN, BIZ_KAKAO_RESEND_DATA + select MSG_GROUP_ID, MSG_TYPE, DEL_FLAG, MSG_NOTICETALK_SENDER_KEY, BIZ_KAKAO_RESEND_YN, BIZ_KAKAO_RESEND_DATA, CALL_TO from MJ_MSG_DATA where DEL_FLAG = 'N' @@ -1452,6 +1452,9 @@ AND B.SMS_TXT like CONCAT('%', #searchKeyword#, '%') + + AND A.CALL_TO LIKE CONCAT('%', #searchKeyword#, '%') + GROUP BY B.MSG_GROUP_ID ORDER BY 1=1 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..ca0eb318 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 @@ -254,6 +254,9 @@ AND B.SMS_TXT LIKE CONCAT('%', #searchKeyword#, '%') + + AND A.CALL_TO LIKE CONCAT('%', #searchKeyword#, '%') + AND B.RESERVE_YN = #searchCondition01# @@ -473,6 +476,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/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"%> +