Commit @609c7d9cb769361d2645266b15eba2608b4007b1

6360aba

609c7d9

src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java

--- src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java

+++ src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java


 	
 	private String sendKind; 		// 그림문자 파일정보
 
+	private String callFromComma;
+	private String callToComma;
+
+	public String getCallFromComma() {
+		return callFromComma;
+	}
+	public void setCallFromComma(String callFromComma) {
+		this.callFromComma = callFromComma;
+	}
+	public String getCallToComma() {
+		return callToComma;
+	}
+	public void setCallToComma(String callToComma) {
+		this.callToComma = callToComma;
+	}
+	
 	public String getAtchFiles() {
 		return atchFiles;
 	}

6360aba

609c7d9

src/main/java/itn/let/mjo/msgsent/web/MjonMsgSentController.java

--- src/main/java/itn/let/mjo/msgsent/web/MjonMsgSentController.java

+++ src/main/java/itn/let/mjo/msgsent/web/MjonMsgSentController.java


 						} 
 						if(j==3) cell.setCellValue((resultAllSentList.get(i)).getSmsTxt()); 		//내용
 						if(j==4) cell.setCellValue((resultAllSentList.get(i)).getAddrNm());
-						if(j==5) cell.setCellValue((resultAllSentList.get(i)).getCallTo());
-						if(j==6) cell.setCellValue((resultAllSentList.get(i)).getCallFrom()); 		//발신번호
+						if(j==5) cell.setCellValue((resultAllSentList.get(i)).getCallToComma());
+						if(j==6) cell.setCellValue((resultAllSentList.get(i)).getCallFromComma()); 		//발신번호
 						if(j==7) { //발송상태 처리해주기
 							
 							String resvCYn = resultAllSentList.get(i).getReserveCYn();

6360aba

609c7d9

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

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

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


 			, DATE_FORMAT(REQ_DATE, '%Y-%m-%d %T')	 AS reqdate
 			, CALL_FROM								 AS callFrom
 			, CALL_TO								 AS callTo
+			, REGEXP_REPLACE(CALL_FROM, '(02|.{3})(.+)(.{4})', '\\1-\\2-\\3')	AS callFromComma
+			, REGEXP_REPLACE(CALL_TO, '(02|.{3})(.+)(.{4})', '\\1-\\2-\\3')		AS callToComma
 			, IFNULL(ADDR_NM, '-')					 AS addrNm
 			, TOT_PRICE								 AS totPrice
 			, EACH_PRICE							 AS eachPrice

 			, DATE_FORMAT(REQ_DATE, '%Y-%m-%d %T')	 AS reqdate
 			, CALL_FROM								 AS callFrom
 			, CALL_TO								 AS callTo
+			, REGEXP_REPLACE(CALL_FROM, '(02|.{3})(.+)(.{4})', '\\1-\\2-\\3')	AS callFromComma
+			, REGEXP_REPLACE(CALL_TO, '(02|.{3})(.+)(.{4})', '\\1-\\2-\\3')		AS callToComma			
 			, TOT_PRICE								 AS totPrice
 			, EACH_PRICE							 AS eachPrice
 			, CUR_STATE								 AS curState

 			, DATE_FORMAT(REQ_DATE, '%Y-%m-%d %T')	 AS reqdate
 			, CALL_FROM								 AS callFrom
 			, CALL_TO								 AS callTo
+			, REGEXP_REPLACE(CALL_FROM, '(02|.{3})(.+)(.{4})', '\\1-\\2-\\3')	AS callFromComma
+			, REGEXP_REPLACE(CALL_TO, '(02|.{3})(.+)(.{4})', '\\1-\\2-\\3')		AS callToComma			
 			, TOT_PRICE								 AS totPrice
 			, EACH_PRICE							 AS eachPrice
 			, CUR_STATE								 AS curState

6360aba

609c7d9

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


 		<table class="tType4">
 			<colgroup>
 				<col style="width: 40px;">
-				<col style="width: 15%;">
+				<col style="width: 12%;">
 				<col style="width: 8%;">
 				<col style="width: 90px;">
 				<col style="width: 10%;">
-				<col style="width: 12%;">
+				<col style="width: 15%;">
 				<col style="width: 12%;">
 				<col style="width: 8%;">
 			<c:if test="${mjonMsgSentVO.listType eq 'groupList'}">

 															<c:out value="${resultAllSentList.addrNm}"/>
 														</c:when>
 														<c:otherwise>
-															<c:out value="${resultAllSentList.callTo}"/>
+															<c:out value="${resultAllSentList.callToComma}"/>
 														</c:otherwise>
 													</c:choose> 외 <fmt:formatNumber value="${resultAllSentList.msgGroupCnt - 1}" pattern="#,###"/>명
 												</p>	

 												<p><c:out value="${resultAllSentList.addrNm}"/></p>
 											</c:when>
 											<c:otherwise>
-												<p><c:out value="${resultAllSentList.callTo}"/></p>
+												<p><c:out value="${resultAllSentList.callToComma}"/></p>
 											</c:otherwise>
 										</c:choose>
 									</c:when>

 												<p><c:out value="${resultAllSentList.addrNm}"/></p>
 											</c:when>
 											<c:otherwise>
-												<p><c:out value="${resultAllSentList.callTo}"/></p>
+												<p><c:out value="${resultAllSentList.callToComma}"/></p>
 											</c:otherwise>
 										</c:choose>
 									</c:otherwise>
 								</c:choose>
 							</td>
 							<td name="listTd">
-								<p><c:out value="${resultAllSentList.callFrom}"/></p>
+								<p><c:out value="${resultAllSentList.callFromComma}"/></p>
 							</td>
 						<c:if test="${mjonMsgSentVO.listType eq 'groupList'}">
 							<td name="listTd">

6360aba

609c7d9

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

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

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


 		<table class="tType4">
 			<colgroup>
 				<col style="width: 40px;">
-				<col style="width: 15%;">
+				<col style="width: 12%;">
 				<col style="width: 8%;">
 				<col style="width: 90px;">
 				<col style="width: 10%;">
-				<col style="width: 12%;">
+				<col style="width: 15%;">
 				<col style="width: 12%;">
 				<col style="width: 8%;">
 			<c:if test="${mjonMsgSentVO.listType eq 'groupList'}">

 															<c:out value="${resultAllSentList.addrNm}"/>
 														</c:when>
 														<c:otherwise>
-															<c:out value="${resultAllSentList.callTo}"/>
+															<c:out value="${resultAllSentList.callToComma}"/>
 														</c:otherwise>
 													</c:choose> 외 <fmt:formatNumber value="${resultAllSentList.msgGroupCnt - 1}" pattern="#,###"/>명
 												</p>	

 												<p><c:out value="${resultAllSentList.addrNm}"/></p>
 											</c:when>
 											<c:otherwise>
-												<p><c:out value="${resultAllSentList.callTo}"/></p>
+												<p><c:out value="${resultAllSentList.callToComma}"/></p>
 											</c:otherwise>
 										</c:choose>
 									</c:when>

 												<p><c:out value="${resultAllSentList.addrNm}"/></p>
 											</c:when>
 											<c:otherwise>
-												<p><c:out value="${resultAllSentList.callTo}"/></p>
+												<p><c:out value="${resultAllSentList.callToComma}"/></p>
 											</c:otherwise>
 										</c:choose>
 									</c:otherwise>
 								</c:choose>
 							</td>
 							<td>
-								<p><c:out value="${resultAllSentList.callFrom}"/></p>
+								<p><c:out value="${resultAllSentList.callFromComma}"/></p>
 							</td>
 						<c:if test="${mjonMsgSentVO.listType eq 'groupList'}">
 							<td>

6360aba

609c7d9

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

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

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


 		<table class="tType4">
 			<colgroup>
 				<col style="width: 40px;">
-				<col style="width: 15%;">
+				<col style="width: 12%;">
 				<col style="width: 8%;">
 				<col style="width: 90px;">
 				<col style="width: 10%;">
-				<col style="width: 12%;">
+				<col style="width: 15%;">
 				<col style="width: 12%;">
 				<col style="width: 8%;">
 				<col style="width: 8%;">

 															<c:out value="${resultAllSentList.addrNm}"/>
 														</c:when>
 														<c:otherwise>
-															<c:out value="${resultAllSentList.callTo}"/>
+															<c:out value="${resultAllSentList.callToComma}"/>
 														</c:otherwise>
 													</c:choose> 외 <fmt:formatNumber value="${resultAllSentList.msgGroupCnt - 1}" pattern="#,###"/>명
 												</p>	

 												<p><c:out value="${resultAllSentList.addrNm}"/></p>
 											</c:when>
 											<c:otherwise>
-												<p><c:out value="${resultAllSentList.callTo}"/></p>
+												<p><c:out value="${resultAllSentList.callToComma}"/></p>
 											</c:otherwise>
 										</c:choose>
 									</c:when>

 												<p><c:out value="${resultAllSentList.addrNm}"/></p>
 											</c:when>
 											<c:otherwise>
-												<p><c:out value="${resultAllSentList.callTo}"/></p>
+												<p><c:out value="${resultAllSentList.callToComma}"/></p>
 											</c:otherwise>
 										</c:choose>
 									</c:otherwise>
 								</c:choose>
 							</td>
 							<td>
-								<p><c:out value="${resultAllSentList.callFrom}"/></p>
+								<p><c:out value="${resultAllSentList.callFromComma}"/></p>
 							</td>
 							<td>
 								<p><c:out value="${resultAllSentList.msgGroupCnt}"/></p>

6360aba

609c7d9

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

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

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


 		<table class="tType4">
 			<colgroup>
 				<col style="width: 40px;">
-				<col style="width: 15%;">
+				<col style="width: 12%;">
 				<col style="width: 8%;">
 				<col style="width: 90px;">
 				<col style="width: 10%;">
-				<col style="width: 12%;">
+				<col style="width: 15%;">
 				<col style="width: 12%;">
 				<col style="width: 8%;">
 			<c:if test="${mjonMsgSentVO.listType eq 'groupList'}">

 															<c:out value="${resultAllSentList.addrNm}"/>
 														</c:when>
 														<c:otherwise>
-															<c:out value="${resultAllSentList.callTo}"/>
+															<c:out value="${resultAllSentList.callToComma}"/>
 														</c:otherwise>
 													</c:choose> 외 <fmt:formatNumber value="${resultAllSentList.msgGroupCnt - 1}" pattern="#,###"/>명
 												</p>	

 												<p><c:out value="${resultAllSentList.addrNm}"/></p>
 											</c:when>
 											<c:otherwise>
-												<p><c:out value="${resultAllSentList.callTo}"/></p>
+												<p><c:out value="${resultAllSentList.callToComma}"/></p>
 											</c:otherwise>
 										</c:choose>
 									</c:when>

 												<p><c:out value="${resultAllSentList.addrNm}"/></p>
 											</c:when>
 											<c:otherwise>
-												<p><c:out value="${resultAllSentList.callTo}"/></p>
+												<p><c:out value="${resultAllSentList.callToComma}"/></p>
 											</c:otherwise>
 										</c:choose>
 									</c:otherwise>
 								</c:choose>
 							</td>
 							<td>
-								<p><c:out value="${resultAllSentList.callFrom}"/></p>
+								<p><c:out value="${resultAllSentList.callFromComma}"/></p>
 							</td>
 						<c:if test="${mjonMsgSentVO.listType eq 'groupList'}">
 							<td>

6360aba

609c7d9

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

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

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


 																	<c:out value="${resultAllSentList.addrNm}"/>
 																</c:when>
 																<c:otherwise>
-																	<c:out value="${resultAllSentList.callTo}"/>
+																	<c:out value="${resultAllSentList.callToComma}"/>
 																</c:otherwise>
 															</c:choose> 외 <c:out value="${resultAllSentList.msgGroupCnt - 1}"/>명
 														</p>	

 														<p><c:out value="${resultAllSentList.addrNm}"/></p>
 													</c:when>
 													<c:otherwise>
-														<p><c:out value="${resultAllSentList.callTo}"/></p>
+														<p><c:out value="${resultAllSentList.callToComma}"/></p>
 													</c:otherwise>
 												</c:choose>
 											</c:when>

 														<p><c:out value="${resultAllSentList.addrNm}"/></p>
 													</c:when>
 													<c:otherwise>
-														<p><c:out value="${resultAllSentList.callTo}"/></p>
+														<p><c:out value="${resultAllSentList.callToComma}"/></p>
 													</c:otherwise>
 												</c:choose>
 											</c:otherwise>
 										</c:choose>
 									</td>
 									<td>
-										<p><c:out value="${resultAllSentList.callFrom}"/></p>
+										<p><c:out value="${resultAllSentList.callFromComma}"/></p>
 									</td>
 									<td>
 										<p><c:out value="${resultAllSentList.msgGroupCnt}"/></p>

...	...	@@ -79,6 +79,22 @@
79	79
80	80	private String sendKind; // 그림문자 파일정보
81	81
	82	+ private String callFromComma;
	83	+ private String callToComma;
	84	+
	85	+ public String getCallFromComma() {
	86	+ return callFromComma;
	87	+ }
	88	+ public void setCallFromComma(String callFromComma) {
	89	+ this.callFromComma = callFromComma;
	90	+ }
	91	+ public String getCallToComma() {
	92	+ return callToComma;
	93	+ }
	94	+ public void setCallToComma(String callToComma) {
	95	+ this.callToComma = callToComma;
	96	+ }
	97	+
82	98	public String getAtchFiles() {
83	99	return atchFiles;
84	100	}

...	...	@@ -1197,8 +1197,8 @@
1197	1197	}
1198	1198	if(j==3) cell.setCellValue((resultAllSentList.get(i)).getSmsTxt()); //내용
1199	1199	if(j==4) cell.setCellValue((resultAllSentList.get(i)).getAddrNm());
1200		- if(j==5) cell.setCellValue((resultAllSentList.get(i)).getCallTo());
1201		- if(j==6) cell.setCellValue((resultAllSentList.get(i)).getCallFrom()); //발신번호
	1200	+ if(j==5) cell.setCellValue((resultAllSentList.get(i)).getCallToComma());
	1201	+ if(j==6) cell.setCellValue((resultAllSentList.get(i)).getCallFromComma()); //발신번호
