diff --git a/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java b/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java index 004ace73..85306f36 100644 --- a/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java +++ b/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java @@ -70,6 +70,8 @@ public class MjonMsgSentVO extends UserDefaultVO{ private int successCnt; // 문자발송 성공건수 + private String sendKind; //문자 전송 타입(H:홈페이지 A: API) + private String msgKind; //문자종류(일반:N, 광고:A , 선거:C, 관리자:S, 이벤트:E) private String delayYn; //지연 문자 유무 private String delayCompleteYn; //지연문자 처리 완료 여부 @@ -420,6 +422,10 @@ public class MjonMsgSentVO extends UserDefaultVO{ public void setDelayCompleteYn(String delayCompleteYn) { this.delayCompleteYn = delayCompleteYn; } - - + public String getSendKind() { + return sendKind; + } + public void setSendKind(String sendKind) { + this.sendKind = sendKind; + } } diff --git a/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java b/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java index 9eadc8ce..20b06771 100644 --- a/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java +++ b/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java @@ -1788,10 +1788,10 @@ public class EgovUserManageController { paginationInfo.setTotalRecordCount(resultList.size() > 0 ? ((MjonMsgVO)resultList.get(0)).getTotCnt() : 0); model.addAttribute("paginationInfo", paginationInfo); - String msgGroupSCntSum = "0"; //정상수신 총 건수 합계 - String totSPriceSum = "0"; //정상수신 총 금액 합계 - String msgGroupFWCntSum = "0"; //실패대기 총 건수 합계 - String totFWPriceSum = "0"; //실패대기 총 금액 합계 + String msgGroupSCntSum = "0"; //정상수신 총 건수 합계 + String totSPriceSum = "0"; //정상수신 총 금액 합계 + String msgGroupFWCntSum = "0"; //실패대기 총 건수 합계 + String totFWPriceSum = "0"; //실패대기 총 금액 합계 if(resultList.size() > 0) { @@ -1809,10 +1809,10 @@ public class EgovUserManageController { //단문 건수 및 금액 변수 처리 - String msgSmsGroupSCntSum = "0"; //정상수신 총 건수 합계 - String totSmsSPriceSum = "0"; //정상수신 총 금액 합계 - String msgSmsGroupFWCntSum = "0"; //실패대기 총 건수 합계 - String totSmsFWPriceSum = "0"; //실패대기 총 금액 합계 + String msgSmsGroupSCntSum = "0"; //정상수신 총 건수 합계 + String totSmsSPriceSum = "0"; //정상수신 총 금액 합계 + String msgSmsGroupFWCntSum = "0"; //실패대기 총 건수 합계 + String totSmsFWPriceSum = "0"; //실패대기 총 금액 합계 if(resultSmsList.size() > 0) { @@ -1830,10 +1830,10 @@ public class EgovUserManageController { //장문 건수 및 금액 변수 처리 - String msgLmsGroupSCntSum = "0"; //정상수신 총 건수 합계 - String totLmsSPriceSum = "0"; //정상수신 총 금액 합계 - String msgLmsGroupFWCntSum = "0"; //실패대기 총 건수 합계 - String totLmsFWPriceSum = "0"; //실패대기 총 금액 합계 + String msgLmsGroupSCntSum = "0"; //정상수신 총 건수 합계 + String totLmsSPriceSum = "0"; //정상수신 총 금액 합계 + String msgLmsGroupFWCntSum = "0"; //실패대기 총 건수 합계 + String totLmsFWPriceSum = "0"; //실패대기 총 금액 합계 if(resultLmsList.size() > 0) { @@ -1851,10 +1851,10 @@ public class EgovUserManageController { //그림 건수 및 금액 변수 처리 - String msgMmsGroupSCntSum = "0"; //정상수신 총 건수 합계 - String totMmsSPriceSum = "0"; //정상수신 총 금액 합계 - String msgMmsGroupFWCntSum = "0"; //실패대기 총 건수 합계 - String totMmsFWPriceSum = "0"; //실패대기 총 금액 합계 + String msgMmsGroupSCntSum = "0"; //정상수신 총 건수 합계 + String totMmsSPriceSum = "0"; //정상수신 총 금액 합계 + String msgMmsGroupFWCntSum = "0"; //실패대기 총 건수 합계 + String totMmsFWPriceSum = "0"; //실패대기 총 금액 합계 if(resultMmsList.size() > 0) { diff --git a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml index 6970ade0..bc8fc456 100644 --- a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml @@ -4451,6 +4451,7 @@ , msgGroupId , callFrom , callTo + , sendKind , smsTxt , fileCnt , msgType @@ -4475,50 +4476,84 @@ , smiId , delayYn , delayCompleteYn - ,( - SELECT - CONCAT( - ( - IF(B.FILE_PATH1 IS NOT NULL, (SELECT - ATCH_FILE_ID - FROM LETTNFILEDETAIL - WHERE CONCAT(STRE_FILE_NM, '.', FILE_EXTSN) = CONCAT(SUBSTRING_INDEX(B.FILE_PATH1, '/', -1)) - LIMIT 1), '') - ) - ,'^', - ( - IF(B.FILE_PATH2 IS NOT NULL, (SELECT - ATCH_FILE_ID - FROM LETTNFILEDETAIL - WHERE CONCAT(STRE_FILE_NM, '.', FILE_EXTSN) = CONCAT(SUBSTRING_INDEX(B.FILE_PATH2, '/', -1)) - LIMIT 1), '') - ) - ,'^', - ( - IF(B.FILE_PATH3 IS NOT NULL, (SELECT - ATCH_FILE_ID - FROM LETTNFILEDETAIL - WHERE CONCAT(STRE_FILE_NM, '.', FILE_EXTSN) = CONCAT(SUBSTRING_INDEX(B.FILE_PATH3, '/', -1)) - LIMIT 1), '') - )) - FROM - MJ_MSG_DATA B - WHERE - B.MSG_GROUP_ID = msgGroupId - LIMIT 1 - ) AS atchFiles + ,(SELECT + CONCAT( + (IF(B.FILE_PATH1 IS NOT NULL + , (SELECT + ATCH_FILE_ID + FROM + LETTNFILEDETAIL + WHERE 1=1 + AND CONCAT(STRE_FILE_NM, '.', FILE_EXTSN) = CONCAT(SUBSTRING_INDEX(B.FILE_PATH1, '/', -1)) + LIMIT 1) + , '') + ) + , '^' + , (IF(B.FILE_PATH2 IS NOT NULL + , (SELECT + ATCH_FILE_ID + FROM + LETTNFILEDETAIL + WHERE 1=1 + AND CONCAT(STRE_FILE_NM, '.', FILE_EXTSN) = CONCAT(SUBSTRING_INDEX(B.FILE_PATH2, '/', -1)) + LIMIT 1) + , '') + ) + , '^' + , (IF(B.FILE_PATH3 IS NOT NULL + , (SELECT + ATCH_FILE_ID + FROM + LETTNFILEDETAIL + WHERE 1=1 + AND CONCAT(STRE_FILE_NM, '.', FILE_EXTSN) = CONCAT(SUBSTRING_INDEX(B.FILE_PATH3, '/', -1)) + LIMIT 1) + , '') + ) + ) + FROM + MJ_MSG_DATA B + WHERE 1=1 + AND B.MSG_GROUP_ID = msgGroupId + LIMIT 1 + ) AS atchFiles FROM (SELECT - (SELECT count(1) - FROM - (SELECT - () AS resultCodeTxt, - MGD.MSG_GROUP_ID - FROM MJ_MSG_GROUP_DATA MGD + (SELECT + count(1) + FROM + (SELECT + () AS resultCodeTxt + , MGD.MSG_GROUP_ID + FROM + MJ_MSG_GROUP_DATA MGD LEFT JOIN MJ_MSG_DATA MD ON MD.MSG_GROUP_ID = MGD.MSG_GROUP_ID - WHERE MGD.USER_ID = #userId# + WHERE 1=1 + AND MGD.USER_ID = #userId# AND DATE_FORMAT(MGD.REQ_DATE, '%Y-%m-%d') BETWEEN #ntceBgnde# AND #ntceEndde# + + + + AND MGD.SEND_KIND = 'H' + + + AND MGD.SEND_KIND = 'A' + + + + + + ( MD.CALL_FROM LIKE CONCAT('%' , #searchKeyword#, '%') OR MD.SMS_TXT LIKE CONCAT('%' , #searchKeyword#, '%') ) + + + MD.CALL_FROM LIKE CONCAT('%' , #searchKeyword#, '%') + + + MD.SMS_TXT LIKE CONCAT('%' , #searchKeyword#, '%') + + + - ) sub2 - WHERE sub2.resultCodeTxt = 'S' - AND sub2.MSG_GROUP_ID = IN1.MSG_GROUP_ID - ) AS msgGroupSCnt + ) sub2 + WHERE 1=1 + AND sub2.resultCodeTxt = 'S' + AND sub2.MSG_GROUP_ID = IN1.MSG_GROUP_ID + ) AS msgGroupSCnt , COUNT(MSG_GROUP_ID) * EACH_PRICE AS totSPrice - , (SELECT count(1) - FROM + , (SELECT + count(1) + FROM (SELECT - () AS resultCodeTxt, - MGD.MSG_GROUP_ID - FROM MJ_MSG_GROUP_DATA MGD + () AS resultCodeTxt + , MGD.MSG_GROUP_ID + FROM + MJ_MSG_GROUP_DATA MGD LEFT JOIN MJ_MSG_DATA MD - ON MD.MSG_GROUP_ID = MGD.MSG_GROUP_ID - WHERE MGD.USER_ID = #userId# + ON MD.MSG_GROUP_ID = MGD.MSG_GROUP_ID + WHERE 1=1 + AND MGD.USER_ID = #userId# AND DATE_FORMAT(MGD.REQ_DATE, '%Y-%m-%d') BETWEEN #ntceBgnde# AND #ntceEndde# @@ -4562,15 +4601,17 @@ ]]> - ) sub2 - WHERE 'S' ]]> - AND sub2.MSG_GROUP_ID = IN1.MSG_GROUP_ID + ) sub2 + WHERE 1=1 + AND 'S' ]]> + AND sub2.MSG_GROUP_ID = IN1.MSG_GROUP_ID ) AS msgGroupFWCnt , '0' AS totFWPrice , MSG_GROUP_ID AS msgGroupId , USER_ID AS userId , CALL_FROM AS callFrom , CALL_TO AS callTo + , SEND_KIND AS sendKind , SMS_TXT AS smsTxt , FILE_CNT AS fileCnt , MSG_TYPE AS msgType @@ -4601,6 +4642,7 @@ , MGD.USER_ID , MGD.CALL_FROM , MD.CALL_TO + , MGD.SEND_KIND , MGD.SMS_TXT , MGD.FILE_CNT , MD.MSG_TYPE @@ -4657,6 +4699,26 @@ AND DATE_FORMAT(MGD.REQ_DATE, '%Y-%m-%d') BETWEEN #ntceBgnde# AND #ntceEndde# + + + AND MGD.SEND_KIND = 'H' + + + AND MGD.SEND_KIND = 'A' + + + + + + ( MD.CALL_FROM LIKE CONCAT('%' , #searchKeyword#, '%') OR MD.SMS_TXT LIKE CONCAT('%' , #searchKeyword#, '%') ) + + + MD.CALL_FROM LIKE CONCAT('%' , #searchKeyword#, '%') + + + MD.SMS_TXT LIKE CONCAT('%' , #searchKeyword#, '%') + + /**30분 지연이 아니거나 지연 처리가 완료된 건들 불러오기*/ - AND - ( - ( - MGD.DELAY_YN = 'N' - AND MGD.DELAY_COMPLETE_YN = 'N' - ) - OR - ( - MGD.DELAY_YN = 'Y' - AND MGD.DELAY_COMPLETE_YN = 'Y' - ) - ) + AND + ( + ( + MGD.DELAY_YN = 'N' + AND MGD.DELAY_COMPLETE_YN = 'N' + ) + OR + ( + MGD.DELAY_YN = 'Y' + AND MGD.DELAY_COMPLETE_YN = 'Y' + ) + ) @@ -4803,8 +4865,8 @@ ON MD.MSG_GROUP_ID = MGD.MSG_GROUP_ID LEFT JOIN (SELECT CODE_NM ,CODE , CODE_DC FROM LETTCCMMNDETAILCODE WHERE USE_AT = 'Y' AND CODE_ID = 'ITN019' )B ON MD.AGENT_CODE = B.CODE - WHERE - MGD.USER_ID = #userId# + WHERE 1=1 + AND MGD.USER_ID = #userId# AND MGD.MSG_TYPE IN (4, 6) AND MGD.MSG_TYPE = #msgType# @@ -4816,6 +4878,28 @@ AND MGD.FILE_CNT = 0 AND DATE_FORMAT(MGD.REQ_DATE, '%Y-%m-%d') BETWEEN #ntceBgnde# AND #ntceEndde# + + + + AND MGD.SEND_KIND = 'H' + + + AND MGD.SEND_KIND = 'A' + + + + + + ( MD.CALL_FROM LIKE CONCAT('%' , #searchKeyword#, '%') OR MD.SMS_TXT LIKE CONCAT('%' , #searchKeyword#, '%') ) + + + MD.CALL_FROM LIKE CONCAT('%' , #searchKeyword#, '%') + + + MD.SMS_TXT LIKE CONCAT('%' , #searchKeyword#, '%') + + + AND DATE_FORMAT(MGD.REQ_DATE, '%Y-%m-%d') BETWEEN #ntceBgnde# AND #ntceEndde# + + + AND MGD.SEND_KIND = 'H' + + + AND MGD.SEND_KIND = 'A' + + + + + + ( MD.CALL_FROM LIKE CONCAT('%' , #searchKeyword#, '%') OR MD.SMS_TXT LIKE CONCAT('%' , #searchKeyword#, '%') ) + + + MD.CALL_FROM LIKE CONCAT('%' , #searchKeyword#, '%') + + + MD.SMS_TXT LIKE CONCAT('%' , #searchKeyword#, '%') + + + ) = 'S' ) AS successCnt + , MGD.SEND_KIND AS sendKind , MGD.SMS_TXT AS smsTxt , userdata , curState @@ -1451,6 +1452,7 @@ AND A.MSG_GROUP_ID = A.msgGroupId AND () = 'S' ) AS successCnt + , MGD.SEND_KIND AS sendKind , MGD.SMS_TXT AS smsTxt , userdata , curState @@ -1574,6 +1576,7 @@ AND A.MSG_GROUP_ID = A.msgGroupId AND () = 'S' ) AS successCnt + , MGD.SEND_KIND AS sendKind , MGD.SMS_TXT AS smsTxt , userdata , curState diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectMsgDataListPop.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectMsgDataListPop.jsp index ba4dd3aa..d6f08b20 100644 --- a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectMsgDataListPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectMsgDataListPop.jsp @@ -120,6 +120,10 @@ function init_date(){ $('#ntceEnddeYYYMMDD').val(''); $('#ntceBgnde').val(''); $('#ntceEndde').val(''); + + $('#searchKeyword').val(''); + $('#sendKind').val('').prop("selected",true); + $('#searchCondition').val('').prop("selected",true); } @@ -342,6 +346,7 @@ function fn_updateSendRealTime(userId, msgGroupId){
+ @@ -361,6 +366,7 @@ function fn_updateSendRealTime(userId, msgGroupId){ + @@ -387,51 +393,93 @@ function fn_updateSendRealTime(userId, msgGroupId){ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + +
방식 단문 장문 그림문자
+ 전체 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- + + + + + + - - " > - - -   ~ - - " - > - - + + " > + + +   ~ + + " > + + 타임아웃 아이콘 @@ -462,7 +510,7 @@ function fn_updateSendRealTime(userId, msgGroupId){ <%-- --%> <%-- --%> - <%----%> + @@ -482,9 +530,7 @@ function fn_updateSendRealTime(userId, msgGroupId){ 예약 내용 타입 - - - <%--전송사--%> + 방식 스미싱의심 이용정지 발송처리 @@ -495,24 +541,24 @@ function fn_updateSendRealTime(userId, msgGroupId){ - - - + + + - + "> - + - + @@ -525,21 +571,13 @@ function fn_updateSendRealTime(userId, msgGroupId){ - <%-- - - - - - - - --%> /(%) 예약취소 - + 예약 @@ -547,27 +585,7 @@ function fn_updateSendRealTime(userId, msgGroupId){ 즉시 - - - <%-- - - -
-
- -
- - 단문 - 그림(장) - 장문 - -
-
-
-
-
- --%> @@ -612,8 +630,7 @@ function fn_updateSendRealTime(userId, msgGroupId){
- - + @@ -627,30 +644,16 @@ function fn_updateSendRealTime(userId, msgGroupId){ - <%-- + - - + + API + + + 홈페이지 - - - - --%> - <%-- - - - 정상수신 - - - 수신오류 - - - 결과대기 - - - --%> - <%----%> + @@ -702,7 +705,7 @@ function fn_updateSendRealTime(userId, msgGroupId){ - + diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp index a2b8b99f..613195f1 100644 --- a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp +++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp @@ -3721,6 +3721,7 @@ function kakaoATDelayCancel(msgGroupId){ + @@ -3733,6 +3734,7 @@ function kakaoATDelayCancel(msgGroupId){ 번호 종류 + 방식 등록일시 전송일시 발신번호 @@ -3747,7 +3749,9 @@ function kakaoATDelayCancel(msgGroupId){ - + + + @@ -3771,6 +3775,16 @@ function kakaoATDelayCancel(msgGroupId){ + + + + WEB + + + API + + + @@ -3898,7 +3912,7 @@ function kakaoATDelayCancel(msgGroupId){ - 문자 발송 내역이 없습니다. + 문자 발송 내역이 없습니다. @@ -3916,6 +3930,7 @@ function kakaoATDelayCancel(msgGroupId){ + @@ -3928,6 +3943,7 @@ function kakaoATDelayCancel(msgGroupId){ 번호 종류 + 방식 등록일시 요청일시 발신번호 @@ -3966,6 +3982,16 @@ function kakaoATDelayCancel(msgGroupId){ + + + + WEB + + + API + + + @@ -4094,7 +4120,7 @@ function kakaoATDelayCancel(msgGroupId){ - 예약 문자 내역이 없습니다. + 예약 문자 내역이 없습니다. @@ -4116,6 +4142,7 @@ function kakaoATDelayCancel(msgGroupId){ + @@ -4128,6 +4155,7 @@ function kakaoATDelayCancel(msgGroupId){ 종류 + 방식 등록일시 전송일시 발신번호 @@ -4170,6 +4198,16 @@ function kakaoATDelayCancel(msgGroupId){ + + + + WEB + + + API + + + @@ -4293,7 +4331,7 @@ function kakaoATDelayCancel(msgGroupId){ - 문자 지연 내역이 없습니다. + 문자 지연 내역이 없습니다.