Commit @197018bcba4c21048da67ea700a71bad670a30c4

03da959

197018b

src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java

--- src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java

+++ src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java


 	private String[] callToList; // '수신번호리스트',
 	private String  callFrom; // '발신번호 (하이픈 등의 문자를 제외한 12byte이하의 숫자로 입력한다.)',
 	private String  subject; // 'MMS용 메시지제목',
+	private String  subjectChkYn; // 'MMS용 메시지제목',
 	private String  smsTxt; // 'SMS용 메시지본문',
 	private String  smsTxtArea;//문자 작성 화면 본문 내용 
 	private String  msgType; // '메시지의 (4: SMS 전송, 5: URL 전송, 6: MMS전송, 7: BARCODE전송, 8: 카카오 알림톡 전송)',

03da959

197018b

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

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

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


 				
 				instTotalCnt += instCnt;
 				this.insertMsgGroupDataTb_advc(instCnt, mjonMsgVO, groupedMsgList);
+				log.info(" :: group data insert :: ");
 
 				// 금액 및 포인트 insert
 				priceAndPoint.insertCashAndPoint(

03da959

197018b

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


            EVENT_YN,
            DELAY_YN,
            AT_DELAY_YN,
-            BIZ_KAKAO_RESEND_ORGNL_TXT
+            BIZ_KAKAO_RESEND_ORGNL_TXT,
+            SUBJECT_CHK_YN
        )
        VALUES
        

            #eventYn#,
            #delayYn#,
            #atDelayYn#,
-           #kakaoSubMagOrgnlTxt#
+           #kakaoSubMagOrgnlTxt#,
+           #subjectChkYn#
        )
 	</insert>
 	

03da959