1202	1202	if(j==7) { //발송상태 처리해주기
1203	1203
1204	1204	String resvCYn = resultAllSentList.get(i).getReserveCYn();

...	...	@@ -236,6 +236,8 @@
236	236	, DATE_FORMAT(REQ_DATE, '%Y-%m-%d %T') AS reqdate
237	237	, CALL_FROM AS callFrom
238	238	, CALL_TO AS callTo
	239	+ , REGEXP_REPLACE(CALL_FROM, '(02\|.{3})(.+)(.{4})', '\\1-\\2-\\3') AS callFromComma
	240	+ , REGEXP_REPLACE(CALL_TO, '(02\|.{3})(.+)(.{4})', '\\1-\\2-\\3') AS callToComma
239	241	, IFNULL(ADDR_NM, '-') AS addrNm
240	242	, TOT_PRICE AS totPrice
241	243	, EACH_PRICE AS eachPrice
...	...	@@ -442,6 +444,8 @@
442	444	, DATE_FORMAT(REQ_DATE, '%Y-%m-%d %T') AS reqdate
443	445	, CALL_FROM AS callFrom
444	446	, CALL_TO AS callTo
	447	+ , REGEXP_REPLACE(CALL_FROM, '(02\|.{3})(.+)(.{4})', '\\1-\\2-\\3') AS callFromComma
	448	+ , REGEXP_REPLACE(CALL_TO, '(02\|.{3})(.+)(.{4})', '\\1-\\2-\\3') AS callToComma
445	449	, TOT_PRICE AS totPrice
446	450	, EACH_PRICE AS eachPrice
447	451	, CUR_STATE AS curState
...	...	@@ -632,6 +636,8 @@
632	636	, DATE_FORMAT(REQ_DATE, '%Y-%m-%d %T') AS reqdate
633	637	, CALL_FROM AS callFrom
634	638	, CALL_TO AS callTo
	639	+ , REGEXP_REPLACE(CALL_FROM, '(02\|.{3})(.+)(.{4})', '\\1-\\2-\\3') AS callFromComma
	640	+ , REGEXP_REPLACE(CALL_TO, '(02\|.{3})(.+)(.{4})', '\\1-\\2-\\3') AS callToComma
635	641	, TOT_PRICE AS totPrice
636	642	, EACH_PRICE AS eachPrice
637	643	, CUR_STATE AS curState

...	...	@@ -76,11 +76,11 @@
76	76	<table class="tType4">
77	77	<colgroup>
78	78	<col style="width: 40px;">
79		- <col style="width: 15%;">
	79	+ <col style="width: 12%;">
80	80	<col style="width: 8%;">
81	81	<col style="width: 90px;">
82	82	<col style="width: 10%;">
83		- <col style="width: 12%;">
	83	+ <col style="width: 15%;">
84	84	<col style="width: 12%;">
85	85	<col style="width: 8%;">
86	86	<c:if test="${mjonMsgSentVO.listType eq 'groupList'}">
...	...	@@ -206,7 +206,7 @@
206	206	<c:out value="${resultAllSentList.addrNm}"/>
207	207	</c:when>
208	208	<c:otherwise>
209		- <c:out value="${resultAllSentList.callTo}"/>
	209	+ <c:out value="${resultAllSentList.callToComma}"/>
210	210	</c:otherwise>
211	211	</c:choose> 외 <fmt:formatNumber value="${resultAllSentList.msgGroupCnt - 1}" pattern="#,###"/>명
212	212	</p>
...	...	@@ -215,7 +215,7 @@
215	215	<p><c:out value="${resultAllSentList.addrNm}"/></p>
216	216	</c:when>
217	217	<c:otherwise>
218		- <p><c:out value="${resultAllSentList.callTo}"/></p>
	218	+ <p><c:out value="${resultAllSentList.callToComma}"/></p>
219	219	</c:otherwise>
220	220	</c:choose>
221	221	</c:when>
...	...	@@ -225,14 +225,14 @@
225	225	<p><c:out value="${resultAllSentList.addrNm}"/></p>
226	226	</c:when>
227	227	<c:otherwise>
228		- <p><c:out value="${resultAllSentList.callTo}"/></p>
	228	+ <p><c:out value="${resultAllSentList.callToComma}"/></p>
229	229	</c:otherwise>
230	230	</c:choose>
231	231	</c:otherwise>
232	232	</c:choose>
233	233	</td>
234	234	<td name="listTd">
235		- <p><c:out value="${resultAllSentList.callFrom}"/></p>
	235	+ <p><c:out value="${resultAllSentList.callFromComma}"/></p>
236	236	</td>
237	237	<c:if test="${mjonMsgSentVO.listType eq 'groupList'}">
238	238	<td name="listTd">

...	...	@@ -69,11 +69,11 @@
69	69	<table class="tType4">
70	70	<colgroup>
71	71	<col style="width: 40px;">
72		- <col style="width: 15%;">
	72	+ <col style="width: 12%;">
73	73	<col style="width: 8%;">
74	74	<col style="width: 90px;">
75	75	<col style="width: 10%;">
76		- <col style="width: 12%;">
	76	+ <col style="width: 15%;">
77	77	<col style="width: 12%;">
78	78	<col style="width: 8%;">
79	79	<c:if test="${mjonMsgSentVO.listType eq 'groupList'}">
...	...	@@ -198,7 +198,7 @@
198	198	<c:out value="${resultAllSentList.addrNm}"/>
199	199	</c:when>
200	200	<c:otherwise>
201		- <c:out value="${resultAllSentList.callTo}"/>
	201	+ <c:out value="${resultAllSentList.callToComma}"/>
202	202	</c:otherwise>
203	203	</c:choose> 외 <fmt:formatNumber value="${resultAllSentList.msgGroupCnt - 1}" pattern="#,###"/>명
204	204	</p>
...	...	@@ -207,7 +207,7 @@
207	207	<p><c:out value="${resultAllSentList.addrNm}"/></p>
208	208	</c:when>
209	209	<c:otherwise>
210		- <p><c:out value="${resultAllSentList.callTo}"/></p>
	210	+ <p><c:out value="${resultAllSentList.callToComma}"/></p>
211	211	</c:otherwise>
212	212	</c:choose>
213	213	</c:when>
...	...	@@ -217,14 +217,14 @@
217	217	<p><c:out value="${resultAllSentList.addrNm}"/></p>
218	218	</c:when>
219	219	<c:otherwise>
220		- <p><c:out value="${resultAllSentList.callTo}"/></p>
	220	+ <p><c:out value="${resultAllSentList.callToComma}"/></p>
221	221	</c:otherwise>
222	222	</c:choose>
223	223	</c:otherwise>
224	224	</c:choose>
225	225	</td>
226	226	<td>
227		- <p><c:out value="${resultAllSentList.callFrom}"/></p>
	227	+ <p><c:out value="${resultAllSentList.callFromComma}"/></p>
228	228	</td>
229	229	<c:if test="${mjonMsgSentVO.listType eq 'groupList'}">
230	230	<td>

...	...	@@ -237,7 +237,7 @@
237	237	<c:out value="${resultAllSentList.addrNm}"/>
238	238	</c:when>
239	239	<c:otherwise>
240		- <c:out value="${resultAllSentList.callTo}"/>
	240	+ <c:out value="${resultAllSentList.callToComma}"/>
241	241	</c:otherwise>
242	242	</c:choose> 외 <c:out value="${resultAllSentList.msgGroupCnt - 1}"/>명
243	243	</p>
...	...	@@ -246,7 +246,7 @@
246	246	<p><c:out value="${resultAllSentList.addrNm}"/></p>
247	247	</c:when>
248	248	<c:otherwise>
249		- <p><c:out value="${resultAllSentList.callTo}"/></p>
	249	+ <p><c:out value="${resultAllSentList.callToComma}"/></p>
250	250	</c:otherwise>
251	251	</c:choose>
252	252	</c:when>
...	...	@@ -256,14 +256,14 @@
256	256	<p><c:out value="${resultAllSentList.addrNm}"/></p>
257	257	</c:when>
258	258	<c:otherwise>
259		- <p><c:out value="${resultAllSentList.callTo}"/></p>
	259	+ <p><c:out value="${resultAllSentList.callToComma}"/></p>
260	260	</c:otherwise>
261	261	</c:choose>
262	262	</c:otherwise>
263	263	</c:choose>
264	264	</td>
265	265	<td>
266		- <p><c:out value="${resultAllSentList.callFrom}"/></p>
	266	+ <p><c:out value="${resultAllSentList.callFromComma}"/></p>
267	267	</td>
268	268	<td>
269	269	<p><c:out value="${resultAllSentList.msgGroupCnt}"/></p>

Delete comment