Commit @3f323ca9f5aaee0d2d131d832e59a7e79380e072

itn 2023-10-11

문자 재전송 기능 작업중

@3f323ca9f5aaee0d2d131d832e59a7e79380e072

aac2f73

3f323ca

src/main/java/itn/let/mjo/msgdata/service/MjonMsgDataVO.java

--- src/main/java/itn/let/mjo/msgdata/service/MjonMsgDataVO.java

+++ src/main/java/itn/let/mjo/msgdata/service/MjonMsgDataVO.java


 	private String msgResendAllFlag;
 	private String msgResendAllGroupId;
 	private String msgResendAllAdvertiseYn;		
-
+	private String atchFiles;
+	
+	public String getAtchFiles() {
+		return atchFiles;
+	}
+	public void setAtchFiles(String atchFiles) {
+		this.atchFiles = atchFiles;
+	}
 	public String getMsgGroupId() {
 		return msgGroupId;
 	}

aac2f73

3f323ca

src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java

--- src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java

+++ src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java


 		
 		boolean isSuccess = true;
 		String msg = "";
+		List<?> resultMsgAddPhotoInfo = null;
 		
 		LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
     	String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId());

         		mjonMsgDataVO.setUserId(userId);
         		mjonMsgDataVO.setMsgGroupId(mjonMsgDataVO.getMsgResendAllGroupId());
         		mjonMsgDataVO = mjonMsgDataService.selectMjMsgGroupInfoByResend(mjonMsgDataVO);
+        		if (mjonMsgDataVO != null) {
+        			String[] atchFiles = mjonMsgDataVO.getAtchFiles().split("\\^");
+        			if (atchFiles.length >= 1) {
+        				mjonMsgDataVO.setAtchFileId1(atchFiles[0]);
+        			}
+        			if (atchFiles.length >= 2) {
+        				mjonMsgDataVO.setAtchFileId2(atchFiles[1]);
+        			}
+        			if (atchFiles.length >= 3) {
+        				mjonMsgDataVO.setAtchFileId3(atchFiles[2]);
+        			}
+        		}
+        		
+				//문자함 리스트의 첨부이미지 정보 불러오기
+				resultMsgAddPhotoInfo = mjonMsgDataService.selectMsgAddPhotoInfo(mjonMsgDataVO);        		
         	}
 		}
 		catch(Exception e) {

 			
 		modelAndView.addObject("isSuccess", isSuccess);
 		modelAndView.addObject("msg", msg);
-		modelAndView.addObject("result", mjonMsgDataVO);
+		modelAndView.addObject("resultMsgInfo", mjonMsgDataVO);
+		modelAndView.addObject("resultMsgAddPhotoInfo", resultMsgAddPhotoInfo);
 
 		return modelAndView;
 	}

aac2f73

3f323ca

src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml

--- src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml

+++ src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml


 			CALL_FROM AS callFrom
 			, SUBJECT AS subject
 			, SMS_TXT AS smsTxt
-			, (
-				SELECT 
-					IFNULL(FILE_PATH1, '')
-				FROM MJ_MSG_DATA 
+ 			,(
+				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 
-					USER_ID = #userId#
-					AND MSG_GROUP_ID = #msgGroupId#
-				LIMIT 1	
-			) filePath1
-			, (
-				SELECT 
-					IFNULL(FILE_PATH2, '')
-				FROM MJ_MSG_DATA 
-				WHERE 
-					USER_ID = #userId#
-					AND MSG_GROUP_ID = #msgGroupId#
-				LIMIT 1	
-			) filePath2
-			, (
-				SELECT 
-					IFNULL(FILE_PATH3, '')
-				FROM MJ_MSG_DATA 
-				WHERE 
-					USER_ID = #userId#
-					AND MSG_GROUP_ID = #msgGroupId#
-				LIMIT 1	
-			) filePath3	
-		FROM MJ_MSG_GROUP_DATA 
+					B.MSG_GROUP_ID = A.MSG_GROUP_ID
+					LIMIT 1
+			) AS atchFiles	
+		FROM MJ_MSG_GROUP_DATA A
 		WHERE 
-			USER_ID = #userId#
-			AND MSG_GROUP_ID = #msgGroupId#
+			A.USER_ID = #userId#
+			AND A.MSG_GROUP_ID = #msgGroupId#
 		LIMIT 1
 	</select>
 

aac2f73

3f323ca

src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataView.jsp

--- src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataView.jsp

