재전송 오류 수정

src/main/java/itn/com/cmm/util/MsgSendUtils.java

@@ -357,6 +357,13 @@ public final class MsgSendUtils {
 
 			
 
+			/* @isHolidayNotified
+			 *  - 관리자 알림 설정으로 인해 
+			 *  - 해당 시간이면 지연 미처리
+			 * @smishingYn
+			 *  - 회원 별 '스미싱 온' 상태값
+			 *  - Y면 알림, 지연 처리해야 함
+			 * */
 			if("Y".equalsIgnoreCase(smishingYn) && isHolidayNotified) {
 				mjonMsgVO.setSpamStatus("Y");
 				mjonMsgVO.setSmishingYn("Y");
@@ -461,6 +468,10 @@ public final class MsgSendUtils {
 					
 				}
 				
+				/* @isHolidayNotified
+				 *  - 관리자 알림 설정으로 인해 
+				 *  - 해당 시간이면 지연 미처리
+				 * */
 				mjonMsgVO.setSpamStatus("Y");
 				if(isHolidayNotified) {
 					mjonMsgVO.setDelayYn("Y");

src/main/java/itn/let/mjo/mjocommon/MjonCommon.java

@@ -544,10 +544,6 @@ private int parseIntOrDefault(String value, int defaultValue) {
 		List<MsgHolidayVO> holidayList = getHolidayList();
 		boolean isNotificationAllowed = new MjonHolidayApi().getHolidaySmishingPassStatus(alarmList, holidayList);
 
-		System.out.println(" :: isNotificationAllowed : "+ isNotificationAllowed);
-		System.out.println(" :: isNotificationAllowed : "+ isNotificationAllowed);
-		System.out.println(" :: isNotificationAllowed : "+ isNotificationAllowed);
-		System.out.println(" :: isNotificationAllowed : "+ isNotificationAllowed);
 		return !isNotificationAllowed; // 알림 발송 조건 미충족
 	}
 

src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataServiceImpl.java

@@ -4060,11 +4060,6 @@ public class MjonMsgDataServiceImpl extends EgovAbstractServiceImpl implements M
 		System.out.println("================================");
 		// 스팸 및 스미싱 의심이면 slack 알림
 		boolean isHolidayNotified = mjonCommon.handleSmishingAlert(mjonMsgVO);
-		System.out.println("isNotified :: "+ isHolidayNotified);
-		System.out.println("isNotified :: "+ isHolidayNotified);
-		System.out.println("isNotified :: "+ isHolidayNotified);
-		System.out.println("isNotified :: "+ isHolidayNotified);
-		System.out.println("isNotified :: "+ isHolidayNotified);
 		
 		
 		// 스팸관련 키워드 select

src/main/webapp/WEB-INF/jsp/web/msgdata/MsgSentListAjax.jsp

@@ -73,8 +73,11 @@ function fnMjMsgReSendAll(msgGroupId, replaceCnt, electionCnt, advertisementCnt)
 				if (advertisementCnt > 0) {
 					// 광고문자
 					form.msgResendAllAdvertiseYn.value = "Y";
+					form.action="/web/mjon/msgdata/excel/selectMsgExcelDataView.do";
+				}
+				else{
+					form.action="/web/mjon/msgdata/selectMsgDataView.do";
 				}
-				form.action="/web/mjon/msgdata/selectMsgDataView.do";
 			}
 			form.submit();					
 		}
@@ -96,8 +99,12 @@ function fnMjMsgReSendAll(msgGroupId, replaceCnt, electionCnt, advertisementCnt)
 				if (advertisementCnt > 0) {
 					// 광고문자
 					form.msgResendAllAdvertiseYn.value = "Y";
+					form.action="/web/mjon/msgdata/excel/selectMsgExcelDataView.do";
+				}
+				else{
+					
+					form.action="/web/mjon/msgdata/selectMsgDataView.do";
 				}
-				form.action="/web/mjon/msgdata/selectMsgDataView.do";
 			}
 			form.submit();		
 	    }

src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp

@@ -694,8 +694,12 @@ function fnMjMsgReSendAll(msgGroupId, replaceCnt, electionCnt, advertisementCnt)
 				if (advertisementCnt > 0) {
 					// 광고문자
 					form.msgResendAllAdvertiseYn.value = "Y";
+					form.action="/web/mjon/msgdata/excel/selectMsgExcelDataView.do";
+				}
+				else
+				{
+					form.action="/web/mjon/msgdata/selectMsgDataView.do";
 				}
-				form.action="/web/mjon/msgdata/selectMsgDataView.do";
 			}
 			form.submit();					
 		}
@@ -717,8 +721,12 @@ function fnMjMsgReSendAll(msgGroupId, replaceCnt, electionCnt, advertisementCnt)
 				if (advertisementCnt > 0) {
 					// 광고문자
 					form.msgResendAllAdvertiseYn.value = "Y";
+					form.action="/web/mjon/msgdata/excel/selectMsgExcelDataView.do";
+				}
+				else
+				{
+					form.action="/web/mjon/msgdata/selectMsgDataView.do";
 				}
-				form.action="/web/mjon/msgdata/selectMsgDataView.do";
 			}
 			form.submit();		
 	    }

src/main/webapp/js/web/msgdata/msgDataView.js

@@ -60,10 +60,10 @@ function getMjMsgGroupInfoByResend() {
 				
 				// 문자내용
 				if (smsTxt.indexOf("(광고)") == 0) {
-					$('#send_adYnY').prop('checked', true);
+					// $('#send_adYnY').prop('checked', true);
 					
 					//광고 상하단 내용 넣어주기
-					advMsgInsert();				
+					// advMsgInsert();				
 					
 					// 광고 기본정보 제거
 					smsTxt = $.trim(smsTxt.replace("(광고)", ""));