Commit @681b96dd047973a957e784055daacc0623061edb

cf5560d

681b96d

src/main/java/itn/let/mjo/reservmsg/web/MjonReservMsgController.java

--- src/main/java/itn/let/mjo/reservmsg/web/MjonReservMsgController.java

+++ src/main/java/itn/let/mjo/reservmsg/web/MjonReservMsgController.java


 				} 
 				if(j==5) cell.setCellValue((resultAllSentList.get(i)).getSmsTxt()); 		//내용
 				if(j==6) cell.setCellValue((resultAllSentList.get(i)).getMsgGroupCnt());	//발송건수
-				if(j==7) cell.setCellValue((resultAllSentList.get(i)).getCallFrom()); 		//발신번호
+				if(j==7) cell.setCellValue((resultAllSentList.get(i)).getCallFromComma()); 		//발신번호
 				if(j==8) cell.setCellValue((resultAllSentList.get(i)).getTotPrice()); 		//발신번호
 					
 				//발송결과 성공, 실패 처리

 				if (j == 5)
 					cell.setCellValue((resultAllSentList.get(i)).getMsgGroupCnt()); // 발송건수
 				if (j == 6)
-					cell.setCellValue((resultAllSentList.get(i)).getCallFrom()); // 발신번호
+					cell.setCellValue((resultAllSentList.get(i)).getCallFromComma()); // 발신번호
 				if (j == 7)
 					cell.setCellValue((resultAllSentList.get(i)).getTotPrice()); // 발신번호
 				if (j == 8) {

 				if (j == 6)
 					cell.setCellValue((resultAllSentList.get(i)).getMsgGroupCnt()); // 발송건수
 				if (j == 7)
-					cell.setCellValue((resultAllSentList.get(i)).getCallFrom()); // 발신번호
+					cell.setCellValue((resultAllSentList.get(i)).getCallFromComma()); // 발신번호
 				if (j == 8)
 					cell.setCellValue((resultAllSentList.get(i)).getTotPrice()); // 발신번호
 

 				if (j == 6)
 					cell.setCellValue((resultAllSentList.get(i)).getMsgGroupCnt()); // 발송건수
 				if (j == 7)
-					cell.setCellValue((resultAllSentList.get(i)).getCallFrom()); // 발신번호
+					cell.setCellValue((resultAllSentList.get(i)).getCallFromComma()); // 발신번호
 				if (j == 8)
 					cell.setCellValue((resultAllSentList.get(i)).getTotPrice()); // 발신번호
 			}

cf5560d

681b96d

src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml

--- src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml

+++ src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml

...	...	@@ -1002,6 +1002,8 @@
1002	1002	M2.diffMin,
1003	1003	M2.callFrom ,
1004	1004	M2.callTo ,
	1005	+ REGEXP_REPLACE(M2.callFrom, '(02\|.{3})(.+)(.{4})', '\\1-\\2-\\3') AS callFromComma,
	1006	+ REGEXP_REPLACE(M2.callTo, '(02\|.{3})(.+)(.{4})', '\\1-\\2-\\3') AS callToComma,
1005	1007	M2.addrNm ,
1006	1008	M2.totPrice ,
1007	1009	M2.eachPrice ,

cf5560d

681b96d

src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedKakaoAllListAjax.jsp

--- src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedKakaoAllListAjax.jsp

+++ src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedKakaoAllListAjax.jsp


 			<colgroup>
 				<col style="width: 40px;">
 				<col style="width: 8%;">
-				<col style="width: 13%;">
-				<col style="width: 13%;">
+				<col style="width: 12%;">
+				<col style="width: 12%;">
 				<col style="width: 7%;">
 				<col style="width: 90px;">
 				<col style="width: 8%;">
-				<col style="width: 10%;">
+				<col style="width: 12%;">
 				<col style="width: 7%;">
 				<col style="width: 5%;">
 				<col style="width: 5%;">

 								<p><c:out value="${resultAllResList.msgGroupCnt}"/></p>
 							</td>
 							<td>
-								<p><c:out value="${resultAllResList.callFrom}"/></p>
+								<p><c:out value="${resultAllResList.callFromComma}"/></p>
 							</td>
 							<td>
 								<p>

cf5560d

681b96d

src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedKakaoCancelListAjax.jsp

--- src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedKakaoCancelListAjax.jsp

+++ src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedKakaoCancelListAjax.jsp


 								<p><c:out value="${resultAllResList.msgGroupCnt}"/></p>
 							</td>
 							<td>
-								<p><c:out value="${resultAllResList.callFrom}"/></p>
+								<p><c:out value="${resultAllResList.callFromComma}"/></p>
 							</td>
 							<td>
 								<p>

cf5560d

681b96d

src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedKakaoCompleteListAjax.jsp

--- src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedKakaoCompleteListAjax.jsp

+++ src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedKakaoCompleteListAjax.jsp


 								<p><c:out value="${resultAllResList.msgGroupCnt}"/></p>
 							</td>
 							<td>
-								<p><c:out value="${resultAllResList.callFrom}"/></p>
+								<p><c:out value="${resultAllResList.callFromComma}"/></p>
 							</td>
 							<td>
 								<p>

cf5560d

681b96d

src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedKakaoReadyListAjax.jsp