+++ src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataView.jsp


 		dataType:'json',
 		async: false,
 		success: function (data) {
+			//alert(JSON.stringify(data));
 			if(data.isSuccess == true){
-				//data.result.callFrom;
-				//data.result.subject;
-				//data.result.smsTxt;
-				//data.result.filePath1;
-				//data.result.filePath2;
-				//data.result.filePath3;
-
+				var msgData = data.resultMsgInfo;
+				var fileData = data.resultMsgAddPhotoInfo;
+				
 				// 발신번호
 				var reCallFrom = $.trim(removeDash($("#callFromList option:selected").val()));
-				if ($.trim(removeDash(data.result.callFrom)) != reCallFrom) {
+				if ($.trim(removeDash(msgData.callFrom)) != reCallFrom) {
 					alert("선택된 발신번호가 이전에 발송한 발신번호가 아닙니다.\n발신번호를 확인해주세요.")
 				}
 				
-				/*
-				// 제목
-				if (data.result.subject != null && data.result.subject != "") {
+				var smsTxt = msgData.smsTxt;
+				var subject = msgData.subject;
+				var fileId = "";
+				var filePath = "";
+				var len = fileData.length;
+				
+				// 기존 내용 지워주기
+				//$(".btnReset").trigger("click");
+				$('.delLi').each(function(){
+					$(this).remove();
+				});
+				
+				$('.preBoxF').each(function(){
+					$(this).remove();
+				});
+
+				$('#imgCnt').val(0);
+				
+				// 기존 imgFileId, imgFilePath 배열에 있는 내용 초기화 해주기
+				imgFilePath = [];
+				imgFileId = [];
+
+				// 문자제목
+				if (msgData.subject != null && msgData.subject != "") {
 					$('.msg_title').addClass('active');
 					$("input:radio[name='title_status']:radio[value='Y']").prop('checked', true); // 선택하기
 					$('.textbox').show();
-					$("#mmsSubject").val(data.result.subject);	
+					$("#mmsSubject").val(subject);	
 				}
 				
-				var reSmsTxt = data.result.smsTxt.replaceAll("<br/>", "\n");	//줄발꿈문자 변환하기
 				// 문자내용
-				if(reSmsTxt != null){
-					$("#smsTxtArea").val(reSmsTxt);
-					fnByteString(reSmsTxt);
+				// 선거 기본정보 제거
+				smsTxt = $.trim(smsTxt.replace("(선거운동정보)", ""));
+				var smsTxtLastIdxCnt = smsTxt.lastIndexOf("후보자전화번호");
+				if (smsTxtLastIdxCnt != -1) {
+					smsTxt = $.trim(smsTxt.substring(0, smsTxtLastIdxCnt));	
 				}
-				*/
+				$('#smsTxtArea').val(smsTxt);
+				
+				// 첨부 이미지가 있는경우 이미지 처리해주기
+				if(len > 0) {
+					for(var i=0; i < len; i++) {
+						var num = i + 1;
+						var imgId = fileData[i].atchFileId;
+						var imgSn = fileData[i].fileSn;
+						var fileStreCours = fileData[i].fileStreCours;
+						var streFileNm = fileData[i].streFileNm;
+						var fileExtsn = fileData[i].fileExtsn;
+						
+						/* var imgSrc = fileStreCours + "/" + streFileNm + "." + fileExtsn; */
+						var imgSrc = '/cmm/fms/getImage2.do?atchFileId=' + imgId + '&fileSn=' + imgSn;
+						myMsgImageControl(imgSrc, "edit_n", "Template", imgId);
+					}
+					
+					fnByteString(smsTxt);
+				}
+				else {
+					fnByteString(smsTxt);
+				}
+				
+				// 문자전송 상단으로 이동
+				var sendOfT=$('.send_top').offset().top;
+				$('html,body').stop().animate({'scrollTop':sendOfT-60},250);		
 				
 			} else {
-				alert("Message : " + msg);
+				//alert("Message : " + msg);
 			}
 		},
 		error: function (e) { 

aac2f73

3f323ca

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

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

+++ src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp


 		
 	});
 	
-	function advMsgInsert(){
-		
-		var advStr = '<div class="ad_txt"><p>(광고)</p></div>';
-		var advDenyStr = '<div class="deny_txt"><p>무료거부 0808800858</p> </div>';
-		
-		var preAdvStr = '<p class="ad_tit">(광고)</p>';
-		var preAdvDenyStr = '<p class="deny_receipt">무료거부 0808800858</p>';
-		
-		//광고 및 무료수신거부 텍스트 추가
-		if ($('input[name=send_adYn]:checked').val() == 'Y'){
-			
-			//문자 내용에 광고 문자 추가해주기
-			$(advStr).insertBefore('textarea[name=smsTxtArea]'); 
-			$(advDenyStr).insertBefore('div[name=afterDeny]');
-			
-			//미리보기에 광고 문자 추가해주기
-			$(preAdvStr).insertBefore('.none_txt');
-			$(preAdvDenyStr).insertAfter('.realtime');
-			
-			//$('#smsTxtArea').val(advStr + "\r\n" + contents + "\r\n" + advDenyStr);
-			
-			
-		}else{ //광고 및 무료수신거부 텍스트 삭제
-			
-			//문자내용 광고문자 삭제하기
-			$('.ad_txt').remove();
-			$('.deny_txt').remove();
-			
-			//미리보기 광고 문자 삭제하기
-			$('.ad_tit').remove();
-			$('.deny_receipt').remove();
-			
-		}
-		
-		//문자 바이트수 계산하기
-		fnByteString($('#smsTxtArea').val());
-		
-	}
+
 	
 	
 	//문자 내용 입력시 바이트수 계산하기

 		$('.send_btn .btnType:first-child').html('예약하기');
 	});
 });
