From 45807ed23afd6021b700a2847865686f89d12565 Mon Sep 17 00:00:00 2001 From: itn Date: Fri, 20 Oct 2023 10:49:36 +0900 Subject: [PATCH] =?UTF-8?q?=EB=AC=B8=EC=9E=90=20=EC=9E=AC=EC=A0=84?= =?UTF-8?q?=EC=86=A1=20=EB=AA=A9=EB=A1=9D=20=EC=84=B1=EB=8A=A5=EA=B0=9C?= =?UTF-8?q?=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../msgdata/web/MjonMsgDataController.java | 2 +- .../msgsent/service/MjonMsgSentService.java | 3 + .../msgsent/service/impl/MjonMsgSentDAO.java | 8 + .../service/impl/MjonMsgSentServiceImpl.java | 9 + .../sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml | 193 ++++++++++++++++-- .../jsp/web/msgdata/MsgSentListAjax.jsp | 2 +- 6 files changed, 203 insertions(+), 14 deletions(-) diff --git a/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java b/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java index 3f8fe15e..e945d8fb 100644 --- a/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java +++ b/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java @@ -6034,7 +6034,7 @@ public class MjonMsgDataController { mjonMsgSentVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); //전체 발송 리스트 불러오기 - mjMsgSentList = mjonMsgSentService.selectAllMsgSentList(mjonMsgSentVO); + mjMsgSentList = mjonMsgSentService.selectAllMsgSentSimpleList(mjonMsgSentVO); paginationInfo.setTotalRecordCount( mjMsgSentList.size()> 0 ? (Integer.parseInt((mjMsgSentList.get(0)).getTotMsgCnt())) : 0); } diff --git a/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentService.java b/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentService.java index da96abda..c0d73343 100644 --- a/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentService.java +++ b/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentService.java @@ -16,6 +16,9 @@ public interface MjonMsgSentService { //발송 관리 전체 발송 리스트 불러오기 public List selectAllMsgSentList(MjonMsgSentVO mjonMsgSentVO) throws Exception; + //발송 관리 전체 발송 리스트 불러오기 => 주소록 조인 제거버전 + public List selectAllMsgSentSimpleList(MjonMsgSentVO mjonMsgSentVO) throws Exception; + //발송 관리 발송 성공,실패 건수 리스트 불러오기 public List selectAllMsgSentSucFailList(List resultAllResList, MjonMsgSentVO mjonMsgSentVO) throws Exception; diff --git a/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentDAO.java b/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentDAO.java index c6136e83..bb43a7f0 100644 --- a/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentDAO.java +++ b/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentDAO.java @@ -49,12 +49,20 @@ public class MjonMsgSentDAO extends EgovAbstractDAO { return result; } + //발송 관리 전체 발송 리스트 불러오기 @SuppressWarnings("unchecked") public List selectAllMsgSentList(MjonMsgSentVO mjonMsgSentVO) throws Exception{ return (List) list("MjonMsgSentDAO.selectAllMsgSentList",mjonMsgSentVO); } + //발송 관리 전체 발송 리스트 불러오기 => 주소록 조인 제거버전 + @SuppressWarnings("unchecked") + public List selectAllMsgSentSimpleList(MjonMsgSentVO mjonMsgSentVO) throws Exception{ + + return (List) list("MjonMsgSentDAO.selectAllMsgSentSimpleList",mjonMsgSentVO); + } + @SuppressWarnings("unchecked") public List selectAllPrivateMsgSentList(MjonMsgSentVO mjonMsgSentVO) throws Exception{ 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 46f61440..f142d639 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 @@ -84,6 +84,15 @@ public class MjonMsgSentServiceImpl extends EgovAbstractServiceImpl implements return resultList; } + //발송 관리 전체 발송 리스트 불러오기 => 주소록 조인 제거버전 + public List selectAllMsgSentSimpleList(MjonMsgSentVO mjonMsgSentVO) throws Exception{ + List resultList = new ArrayList(); + + resultList = mjonMsgSentDAO.selectAllMsgSentSimpleList(mjonMsgSentVO); + + return resultList; + } + //발송 관리 발송 성공,실패 건수 리스트 불러오기 public List selectAllMsgSentSucFailList(List resultAllResList, MjonMsgSentVO mjonMsgSentVO) throws Exception{ 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 fdb7027c..dbaa135d 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 @@ -319,14 +319,6 @@ - - - AND B.MSG_KIND != 'C' - - - AND B.MSG_KIND = 'C' - - )M LEFT JOIN ( @@ -340,6 +332,185 @@ GROUP BY ADDR_PHONE_NO )MA ON M.CALL_TO = MA.ADDR_PHONE_NO + WHERE 1=1 + + + AND CUR_STATE IN ('0','1','2','3') + + + AND CUR_STATE = '0' + AND RESERVE_C_YN = 'N' + + + AND CUR_STATE IN ('2','3') + AND (RSLT_CODE IN ('0','100','101','110','4100','6600','1000','1001') OR RSLT_CODE2 IN ('0') ) + AND RESERVE_C_YN = 'N' + + + AND RESERVE_C_YN = 'N' + AND (RSLT_CODE NOT IN ('0','100','101','110','4100','6600','1000','1001') OR RSLT_CODE2 NOT IN ('0') ) + + + + + AND MSG_TYPE = '4' + + + AND MSG_TYPE = '6' + AND FILE_CNT = '0' + + + '0' + ]]> + + + + + AND MSG_TYPE IN ('4','6') + + + + + AND MSG_TYPE IN ('4','6') + + + AND MSG_TYPE = '4' + + + AND MSG_TYPE = '6' + AND FILE_CNT = '0' + + + '0' + ]]> + + + + + AND SUBJECT LIKE CONCAT('%', #searchKeyword#, '%') + + + AND CALL_FROM LIKE CONCAT('%', #searchKeyword#, '%') + + + AND CALL_TO LIKE CONCAT('%', #searchKeyword#, '%') + + + + AND sendKind = #searchCondition_01# + + + = DATE_FORMAT(#startDate#, '%Y-%m-%d') + ]]> + + + + + GROUP BY MSG_GROUP_ID + ORDER BY 1=1 + + + , curState $searchSortOrd$ + , orderByrsltCode + + + ,$searchSortCnd$ + + + + $searchSortOrd$ + + LIMIT #recordCountPerPage# OFFSET #firstIndex# + + + + - + + - -