From 875aad3696374c7f80b2835291beea858d02cf9e Mon Sep 17 00:00:00 2001 From: itn Date: Tue, 17 Oct 2023 12:23:37 +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=EC=B9=98=ED=99=98=EB=AC=B8=EC=9E=90=20=EA=B4=80?= =?UTF-8?q?=EB=A0=A8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/MjonMsgCampainDataController.java | 1 + .../mjo/msgdata/service/MjonMsgDataVO.java | 7 +++++ .../msgdata/web/MjonMsgDataController.java | 1 + .../jsp/web/msgcampain/MsgDataView.jsp | 7 +++-- .../WEB-INF/jsp/web/msgdata/MsgDataView.jsp | 7 +++-- .../jsp/web/msgdata/MsgSentListAjax.jsp | 30 ++++++++++++++----- .../WEB-INF/jsp/web/msgsent/MsgSentView.jsp | 26 ++++++++++++---- 7 files changed, 63 insertions(+), 16 deletions(-) diff --git a/src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainDataController.java b/src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainDataController.java index 4445266a..84bb44af 100644 --- a/src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainDataController.java +++ b/src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainDataController.java @@ -283,6 +283,7 @@ public class MjonMsgCampainDataController { model.addAttribute("msgResendAllFlag", searchVO.getMsgResendAllFlag()); model.addAttribute("msgResendAllGroupId", searchVO.getMsgResendAllGroupId()); model.addAttribute("msgResendAllAdvertiseYn", searchVO.getMsgResendAllAdvertiseYn()); + model.addAttribute("msgResendAllReplaceYn", searchVO.getMsgResendAllReplaceYn()); return "web/msgcampain/MsgDataView"; } diff --git a/src/main/java/itn/let/mjo/msgdata/service/MjonMsgDataVO.java b/src/main/java/itn/let/mjo/msgdata/service/MjonMsgDataVO.java index d4039d1c..10c9854a 100644 --- a/src/main/java/itn/let/mjo/msgdata/service/MjonMsgDataVO.java +++ b/src/main/java/itn/let/mjo/msgdata/service/MjonMsgDataVO.java @@ -70,8 +70,15 @@ public class MjonMsgDataVO extends UserDefaultVO{ private String msgResendAllFlag; private String msgResendAllGroupId; private String msgResendAllAdvertiseYn; + private String msgResendAllReplaceYn; private String atchFiles; + public String getMsgResendAllReplaceYn() { + return msgResendAllReplaceYn; + } + public void setMsgResendAllReplaceYn(String msgResendAllReplaceYn) { + this.msgResendAllReplaceYn = msgResendAllReplaceYn; + } public String getAtchFiles() { return atchFiles; } 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 f934df87..f3509014 100644 --- a/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java +++ b/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java @@ -407,6 +407,7 @@ public class MjonMsgDataController { model.addAttribute("msgResendAllFlag", searchVO.getMsgResendAllFlag()); model.addAttribute("msgResendAllGroupId", searchVO.getMsgResendAllGroupId()); model.addAttribute("msgResendAllAdvertiseYn", searchVO.getMsgResendAllAdvertiseYn()); + model.addAttribute("msgResendAllReplaceYn", searchVO.getMsgResendAllReplaceYn()); }catch(Exception ex) { ex.printStackTrace(); diff --git a/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataView.jsp index 52857c12..0f020252 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataView.jsp @@ -23,6 +23,7 @@ var popCustomScrT=0; // 맞춤제작 요청 JSPark => 2023.02.21 추가 var msgResendAllFlag = "${msgResendAllFlag}"; var msgResendAllGroupId = "${msgResendAllGroupId}"; var msgResendAllAdvertiseYn = "${msgResendAllAdvertiseYn}"; +var msgResendAllReplaceYn = "${msgResendAllReplaceYn}"; $(document).ready(function(){ //문자 발송 화면 폼 불러오기 @@ -223,8 +224,10 @@ function listMsgDataView(){ // 문자 재전송 New if (msgResendAllFlag == "Y") { - // 문자 그룹정보 => 재전송용 - getMjMsgGroupInfoByResend(); + if (msgResendAllReplaceYn != "Y") { + // 문자 그룹정보 => 재전송용 + getMjMsgGroupInfoByResend(); + } // 문자 상세정보 => 재전송용 getMjMsgListByResend(); diff --git a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataView.jsp index e08a8c96..1516e032 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataView.jsp @@ -23,6 +23,7 @@ var popCustomScrT=0; // 맞춤제작 요청 JSPark => 2023.02.21 추가 var msgResendAllFlag = "${msgResendAllFlag}"; var msgResendAllGroupId = "${msgResendAllGroupId}"; var msgResendAllAdvertiseYn = "${msgResendAllAdvertiseYn}"; +var msgResendAllReplaceYn = "${msgResendAllReplaceYn}"; $(document).ready(function(){ var tsMoreSampleYn = "${moreSampleYn}"; @@ -418,8 +419,10 @@ function listMsgDataView(){ // 문자 재전송 New if (msgResendAllFlag == "Y") { - // 문자 그룹정보 => 재전송용 - getMjMsgGroupInfoByResend(); + if (msgResendAllReplaceYn != "Y") { + // 문자 그룹정보 => 재전송용 + getMjMsgGroupInfoByResend(); + } // 문자 상세정보 => 재전송용 getMjMsgListByResend(); diff --git a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgSentListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgSentListAjax.jsp index 7b2c1867..dc8ce99e 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgSentListAjax.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgSentListAjax.jsp @@ -58,8 +58,26 @@ $(document).ready(function(){ //문자 재전송 function fnMjMsgReSendAll(msgGroupId, replaceCnt, electionCnt, advertisementCnt) { + var form = document.reSendAllForm; + form.msgResendAllFlag.value = "Y"; + form.msgResendAllGroupId.value = msgGroupId; + if (replaceCnt > 0) { - alert("치환문자는 재전송 불가합니다."); + if (confirm("특정문구 일괄변환 문자(치환문자)의 경우 문자내용은 재전송할 수 없고 받는 사람 목록만 불러올 수 있습니다.\n받는사람 목록을 불러올까요?")) { + // 광고문자 + form.msgResendAllReplaceYn.value = "Y"; + if (electionCnt > 0) { + form.action="/web/mjon/msgcampain/selectMsgDataView.do"; + } + else { + if (advertisementCnt > 0) { + // 광고문자 + form.msgResendAllAdvertiseYn.value = "Y"; + } + form.action="/web/mjon/msgdata/selectMsgDataView.do"; + } + form.submit(); + } } else { var title = ""; @@ -70,11 +88,7 @@ function fnMjMsgReSendAll(msgGroupId, replaceCnt, electionCnt, advertisementCnt) title = "문자발송"; } - //if (confirm(title + " 화면으로 이동합니다.\n문자내용, 받는사람 확인후 발송해주세요.")) { - if (confirm("문자내용, 받는사람 확인후 발송해주세요.")) { - var form = document.reSendAllForm; - form.msgResendAllFlag.value = "Y"; - form.msgResendAllGroupId.value = msgGroupId; + if (confirm("문자 재전송 하시겠습니까?\n문자내용, 받는 사람 목록 확인후 발송해주세요.")) { if (electionCnt > 0) { form.action="/web/mjon/msgcampain/selectMsgDataView.do"; } @@ -112,7 +126,9 @@ function fnRevDetailPop(msgGroupId, msgId, fileCnt){
- + + +
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 aac6f6f8..3c945a2c 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp @@ -705,8 +705,26 @@ function infoPop(pageUrl){ //문자 재전송 function fnMjMsgReSendAll(msgGroupId, replaceCnt, electionCnt, advertisementCnt) { + var form = document.reSendAllForm; + form.msgResendAllFlag.value = "Y"; + form.msgResendAllGroupId.value = msgGroupId; + if (replaceCnt > 0) { - alert("치환문자는 재전송 불가합니다."); + if (confirm("특정문구 일괄변환 문자(치환문자)의 경우 문자내용은 재전송할 수 없고 받는 사람 목록만 불러올 수 있습니다.\n받는사람 목록을 불러올까요?")) { + // 광고문자 + form.msgResendAllReplaceYn.value = "Y"; + if (electionCnt > 0) { + form.action="/web/mjon/msgcampain/selectMsgDataView.do"; + } + else { + if (advertisementCnt > 0) { + // 광고문자 + form.msgResendAllAdvertiseYn.value = "Y"; + } + form.action="/web/mjon/msgdata/selectMsgDataView.do"; + } + form.submit(); + } } else { var title = ""; @@ -717,10 +735,7 @@ function fnMjMsgReSendAll(msgGroupId, replaceCnt, electionCnt, advertisementCnt) title = "문자발송"; } - if (confirm(title + " 화면으로 이동합니다.\n문자내용, 받는사람 확인후 발송해주세요.")) { - var form = document.reSendAllForm; - form.msgResendAllFlag.value = "Y"; - form.msgResendAllGroupId.value = msgGroupId; + if (confirm(title + " 화면으로 이동합니다.\n문자내용, 받는 사람 목록 확인후 발송해주세요.")) { if (electionCnt > 0) { form.action="/web/mjon/msgcampain/selectMsgDataView.do"; } @@ -1082,4 +1097,5 @@ function fnMjMsgReSendAll(msgGroupId, replaceCnt, electionCnt, advertisementCnt) + \ No newline at end of file