+
+function advMsgInsert(){
 	
+	var advStr = '<div class="ad_txt"><p>(광고)</p></div>';
+	var advDenyStr = '<div class="deny_txt"><p>무료거부 0808800858</p> </div>';
+	
+	var preAdvStr = '<p class="ad_tit">(광고)</p>';
+	var preAdvDenyStr = '<p class="deny_receipt">무료거부 0808800858</p>';
+	
+	//광고 및 무료수신거부 텍스트 추가
+	if ($('input[name=send_adYn]:checked').val() == 'Y'){
+		
+		//문자 내용에 광고 문자 추가해주기
+		$(advStr).insertBefore('textarea[name=smsTxtArea]'); 
+		$(advDenyStr).insertBefore('div[name=afterDeny]');
+		
+		//미리보기에 광고 문자 추가해주기
+		$(preAdvStr).insertBefore('.none_txt');
+		$(preAdvDenyStr).insertAfter('.realtime');
+		
+		//$('#smsTxtArea').val(advStr + "\r\n" + contents + "\r\n" + advDenyStr);
+		
+		
+	}else{ //광고 및 무료수신거부 텍스트 삭제
+		
+		//문자내용 광고문자 삭제하기
+		$('.ad_txt').remove();
+		$('.deny_txt').remove();
+		
+		//미리보기 광고 문자 삭제하기
+		$('.ad_tit').remove();
+		$('.deny_receipt').remove();
+		
+	}
+	
+	//문자 바이트수 계산하기
+	fnByteString($('#smsTxtArea').val());
+	
+}
+
 //문자 바이트수 계산하기 함수
 function fnByteString(contents){
 	var totalByte = 0; 

aac2f73

3f323ca

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

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

+++ src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataView.jsp


 		dataType:'json',
 		async: false,
 		success: function (data) {
+			//alert(JSON.stringify(data));
 			if(data.isSuccess == true){
-				//data.result.callFrom;
-				//data.result.subject;
-				//data.result.smsTxt;
-				//data.result.filePath1;
-				//data.result.filePath2;
-				//data.result.filePath3;
-
+				var msgData = data.resultMsgInfo;
+				var fileData = data.resultMsgAddPhotoInfo;
+				
 				// 발신번호
 				var reCallFrom = $.trim(removeDash($("#callFromList option:selected").val()));
-				if ($.trim(removeDash(data.result.callFrom)) != reCallFrom) {
+				if ($.trim(removeDash(msgData.callFrom)) != reCallFrom) {
 					alert("선택된 발신번호가 이전에 발송한 발신번호가 아닙니다.\n발신번호를 확인해주세요.")
 				}
 				
-				/*
-				// 제목
-				if (data.result.subject != null && data.result.subject != "") {
+				var smsTxt = msgData.smsTxt;
+				var subject = msgData.subject;
+				var fileId = "";
+				var filePath = "";
+				var len = fileData.length;
+				
+				// 기존 내용 지워주기
+				//$(".btnReset").trigger("click");
+				$('.delLi').each(function(){
+					$(this).remove();
+				});
+				
+				$('.preBoxF').each(function(){
+					$(this).remove();
+				});
+
+				$('#imgCnt').val(0);
+				
+				// 기존 imgFileId, imgFilePath 배열에 있는 내용 초기화 해주기
+				imgFilePath = [];
+				imgFileId = [];
+
+				// 문자제목
+				if (msgData.subject != null && msgData.subject != "") {
 					$('.msg_title').addClass('active');
 					$("input:radio[name='title_status']:radio[value='Y']").prop('checked', true); // 선택하기
 					$('.textbox').show();
-					$("#mmsSubject").val(data.result.subject);	
+					$("#mmsSubject").val(subject);	
 				}
 				
-				var reSmsTxt = data.result.smsTxt.replaceAll("<br/>", "\n");	//줄발꿈문자 변환하기
 				// 문자내용
-				if(reSmsTxt != null){
-					$("#smsTxtArea").val(reSmsTxt);
-					fnByteString(reSmsTxt);
+				if (smsTxt.lastIndexOf("(광고)") != -1) {
+					$('#send_adYnY').prop('checked', true);
+					
+					//광고 상하단 내용 넣어주기
+					advMsgInsert();				
+					
+					// 광고 기본정보 제거
+					smsTxt = $.trim(smsTxt.replace("(광고)", ""));
+					var smsTxtLastIdxCnt = smsTxt.lastIndexOf("무료거부");
+					if (smsTxtLastIdxCnt != -1) {
+						smsTxt = $.trim(smsTxt.substring(0, smsTxtLastIdxCnt));	
+					}					
 				}
-				*/
+				$('#smsTxtArea').val(smsTxt);	
+				
+				// 첨부 이미지가 있는경우 이미지 처리해주기
+				if(len > 0) {
+					for(var i=0; i < len; i++) {
+						var num = i + 1;
+						var imgId = fileData[i].atchFileId;
+						var imgSn = fileData[i].fileSn;
+						var fileStreCours = fileData[i].fileStreCours;
+						var streFileNm = fileData[i].streFileNm;
+						var fileExtsn = fileData[i].fileExtsn;
+						
+						/* var imgSrc = fileStreCours + "/" + streFileNm + "." + fileExtsn; */
+						var imgSrc = '/cmm/fms/getImage2.do?atchFileId=' + imgId + '&fileSn=' + imgSn;
+						myMsgImageControl(imgSrc, "edit_n", "Template", imgId);
+					}
+					
+					fnByteString(smsTxt);
+				}
+				else {
+					fnByteString(smsTxt);
+				}
+				
+				// 문자전송 상단으로 이동
+				var sendOfT=$('.send_top').offset().top;
+				$('html,body').stop().animate({'scrollTop':sendOfT-60},250);		
 				
 			} else {
-				alert("Message : " + msg);
+				//alert("Message : " + msg);
 			}
 		},
 		error: function (e) { 

aac2f73

3f323ca

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

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

+++ src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp


 				</tr>
 			</thead>
 			<tbody>
-				<c:set var="replaceCnt" value="0" />
-				<c:set var="electionCnt" value="0" />
-				<c:set var="advertisementCnt" value="0" />		
 				<c:choose>
 					<c:when test="${not empty resultAllSentList}">
 					<c:forEach var="resultAllSentList" items="${resultAllSentList}" varStatus="status">
+						<c:set var="replaceCnt" value="0" />
+						<c:set var="electionCnt" value="0" />
+						<c:set var="advertisementCnt" value="0" />		
+
 						<c:if test="${fn:indexOf(resultAllSentList.smsTxt,'[*이름*]') != -1 || fn:indexOf(resultAllSentList.smsTxt,'[*1*]') != -1 || fn:indexOf(resultAllSentList.smsTxt,'[*2*]') != -1 || fn:indexOf(resultAllSentList.smsTxt,'[*3*]') != -1 || fn:indexOf(resultAllSentList.smsTxt,'[*4*]') != -1}">
 							<c:set var="replaceCnt" value="1" />
 						</c:if>

 							<td name="listTd">
 								<button class="btnType btnType20" data-tooltip="rev_popup01" onClick="javascript:fnRevDetailPop('${resultAllSentList.msgGroupId}','${resultAllSentList.msgId}','${resultAllSentList.fileCnt}'); return false;">상세보기</button>
 								<%--
-								<button class="btnType btnType20" onClick="javascript:fnMjMsgReSendAll('${resultAllSentList.msgGroupId}','${replaceCnt}','${electionCnt}','${advertisementCnt}'); return false;">재전송</button>
+								<button class="btnType btnType20" onClick="javascript:fnMjMsgReSendAll('${resultAllSentList.msgGroupId}','${replaceCnt}','${electionCnt}','${advertisementCnt}'); return false;">재전송</button>								
 								--%>
 							</td>
 							<td name="listTd">

Add a comment

Open 0
Closed 0

List

...	...	@@ -5881,6 +5881,7 @@
5881	5881
5882	5882	boolean isSuccess = true;
5883	5883	String msg = "";
	5884	+ List<?> resultMsgAddPhotoInfo = null;
5884	5885
5885	5886	LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
5886	5887	String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId());
...	...	@@ -5894,6 +5895,21 @@
5894	5895	mjonMsgDataVO.setUserId(userId);
5895	5896	mjonMsgDataVO.setMsgGroupId(mjonMsgDataVO.getMsgResendAllGroupId());
5896	5897	mjonMsgDataVO = mjonMsgDataService.selectMjMsgGroupInfoByResend(mjonMsgDataVO);
	5898	+ if (mjonMsgDataVO != null) {
	5899	+ String[] atchFiles = mjonMsgDataVO.getAtchFiles().split("\\^");
	5900	+ if (atchFiles.length >= 1) {
	5901	+ mjonMsgDataVO.setAtchFileId1(atchFiles[0]);
	5902	+ }
	5903	+ if (atchFiles.length >= 2) {
	5904	+ mjonMsgDataVO.setAtchFileId2(atchFiles[1]);
	5905	+ }
	5906	+ if (atchFiles.length >= 3) {
	5907	+ mjonMsgDataVO.setAtchFileId3(atchFiles[2]);
	5908	+ }
	5909	+ }
	5910	+
	5911	+ //문자함 리스트의 첨부이미지 정보 불러오기
	5912	+ resultMsgAddPhotoInfo = mjonMsgDataService.selectMsgAddPhotoInfo(mjonMsgDataVO);
5897	5913	}
5898	5914	}
5899	5915	catch(Exception e) {
...	...	@@ -5903,7 +5919,8 @@
5903	5919
5904	5920	modelAndView.addObject("isSuccess", isSuccess);
5905	5921	modelAndView.addObject("msg", msg);
5906		- modelAndView.addObject("result", mjonMsgDataVO);
	5922	+ modelAndView.addObject("resultMsgInfo", mjonMsgDataVO);
	5923	+ modelAndView.addObject("resultMsgAddPhotoInfo", resultMsgAddPhotoInfo);
5907	5924
5908	5925	return modelAndView;
5909	5926	}

