From cf5560d28ee95f7293b1e8c2b74b15a4df2c6730 Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Thu, 14 Sep 2023 11:49:27 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B0=9C=EC=86=A1=EA=B2=B0=EA=B3=BC=20?=
 =?UTF-8?q?=EB=AC=B8=EC=9E=90=20=ED=9C=B4=EB=8C=80=ED=8F=B0=EB=B2=88?=
 =?UTF-8?q?=ED=98=B8=20=ED=95=98=EC=9D=B4=ED=94=88(-)=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../let/kakao/user/sent/service/KakaoSentVO.java  | 15 +++++++++++++++
 .../kakao/user/sent/web/KakaoSentController.java  |  8 ++++----
 .../sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml  |  4 ++++
 .../jsp/web/kakao/sent/KakaoSentAllListAjax.jsp   | 12 ++++++------
 .../web/kakao/sent/KakaoSentSFDetailListAjax.jsp  |  6 +++---
 5 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/src/main/java/itn/let/kakao/user/sent/service/KakaoSentVO.java b/src/main/java/itn/let/kakao/user/sent/service/KakaoSentVO.java
index f8af53a7..f169c54d 100644
--- a/src/main/java/itn/let/kakao/user/sent/service/KakaoSentVO.java
+++ b/src/main/java/itn/let/kakao/user/sent/service/KakaoSentVO.java
@@ -96,6 +96,21 @@ public class KakaoSentVO extends UserDefaultVO{
 	private int kakaoResendFailCount;
 	
 	private String diffMin;			//현재시간과 발송예약시간 차이값
+	private String callToComma;
+	private String callFromComma;
+	
+	public String getCallToComma() {
+		return callToComma;
+	}
+	public void setCallToComma(String callToComma) {
+		this.callToComma = callToComma;
+	}
+	public String getCallFromComma() {
+		return callFromComma;
+	}
+	public void setCallFromComma(String callFromComma) {
+		this.callFromComma = callFromComma;
+	}
 	
 	public String getAtchFiles() {
 		return atchFiles;
diff --git a/src/main/java/itn/let/kakao/user/sent/web/KakaoSentController.java b/src/main/java/itn/let/kakao/user/sent/web/KakaoSentController.java
index 411c98da..cc9bf8a6 100644
--- a/src/main/java/itn/let/kakao/user/sent/web/KakaoSentController.java
+++ b/src/main/java/itn/let/kakao/user/sent/web/KakaoSentController.java
@@ -676,8 +676,8 @@ public class KakaoSentController {
 					}
 				} 
 				if(j==3) cell.setCellValue((resultAllSentList.get(i)).getSmsTxt()); 		//내용
-				if(j==4) cell.setCellValue((resultAllSentList.get(i)).getCallTo());
-				if(j==5) cell.setCellValue((resultAllSentList.get(i)).getCallFrom()); 		//발신번호
+				if(j==4) cell.setCellValue((resultAllSentList.get(i)).getCallToComma());
+				if(j==5) cell.setCellValue((resultAllSentList.get(i)).getCallFromComma()); 		//발신번호
 				if(j==6) cell.setCellValue((resultAllSentList.get(i)).getMsgGroupCnt());	//발송건수
 					
 				//발송결과 성공, 실패 처리
@@ -787,8 +787,8 @@ public class KakaoSentController {
 					}
 				} 
 				if(j==3) cell.setCellValue((resultAllSentList.get(i)).getSmsTxt()); 		//내용
-				if(j==4) cell.setCellValue((resultAllSentList.get(i)).getCallTo());
-				if(j==5) cell.setCellValue((resultAllSentList.get(i)).getCallFrom()); 		//발신번호
+				if(j==4) cell.setCellValue((resultAllSentList.get(i)).getCallToComma());
+				if(j==5) cell.setCellValue((resultAllSentList.get(i)).getCallFromComma()); 		//발신번호
 				if(j==6) cell.setCellValue((resultAllSentList.get(i)).getMsgGroupCnt());	//발송건수
 				
 				//카카오톡 결과
diff --git a/src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml
index 119894cc..5b702413 100644
--- a/src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml
+++ b/src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml
@@ -213,6 +213,8 @@
 			M2.rsltDate ,
 			M2.callFrom ,
 			M2.callTo ,
+			REGEXP_REPLACE(M2.callFrom, '(02|.{3})(.+)(.{4})', '\\1-\\2-\\3')	AS callFromComma,
+			REGEXP_REPLACE(M2.callTo, '(02|.{3})(.+)(.{4})', '\\1-\\2-\\3')	AS callToComma,
 			M2.addrNm ,
 			M2.totPrice ,
 			M2.eachPrice ,
@@ -490,6 +492,8 @@
 			, 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
diff --git a/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentAllListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentAllListAjax.jsp
index a7aa7eb9..76035796 100644
--- a/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentAllListAjax.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentAllListAjax.jsp
@@ -163,7 +163,7 @@ $(document).ready(function(){
 													<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>	
@@ -172,11 +172,11 @@ $(document).ready(function(){
 										<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>
 							</td>
-							<td rowspan="2"><p><c:out value="${resultAllSentList.callFrom}"/></p></td>
+							<td rowspan="2"><p><c:out value="${resultAllSentList.callFromComma}"/></p></td>
 							<td rowspan="2"><p><c:out value="${resultAllSentList.msgGroupCnt}"/></p></td>
 							
 							
@@ -309,7 +309,7 @@ $(document).ready(function(){
 													<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>	
@@ -318,11 +318,11 @@ $(document).ready(function(){
 										<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>
 							</td>
-							<td><p><c:out value="${resultAllSentList.callFrom}"/></p></td>
+							<td><p><c:out value="${resultAllSentList.callFromComma}"/></p></td>
 							<td>
 								<c:choose>
 									<c:when test="${resultAllSentList.msgResult eq 'S'}">
diff --git a/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentSFDetailListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentSFDetailListAjax.jsp
index fe17888e..346a224e 100644
--- a/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentSFDetailListAjax.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentSFDetailListAjax.jsp
@@ -196,7 +196,7 @@ function listSortOrd(obj){
 												<c:out value="${resultAllSentList.addrNm}"/>
 											</c:when>
 											<c:otherwise>
-												<c:out value="${resultAllSentList.callTo}"/>
+												<c:out value="${resultAllSentList.callToComma}"/>
 											</c:otherwise>
 										</c:choose>
 									</c:when>
@@ -204,13 +204,13 @@ function listSortOrd(obj){
 										<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>
 								</p>
 							</td>
 							<td>
-								<p><c:out value="${resultAllSentList.callFrom}"/></p>
+								<p><c:out value="${resultAllSentList.callFromComma}"/></p>
 							</td>
 							<td>
 								<c:choose>