--- src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedKakaoReadyListAjax.jsp

+++ src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedKakaoReadyListAjax.jsp


 								<p><c:out value="${resultAllResList.msgGroupCnt}"/></p>
 							</td>
 							<td>
-								<p><c:out value="${resultAllResList.callFrom}"/></p>
+								<p><c:out value="${resultAllResList.callFromComma}"/></p>
 							</td>
 							<td>
 								<p>

...	...	@@ -1878,7 +1878,7 @@
1878	1878	}
1879	1879	if(j==5) cell.setCellValue((resultAllSentList.get(i)).getSmsTxt()); //내용
1880	1880	if(j==6) cell.setCellValue((resultAllSentList.get(i)).getMsgGroupCnt()); //발송건수
1881		- if(j==7) cell.setCellValue((resultAllSentList.get(i)).getCallFrom()); //발신번호
	1881	+ if(j==7) cell.setCellValue((resultAllSentList.get(i)).getCallFromComma()); //발신번호
1882	1882	if(j==8) cell.setCellValue((resultAllSentList.get(i)).getTotPrice()); //발신번호
1883	1883
1884	1884	//발송결과 성공, 실패 처리
...	...	@@ -1987,7 +1987,7 @@
1987	1987	if (j == 5)
1988	1988	cell.setCellValue((resultAllSentList.get(i)).getMsgGroupCnt()); // 발송건수
1989	1989	if (j == 6)
1990		- cell.setCellValue((resultAllSentList.get(i)).getCallFrom()); // 발신번호
	1990	+ cell.setCellValue((resultAllSentList.get(i)).getCallFromComma()); // 발신번호
1991	1991	if (j == 7)
1992	1992	cell.setCellValue((resultAllSentList.get(i)).getTotPrice()); // 발신번호
1993	1993	if (j == 8) {
...	...	@@ -2175,7 +2175,7 @@
2175	2175	if (j == 6)
2176	2176	cell.setCellValue((resultAllSentList.get(i)).getMsgGroupCnt()); // 발송건수
2177	2177	if (j == 7)
2178		- cell.setCellValue((resultAllSentList.get(i)).getCallFrom()); // 발신번호
	2178	+ cell.setCellValue((resultAllSentList.get(i)).getCallFromComma()); // 발신번호
2179	2179	if (j == 8)
2180	2180	cell.setCellValue((resultAllSentList.get(i)).getTotPrice()); // 발신번호
2181	2181
...	...	@@ -2284,7 +2284,7 @@
2284	2284	if (j == 6)
2285	2285	cell.setCellValue((resultAllSentList.get(i)).getMsgGroupCnt()); // 발송건수
2286	2286	if (j == 7)
2287		- cell.setCellValue((resultAllSentList.get(i)).getCallFrom()); // 발신번호
	2287	+ cell.setCellValue((resultAllSentList.get(i)).getCallFromComma()); // 발신번호
2288	2288	if (j == 8)
2289	2289	cell.setCellValue((resultAllSentList.get(i)).getTotPrice()); // 발신번호
2290	2290	}

...	...	@@ -211,7 +211,7 @@
211	211	<p><c:out value="${resultAllResList.msgGroupCnt}"/></p>
212	212	</td>
213	213	<td>
214		- <p><c:out value="${resultAllResList.callFrom}"/></p>
	214	+ <p><c:out value="${resultAllResList.callFromComma}"/></p>
215	215	</td>
216	216	<td>
217	217	<p>

...	...	@@ -209,7 +209,7 @@
209	209	<p><c:out value="${resultAllResList.msgGroupCnt}"/></p>
210	210	</td>
211	211	<td>
212		- <p><c:out value="${resultAllResList.callFrom}"/></p>
	212	+ <p><c:out value="${resultAllResList.callFromComma}"/></p>
213	213	</td>
214	214	<td>
215	215	<p>

...	...	@@ -225,7 +225,7 @@
225	225	<p><c:out value="${resultAllResList.msgGroupCnt}"/></p>
226	226	</td>
227	227	<td>
228		- <p><c:out value="${resultAllResList.callFrom}"/></p>
	228	+ <p><c:out value="${resultAllResList.callFromComma}"/></p>
229	229	</td>
230	230	<td>
231	231	<p>

...	...	@@ -72,12 +72,12 @@
72	72	<colgroup>
73	73	<col style="width: 40px;">
74	74	<col style="width: 8%;">
75		- <col style="width: 13%;">
76		- <col style="width: 13%;">
	75	+ <col style="width: 12%;">
	76	+ <col style="width: 12%;">
77	77	<col style="width: 7%;">
78	78	<col style="width: 90px;">
79	79	<col style="width: 8%;">
80		- <col style="width: 10%;">
	80	+ <col style="width: 12%;">
81	81	<col style="width: 7%;">
82	82	<col style="width: 5%;">
83	83	<col style="width: 5%;">
...	...	@@ -254,7 +254,7 @@
254	254	<p><c:out value="${resultAllResList.msgGroupCnt}"/></p>
255	255	</td>
256	256	<td>
257		- <p><c:out value="${resultAllResList.callFrom}"/></p>
	257	+ <p><c:out value="${resultAllResList.callFromComma}"/></p>
258	258	</td>
259	259	<td>
260	260	<p>

Delete comment