...	...	@@ -7255,37 +7255,42 @@
7255	7255	CALL_FROM AS callFrom
7256	7256	, SUBJECT AS subject
7257	7257	, SMS_TXT AS smsTxt
7258		- , (
7259		- SELECT
7260		- IFNULL(FILE_PATH1, '')
7261		- FROM MJ_MSG_DATA
	7258	+ ,(
	7259	+ SELECT
	7260	+ CONCAT(
	7261	+ (
	7262	+ IF(B.FILE_PATH1 IS NOT NULL, (SELECT
	7263	+ ATCH_FILE_ID
	7264	+ FROM LETTNFILEDETAIL
	7265	+ WHERE CONCAT(STRE_FILE_NM, '.', FILE_EXTSN) = CONCAT(SUBSTRING_INDEX(B.FILE_PATH1, '/', -1))
	7266	+ LIMIT 1), '')
	7267	+ )
	7268	+ ,'^',
	7269	+ (
	7270	+ IF(B.FILE_PATH2 IS NOT NULL, (SELECT
	7271	+ ATCH_FILE_ID
	7272	+ FROM LETTNFILEDETAIL
	7273	+ WHERE CONCAT(STRE_FILE_NM, '.', FILE_EXTSN) = CONCAT(SUBSTRING_INDEX(B.FILE_PATH2, '/', -1))
	7274	+ LIMIT 1), '')
	7275	+ )
	7276	+ ,'^',
	7277	+ (
	7278	+ IF(B.FILE_PATH3 IS NOT NULL, (SELECT
	7279	+ ATCH_FILE_ID
	7280	+ FROM LETTNFILEDETAIL
	7281	+ WHERE CONCAT(STRE_FILE_NM, '.', FILE_EXTSN) = CONCAT(SUBSTRING_INDEX(B.FILE_PATH3, '/', -1))
	7282	+ LIMIT 1), '')
	7283	+ ))
	7284	+ FROM
	7285	+ MJ_MSG_DATA B
7262	7286	WHERE
7263		- USER_ID = #userId#
7264		- AND MSG_GROUP_ID = #msgGroupId#
7265		- LIMIT 1
7266		- ) filePath1
7267		- , (
7268		- SELECT
7269		- IFNULL(FILE_PATH2, '')
7270		- FROM MJ_MSG_DATA
7271		- WHERE
7272		- USER_ID = #userId#
7273		- AND MSG_GROUP_ID = #msgGroupId#
7274		- LIMIT 1
7275		- ) filePath2
7276		- , (
7277		- SELECT
7278		- IFNULL(FILE_PATH3, '')
7279		- FROM MJ_MSG_DATA
7280		- WHERE
7281		- USER_ID = #userId#
7282		- AND MSG_GROUP_ID = #msgGroupId#
7283		- LIMIT 1
7284		- ) filePath3
7285		- FROM MJ_MSG_GROUP_DATA
	7287	+ B.MSG_GROUP_ID = A.MSG_GROUP_ID
	7288	+ LIMIT 1
	7289	+ ) AS atchFiles
	7290	+ FROM MJ_MSG_GROUP_DATA A