197018b

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


 $(document).ready(function(){
 
 	
-	console.log("12111111111111");
+	console.log(": MsgDataSMLView :");
 
 // 	console.log(' + $(#tabDision).val() : ',$('#tabDision').val())
 // 	if($('#tabDision').val() == 'tab02'){

 		}
 		
 		//제목 사용한 경우
-		if($("input[name=title_status]:checked").val() == 'Y') {
+		if($("input[name=subjectChkYn]:checked").val() == 'Y') {
 			form.mmsSubject.value = msgForm.mmsSubject.value;
 		} else {
 			form.mmsSubject.value = ""; //초기화

 		form.eachPrice.value = '<c:out value="${longPrice}" />';
 		
 		//제목 사용한 경우
-		if($("input[name=title_status]:checked").val() == 'Y') {
+		if($("input[name=subjectChkYn]:checked").val() == 'Y') {
 			form.mmsSubject.value = msgForm.mmsSubject.value;
 		} else {
 			form.mmsSubject.value = ""; //초기화

                             <td>
                            		<ul class="title_wrap">
                            			<li>
-                           				<input id="title_y" type="radio"name="title_status" value="Y" onchange="titleStatus(this);">
+                           				<input id="title_y" type="radio"name="subjectChkYn" value="Y" onchange="titleStatus(this);">
 			                            <label for="title_y">사용</label>
-			                            <input id="title_n" type="radio" name="title_status" value="N" onchange="titleStatus(this);" checked="checked">
+			                            <input id="title_n" type="radio" name="subjectChkYn" value="N" onchange="titleStatus(this);" checked="checked">
 			                            <label for="title_n">사용안함</label>
                            			</li>
                            			<li class="textbox">

03da959

197018b

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


 								<p class="c_e40000"><fmt:formatNumber value="${result.resultFValue}" type="number" groupingUsed="true" /> </p>
 							</td>
 							<td>
-								<c:out value="${result.totPrice}"/>
+								<c:choose>
+									<c:when test="${result.totPrice eq '-' }">
+										<c:out value="${result.totPrice }" />
+									</c:when>
+									<c:otherwise>
+										<fmt:formatNumber value="${result.totPrice }" type="number" groupingUsed="true" minFractionDigits="0" maxFractionDigits="1" />
+									</c:otherwise>
+								</c:choose>
 							</td>
 							<td>
 								<c:choose>

03da959

197018b

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

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

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


 				// 문자제목
 				if (msgData.subject != null && msgData.subject != "") {
 					$('.msg_title').addClass('active');
-					$("input:radio[name='title_status']:radio[value='Y']").prop('checked', true); // 선택하기
+					$("input:radio[name='subjectChkYn']:radio[value='Y']").prop('checked', true); // 선택하기
 					$('.textbox').show();
 					$("#mmsSubject").val(subject);	
 				}

 	 });
 	
 	 // 빈 값 제거
-	 removeEmptyValues(formData);
+	removeEmptyValues(formData);
 
 	// 선택된 데이터 추가
 	formData["mjonMsgSendVOList"] = $selectedData;

 		
 	}
 
-	if (form.title_status.value === 'N') {
+	if (form.subjectChkYn.value === 'N') {
 		form.mmsSubject.value = "";
 	} else if (getSpacialStringChk(form.mmsSubject.value)) {
 		alert("문자 제목에는 치환문자(엑셀 내 *이름*, *1*, *2*, *3*, *4* 등)를 사용하실 수 없습니다.");

 	}
 
 	//문자제목에 이모지가 있는지 체크
-	var titleStatusYn = $("input[name='title_status']:checked").val();
+	var titleStatusYn = $("input[name='subjectChkYn']:checked").val();
 	if(titleStatusYn == 'Y') {
 		if(!emojiCheck(form.mmsSubject.value)) return false;
 	}

...	...	@@ -34,6 +34,7 @@
34	34	private String[] callToList; // '수신번호리스트',
35	35	private String callFrom; // '발신번호 (하이픈 등의 문자를 제외한 12byte이하의 숫자로 입력한다.)',
36	36	private String subject; // 'MMS용 메시지제목',
	37	+ private String subjectChkYn; // 'MMS용 메시지제목',
37	38	private String smsTxt; // 'SMS용 메시지본문',
38	39	private String smsTxtArea;//문자 작성 화면 본문 내용
39	40	private String msgType; // '메시지의 (4: SMS 전송, 5: URL 전송, 6: MMS전송, 7: BARCODE전송, 8: 카카오 알림톡 전송)',

...	...	@@ -4150,6 +4150,7 @@
4150	4150
4151	4151	instTotalCnt += instCnt;
4152	4152	this.insertMsgGroupDataTb_advc(instCnt, mjonMsgVO, groupedMsgList);
	4153	+ log.info(" :: group data insert :: ");
4153	4154
4154	4155	// 금액 및 포인트 insert
4155	4156	priceAndPoint.insertCashAndPoint(

...	...	@@ -2319,7 +2319,8 @@
2319	2319	EVENT_YN,
2320	2320	DELAY_YN,
2321	2321	AT_DELAY_YN,
2322		- BIZ_KAKAO_RESEND_ORGNL_TXT
	2322	+ BIZ_KAKAO_RESEND_ORGNL_TXT,
	2323	+ SUBJECT_CHK_YN
2323	2324	)
2324	2325	VALUES
2325	2326
...	...	@@ -2345,7 +2346,8 @@
2345	2346	#eventYn#,
2346	2347	#delayYn#,
2347	2348	#atDelayYn#,
2348		- #kakaoSubMagOrgnlTxt#
	2349	+ #kakaoSubMagOrgnlTxt#,
	2350	+ #subjectChkYn#
2349	2351	)
2350	2352	</insert>
2351	2353

...	...	@@ -19,7 +19,7 @@
19	19	$(document).ready(function(){
20	20
21	21
22		- console.log("12111111111111");
	22	+ console.log(": MsgDataSMLView :");
23	23
24	24	// console.log(' + $(#tabDision).val() : ',$('#tabDision').val())
25	25	// if($('#tabDision').val() == 'tab02'){
...	...	@@ -3418,7 +3418,7 @@
3418	3418	}
3419	3419
3420	3420	//제목 사용한 경우
3421		- if($("input[name=title_status]:checked").val() == 'Y') {
	3421	+ if($("input[name=subjectChkYn]:checked").val() == 'Y') {
3422	3422	form.mmsSubject.value = msgForm.mmsSubject.value;
3423	3423	} else {
3424	3424	form.mmsSubject.value = ""; //초기화
...	...	@@ -3432,7 +3432,7 @@
3432	3432	form.eachPrice.value = '<c:out value="${longPrice}" />';
3433	3433
3434	3434	//제목 사용한 경우
3435		- if($("input[name=title_status]:checked").val() == 'Y') {
	3435	+ if($("input[name=subjectChkYn]:checked").val() == 'Y') {
3436	3436	form.mmsSubject.value = msgForm.mmsSubject.value;
3437	3437	} else {
3438	3438	form.mmsSubject.value = ""; //초기화
...	...	@@ -4039,9 +4039,9 @@
4039	4039	<td>
4040	4040	<ul class="title_wrap">
4041	4041	<li>
4042		- <input id="title_y" type="radio"name="title_status" value="Y" onchange="titleStatus(this);">
	4042	+ <input id="title_y" type="radio"name="subjectChkYn" value="Y" onchange="titleStatus(this);">
4043	4043	<label for="title_y">사용</label>
4044		- <input id="title_n" type="radio" name="title_status" value="N" onchange="titleStatus(this);" checked="checked">
	4044	+ <input id="title_n" type="radio" name="subjectChkYn" value="N" onchange="titleStatus(this);" checked="checked">
4045	4045	<label for="title_n">사용안함</label>
4046	4046	</li>
4047	4047	<li class="textbox">

...	...	@@ -299,7 +299,14 @@
299	299	<p class="c_e40000"><fmt:formatNumber value="${result.resultFValue}" type="number" groupingUsed="true" /> </p>
300	300	</td>
301	301	<td>
302		- <c:out value="${result.totPrice}"/>
	302	+ <c:choose>
	303	+ <c:when test="${result.totPrice eq '-' }">
	304	+ <c:out value="${result.totPrice }" />
	305	+ </c:when>
	306	+ <c:otherwise>
	307	+ <fmt:formatNumber value="${result.totPrice }" type="number" groupingUsed="true" minFractionDigits="0" maxFractionDigits="1" />
	308	+ </c:otherwise>
	309	+ </c:choose>
303	310	</td>
304	311	<td>
305	312	<c:choose>

...	...	@@ -58,7 +58,7 @@
58	58	// 문자제목
59	59	if (msgData.subject != null && msgData.subject != "") {
60	60	$('.msg_title').addClass('active');
61		- $("input:radio[name='title_status']:radio[value='Y']").prop('checked', true); // 선택하기
	61	+ $("input:radio[name='subjectChkYn']:radio[value='Y']").prop('checked', true); // 선택하기
62	62	$('.textbox').show();
63	63	$("#mmsSubject").val(subject);
64	64	}
...	...	@@ -1255,7 +1255,7 @@
1255	1255	});
1256	1256
1257	1257	// 빈 값 제거
1258		- removeEmptyValues(formData);
	1258	+ removeEmptyValues(formData);
1259	1259
1260	1260	// 선택된 데이터 추가
1261	1261	formData["mjonMsgSendVOList"] = $selectedData;
...	...	@@ -1363,7 +1363,7 @@
1363	1363
1364	1364	}
1365	1365
1366		- if (form.title_status.value === 'N') {
	1366	+ if (form.subjectChkYn.value === 'N') {
1367	1367	form.mmsSubject.value = "";
1368	1368	} else if (getSpacialStringChk(form.mmsSubject.value)) {
1369	1369	alert("문자 제목에는 치환문자(엑셀 내 이름, 1, 2, 3, 4 등)를 사용하실 수 없습니다.");
...	...	@@ -1371,7 +1371,7 @@
1371	1371	}
1372	1372
1373	1373	//문자제목에 이모지가 있는지 체크
1374		- var titleStatusYn = $("input[name='title_status']:checked").val();
	1374	+ var titleStatusYn = $("input[name='subjectChkYn']:checked").val();
1375	1375	if(titleStatusYn == 'Y') {
1376	1376	if(!emojiCheck(form.mmsSubject.value)) return false;
1377	1377	}

Delete comment