7286	7291	WHERE
7287		- USER_ID = #userId#
7288		- AND MSG_GROUP_ID = #msgGroupId#
	7292	+ A.USER_ID = #userId#
	7293	+ AND A.MSG_GROUP_ID = #msgGroupId#
7289	7294	LIMIT 1
7290	7295	</select>
7291	7296

...	...	@@ -66,39 +66,83 @@
66	66	dataType:'json',
67	67	async: false,
68	68	success: function (data) {
	69	+ //alert(JSON.stringify(data));
69	70	if(data.isSuccess == true){
70		- //data.result.callFrom;
71		- //data.result.subject;
72		- //data.result.smsTxt;
73		- //data.result.filePath1;
74		- //data.result.filePath2;
75		- //data.result.filePath3;
76		-
	71	+ var msgData = data.resultMsgInfo;
	72	+ var fileData = data.resultMsgAddPhotoInfo;
	73	+
77	74	// 발신번호
78	75	var reCallFrom = $.trim(removeDash($("#callFromList option:selected").val()));
79		- if ($.trim(removeDash(data.result.callFrom)) != reCallFrom) {
	76	+ if ($.trim(removeDash(msgData.callFrom)) != reCallFrom) {
80	77	alert("선택된 발신번호가 이전에 발송한 발신번호가 아닙니다.\n발신번호를 확인해주세요.")
81	78	}
82	79
83		- /*
84		- // 제목
85		- if (data.result.subject != null && data.result.subject != "") {
	80	+ var smsTxt = msgData.smsTxt;
	81	+ var subject = msgData.subject;
	82	+ var fileId = "";
	83	+ var filePath = "";
	84	+ var len = fileData.length;
	85	+
	86	+ // 기존 내용 지워주기
	87	+ //$(".btnReset").trigger("click");
	88	+ $('.delLi').each(function(){
	89	+ $(this).remove();
	90	+ });
	91	+
	92	+ $('.preBoxF').each(function(){
	93	+ $(this).remove();
	94	+ });
	95	+
	96	+ $('#imgCnt').val(0);
	97	+
	98	+ // 기존 imgFileId, imgFilePath 배열에 있는 내용 초기화 해주기
	99	+ imgFilePath = [];
	100	+ imgFileId = [];
	101	+
	102	+ // 문자제목
	103	+ if (msgData.subject != null && msgData.subject != "") {
86	104	$('.msg_title').addClass('active');
87	105	$("input:radio[name='title_status']:radio[value='Y']").prop('checked', true); // 선택하기
88	106	$('.textbox').show();
89		- $("#mmsSubject").val(data.result.subject);
	107	+ $("#mmsSubject").val(subject);
90	108	}
91	109
92		- var reSmsTxt = data.result.smsTxt.replaceAll("<br/>", "\n"); //줄발꿈문자 변환하기
93	110	// 문자내용
94		- if(reSmsTxt != null){
95		- $("#smsTxtArea").val(reSmsTxt);
96		- fnByteString(reSmsTxt);
	111	+ // 선거 기본정보 제거
	112	+ smsTxt = $.trim(smsTxt.replace("(선거운동정보)", ""));
	113	+ var smsTxtLastIdxCnt = smsTxt.lastIndexOf("후보자전화번호");
	114	+ if (smsTxtLastIdxCnt != -1) {
	115	+ smsTxt = $.trim(smsTxt.substring(0, smsTxtLastIdxCnt));
97	116	}
98		- */
	117	+ $('#smsTxtArea').val(smsTxt);
	118	+
	119	+ // 첨부 이미지가 있는경우 이미지 처리해주기
	120	+ if(len > 0) {
	121	+ for(var i=0; i < len; i++) {
	122	+ var num = i + 1;
	123	+ var imgId = fileData[i].atchFileId;
	124	+ var imgSn = fileData[i].fileSn;
	125	+ var fileStreCours = fileData[i].fileStreCours;
	126	+ var streFileNm = fileData[i].streFileNm;
	127	+ var fileExtsn = fileData[i].fileExtsn;
	128	+
	129	+ /* var imgSrc = fileStreCours + "/" + streFileNm + "." + fileExtsn; */
	130	+ var imgSrc = '/cmm/fms/getImage2.do?atchFileId=' + imgId + '&fileSn=' + imgSn;
	131	+ myMsgImageControl(imgSrc, "edit_n", "Template", imgId);
	132	+ }
	133	+
	134	+ fnByteString(smsTxt);
	135	+ }
	136	+ else {
	137	+ fnByteString(smsTxt);
	138	+ }
	139	+
	140	+ // 문자전송 상단으로 이동
	141	+ var sendOfT=$('.send_top').offset().top;
	142	+ $('html,body').stop().animate({'scrollTop':sendOfT-60},250);
99	143
100	144	} else {
101		- alert("Message : " + msg);
	145	+ //alert("Message : " + msg);
102	146	}
103	147	},
104	148	error: function (e) {

...	...	@@ -511,44 +511,7 @@
511	511
512	512	});
513	513
514		- function advMsgInsert(){
515		-
516		- var advStr = '<div class="ad_txt"><p>(광고)</p></div>';
517		- var advDenyStr = '<div class="deny_txt"><p>무료거부 0808800858</p> </div>';
518		-
519		- var preAdvStr = '<p class="ad_tit">(광고)</p>';
520		- var preAdvDenyStr = '<p class="deny_receipt">무료거부 0808800858</p>';
521		-
522		- //광고 및 무료수신거부 텍스트 추가
523		- if ($('input[name=send_adYn]:checked').val() == 'Y'){
524		-
525		- //문자 내용에 광고 문자 추가해주기
526		- $(advStr).insertBefore('textarea[name=smsTxtArea]');
527		- $(advDenyStr).insertBefore('div[name=afterDeny]');
528		-
529		- //미리보기에 광고 문자 추가해주기
530		- $(preAdvStr).insertBefore('.none_txt');
531		- $(preAdvDenyStr).insertAfter('.realtime');
532		-
533		- //$('#smsTxtArea').val(advStr + "\r\n" + contents + "\r\n" + advDenyStr);
534		-
535		-
536		- }else{ //광고 및 무료수신거부 텍스트 삭제
537		-
538		- //문자내용 광고문자 삭제하기
539		- $('.ad_txt').remove();
540		- $('.deny_txt').remove();
541		-
542		- //미리보기 광고 문자 삭제하기
543		- $('.ad_tit').remove();
544		- $('.deny_receipt').remove();
545		-
546		- }
547		-
548		- //문자 바이트수 계산하기
549		- fnByteString($('#smsTxtArea').val());
550		-
551		- }
	514	+
552	515
553	516
554	517	//문자 내용 입력시 바이트수 계산하기
...	...	@@ -1954,7 +1917,46 @@
1954	1917	$('.send_btn .btnType:first-child').html('예약하기');
1955	1918	});
1956	1919	});
	1920	+
	1921	+function advMsgInsert(){
1957	1922
	1923	+ var advStr = '<div class="ad_txt"><p>(광고)</p></div>';
	1924	+ var advDenyStr = '<div class="deny_txt"><p>무료거부 0808800858</p> </div>';
	1925	+
	1926	+ var preAdvStr = '<p class="ad_tit">(광고)</p>';
	1927	+ var preAdvDenyStr = '<p class="deny_receipt">무료거부 0808800858</p>';
	1928	+
	1929	+ //광고 및 무료수신거부 텍스트 추가
	1930	+ if ($('input[name=send_adYn]:checked').val() == 'Y'){
	1931	+
	1932	+ //문자 내용에 광고 문자 추가해주기
	1933	+ $(advStr).insertBefore('textarea[name=smsTxtArea]');
	1934	+ $(advDenyStr).insertBefore('div[name=afterDeny]');
	1935	+
	1936	+ //미리보기에 광고 문자 추가해주기
	1937	+ $(preAdvStr).insertBefore('.none_txt');
	1938	+ $(preAdvDenyStr).insertAfter('.realtime');
	1939	+
	1940	+ //$('#smsTxtArea').val(advStr + "\r\n" + contents + "\r\n" + advDenyStr);
	1941	+
	1942	+
	1943	+ }else{ //광고 및 무료수신거부 텍스트 삭제
	1944	+
	1945	+ //문자내용 광고문자 삭제하기
	1946	+ $('.ad_txt').remove();
	1947	+ $('.deny_txt').remove();
	1948	+
	1949	+ //미리보기 광고 문자 삭제하기
	1950	+ $('.ad_tit').remove();
	1951	+ $('.deny_receipt').remove();
	1952	+
	1953	+ }
	1954	+
	1955	+ //문자 바이트수 계산하기
	1956	+ fnByteString($('#smsTxtArea').val());
	1957	+
	1958	+}
	1959	+
1958	1960	//문자 바이트수 계산하기 함수
1959	1961	function fnByteString(contents){
1960	1962	var totalByte = 0;

...	...	@@ -92,39 +92,90 @@
92	92	dataType:'json',
93	93	async: false,
94	94	success: function (data) {
	95	+ //alert(JSON.stringify(data));
95	96	if(data.isSuccess == true){
96		- //data.result.callFrom;
97		- //data.result.subject;
98		- //data.result.smsTxt;
99		- //data.result.filePath1;
100		- //data.result.filePath2;
101		- //data.result.filePath3;
102		-
	97	+ var msgData = data.resultMsgInfo;
	98	+ var fileData = data.resultMsgAddPhotoInfo;
	99	+
103	100	// 발신번호
104	101	var reCallFrom = $.trim(removeDash($("#callFromList option:selected").val()));
105		- if ($.trim(removeDash(data.result.callFrom)) != reCallFrom) {
	102	+ if ($.trim(removeDash(msgData.callFrom)) != reCallFrom) {
106	103	alert("선택된 발신번호가 이전에 발송한 발신번호가 아닙니다.\n발신번호를 확인해주세요.")
107	104	}
108	105
109		- /*
110		- // 제목
111		- if (data.result.subject != null && data.result.subject != "") {
	106	+ var smsTxt = msgData.smsTxt;
	107	+ var subject = msgData.subject;
	108	+ var fileId = "";
	109	+ var filePath = "";
	110	+ var len = fileData.length;
	111	+
	112	+ // 기존 내용 지워주기
	113	+ //$(".btnReset").trigger("click");
	114	+ $('.delLi').each(function(){
	115	+ $(this).remove();
	116	+ });
	117	+
	118	+ $('.preBoxF').each(function(){
	119	+ $(this).remove();
	120	+ });
	121	+
	122	+ $('#imgCnt').val(0);
	123	+
	124	+ // 기존 imgFileId, imgFilePath 배열에 있는 내용 초기화 해주기
	125	+ imgFilePath = [];
	126	+ imgFileId = [];
	127	+
	128	+ // 문자제목
	129	+ if (msgData.subject != null && msgData.subject != "") {
112	130	$('.msg_title').addClass('active');
113	131	$("input:radio[name='title_status']:radio[value='Y']").prop('checked', true); // 선택하기
114	132	$('.textbox').show();
115		- $("#mmsSubject").val(data.result.subject);
	133	+ $("#mmsSubject").val(subject);
116	134	}
117	135
118		- var reSmsTxt = data.result.smsTxt.replaceAll("<br/>", "\n"); //줄발꿈문자 변환하기
119	136	// 문자내용
120		- if(reSmsTxt != null){
121		- $("#smsTxtArea").val(reSmsTxt);
122		- fnByteString(reSmsTxt);
	137	+ if (smsTxt.lastIndexOf("(광고)") != -1) {
	138	+ $('#send_adYnY').prop('checked', true);
	139	+
	140	+ //광고 상하단 내용 넣어주기
	141	+ advMsgInsert();
	142	+
	143	+ // 광고 기본정보 제거
	144	+ smsTxt = $.trim(smsTxt.replace("(광고)", ""));
	145	+ var smsTxtLastIdxCnt = smsTxt.lastIndexOf("무료거부");
	146	+ if (smsTxtLastIdxCnt != -1) {
	147	+ smsTxt = $.trim(smsTxt.substring(0, smsTxtLastIdxCnt));
	148	+ }
123	149	}
124		- */
	150	+ $('#smsTxtArea').val(smsTxt);
	151	+
	152	+ // 첨부 이미지가 있는경우 이미지 처리해주기
	153	+ if(len > 0) {
	154	+ for(var i=0; i < len; i++) {
	155	+ var num = i + 1;
	156	+ var imgId = fileData[i].atchFileId;
	157	+ var imgSn = fileData[i].fileSn;
	158	+ var fileStreCours = fileData[i].fileStreCours;
	159	+ var streFileNm = fileData[i].streFileNm;
	160	+ var fileExtsn = fileData[i].fileExtsn;
	161	+
	162	+ /* var imgSrc = fileStreCours + "/" + streFileNm + "." + fileExtsn; */
	163	+ var imgSrc = '/cmm/fms/getImage2.do?atchFileId=' + imgId + '&fileSn=' + imgSn;
	164	+ myMsgImageControl(imgSrc, "edit_n", "Template", imgId);
	165	+ }
	166	+
	167	+ fnByteString(smsTxt);
	168	+ }
	169	+ else {
	170	+ fnByteString(smsTxt);
	171	+ }
	172	+
	173	+ // 문자전송 상단으로 이동
	174	+ var sendOfT=$('.send_top').offset().top;
	175	+ $('html,body').stop().animate({'scrollTop':sendOfT-60},250);
125	176
126	177	} else {
127		- alert("Message : " + msg);
	178	+ //alert("Message : " + msg);
128	179	}
129	180	},
130	181	error: function (e) {

...	...	@@ -70,7 +70,14 @@
70	70	private String msgResendAllFlag;
71	71	private String msgResendAllGroupId;
72	72	private String msgResendAllAdvertiseYn;
73		-
	73	+ private String atchFiles;
	74	+
	75	+ public String getAtchFiles() {
	76	+ return atchFiles;
	77	+ }
	78	+ public void setAtchFiles(String atchFiles) {
	79	+ this.atchFiles = atchFiles;
	80	+ }
74	81	public String getMsgGroupId() {
75	82	return msgGroupId;
76	83	}

...	...	@@ -136,12 +136,13 @@
136	136	</tr>
137	137	</thead>
138	138	<tbody>
139		- <c:set var="replaceCnt" value="0" />
140		- <c:set var="electionCnt" value="0" />
141		- <c:set var="advertisementCnt" value="0" />
142	139	<c:choose>
143	140	<c:when test="${not empty resultAllSentList}">
144	141	<c:forEach var="resultAllSentList" items="${resultAllSentList}" varStatus="status">
	142	+ <c:set var="replaceCnt" value="0" />
	143	+ <c:set var="electionCnt" value="0" />
	144	+ <c:set var="advertisementCnt" value="0" />
	145	+
145	146	<c:if test="${fn:indexOf(resultAllSentList.smsTxt,'[이름]') != -1 \|\| fn:indexOf(resultAllSentList.smsTxt,'[1]') != -1 \|\| fn:indexOf(resultAllSentList.smsTxt,'[2]') != -1 \|\| fn:indexOf(resultAllSentList.smsTxt,'[3]') != -1 \|\| fn:indexOf(resultAllSentList.smsTxt,'[4]') != -1}">
146	147	<c:set var="replaceCnt" value="1" />
147	148	</c:if>
...	...	@@ -207,7 +208,7 @@
207	208	<td name="listTd">
208	209	<button class="btnType btnType20" data-tooltip="rev_popup01" onClick="javascript:fnRevDetailPop('${resultAllSentList.msgGroupId}','${resultAllSentList.msgId}','${resultAllSentList.fileCnt}'); return false;">상세보기</button>
209	210	<%--
210		- <button class="btnType btnType20" onClick="javascript:fnMjMsgReSendAll('${resultAllSentList.msgGroupId}','${replaceCnt}','${electionCnt}','${advertisementCnt}'); return false;">재전송</button>
	211	+ <button class="btnType btnType20" onClick="javascript:fnMjMsgReSendAll('${resultAllSentList.msgGroupId}','${replaceCnt}','${electionCnt}','${advertisementCnt}'); return false;">재전송</button>
211	212	--%>
212	213	</td>
213	214	<td name="listTd">

Delete comment