Commit @cf5560d28ee95f7293b1e8c2b74b15a4df2c6730

itn 2023-09-14

발송결과 문자 휴대폰번호 하이픈(-) 추가

@cf5560d28ee95f7293b1e8c2b74b15a4df2c6730

1452e55

cf5560d

src/main/java/itn/let/kakao/user/sent/service/KakaoSentVO.java

--- src/main/java/itn/let/kakao/user/sent/service/KakaoSentVO.java

+++ src/main/java/itn/let/kakao/user/sent/service/KakaoSentVO.java


 	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;

1452e55

cf5560d

src/main/java/itn/let/kakao/user/sent/web/KakaoSentController.java

--- src/main/java/itn/let/kakao/user/sent/web/KakaoSentController.java

+++ src/main/java/itn/let/kakao/user/sent/web/KakaoSentController.java


 					}
 				} 
 				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());	//발송건수
 					
 				//발송결과 성공, 실패 처리

 					}
 				} 
 				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());	//발송건수
 				
 				//카카오톡 결과

1452e55

cf5560d

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


 			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 ,

 			, 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

1452e55

cf5560d

src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentAllListAjax.jsp

--- src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentAllListAjax.jsp

+++ src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentAllListAjax.jsp


 													<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>
 							</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>
 							
 							

 													<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>
 							</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'}">

1452e55

cf5560d

src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentSFDetailListAjax.jsp

--- src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentSFDetailListAjax.jsp

+++ src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentSFDetailListAjax.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: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>
 								</p>
 							</td>
 							<td>
-								<p><c:out value="${resultAllSentList.callFrom}"/></p>
+								<p><c:out value="${resultAllSentList.callFromComma}"/></p>
 							</td>
 							<td>
 								<c:choose>

Add a comment

Open 0
Closed 0

List

...	...	@@ -96,6 +96,21 @@
96	96	private int kakaoResendFailCount;
97	97
98	98	private String diffMin; //현재시간과 발송예약시간 차이값
	99	+ private String callToComma;
	100	+ private String callFromComma;
	101	+
	102	+ public String getCallToComma() {
	103	+ return callToComma;
	104	+ }
	105	+ public void setCallToComma(String callToComma) {
	106	+ this.callToComma = callToComma;
	107	+ }
	108	+ public String getCallFromComma() {
	109	+ return callFromComma;
	110	+ }
	111	+ public void setCallFromComma(String callFromComma) {
	112	+ this.callFromComma = callFromComma;
	113	+ }
99	114
100	115	public String getAtchFiles() {
101	116	return atchFiles;

...	...	@@ -676,8 +676,8 @@
676	676	}
677	677	}
678	678	if(j==3) cell.setCellValue((resultAllSentList.get(i)).getSmsTxt()); //내용
679		- if(j==4) cell.setCellValue((resultAllSentList.get(i)).getCallTo());
680		- if(j==5) cell.setCellValue((resultAllSentList.get(i)).getCallFrom()); //발신번호
	679	+ if(j==4) cell.setCellValue((resultAllSentList.get(i)).getCallToComma());
	680	+ if(j==5) cell.setCellValue((resultAllSentList.get(i)).getCallFromComma()); //발신번호
681	681	if(j==6) cell.setCellValue((resultAllSentList.get(i)).getMsgGroupCnt()); //발송건수
682	682
683	683	//발송결과 성공, 실패 처리
...	...	@@ -787,8 +787,8 @@
787	787	}
788	788	}
789	789	if(j==3) cell.setCellValue((resultAllSentList.get(i)).getSmsTxt()); //내용
790		- if(j==4) cell.setCellValue((resultAllSentList.get(i)).getCallTo());
791		- if(j==5) cell.setCellValue((resultAllSentList.get(i)).getCallFrom()); //발신번호
	790	+ if(j==4) cell.setCellValue((resultAllSentList.get(i)).getCallToComma());
	791	+ if(j==5) cell.setCellValue((resultAllSentList.get(i)).getCallFromComma()); //발신번호
792	792	if(j==6) cell.setCellValue((resultAllSentList.get(i)).getMsgGroupCnt()); //발송건수
793	793
794	794	//카카오톡 결과

...	...	@@ -213,6 +213,8 @@
213	213	M2.rsltDate ,
214	214	M2.callFrom ,
215	215	M2.callTo ,
	216	+ REGEXP_REPLACE(M2.callFrom, '(02\|.{3})(.+)(.{4})', '\\1-\\2-\\3') AS callFromComma,
	217	+ REGEXP_REPLACE(M2.callTo, '(02\|.{3})(.+)(.{4})', '\\1-\\2-\\3') AS callToComma,
216	218	M2.addrNm ,
217	219	M2.totPrice ,
218	220	M2.eachPrice ,
...	...	@@ -490,6 +492,8 @@
490	492	, DATE_FORMAT(REQ_DATE, '%Y-%m-%d %T') AS reqdate
491	493	, CALL_FROM AS callFrom
492	494	, CALL_TO AS callTo
	495	+ , REGEXP_REPLACE(CALL_FROM, '(02\|.{3})(.+)(.{4})', '\\1-\\2-\\3') AS callFromComma
	496	+ , REGEXP_REPLACE(CALL_TO, '(02\|.{3})(.+)(.{4})', '\\1-\\2-\\3') AS callToComma
493	497	, TOT_PRICE AS totPrice
494	498	, EACH_PRICE AS eachPrice
495	499	, CUR_STATE AS curState

...	...	@@ -163,7 +163,7 @@
163	163	<c:out value="${resultAllSentList.addrNm}"/>
164	164	</c:when>
165	165	<c:otherwise>
166		- <c:out value="${resultAllSentList.callTo}"/>
	166	+ <c:out value="${resultAllSentList.callToComma}"/>
167	167	</c:otherwise>
168	168	</c:choose> 외 <fmt:formatNumber value="${resultAllSentList.msgGroupCnt - 1}" pattern="#,###"/>명
169	169	</p>
...	...	@@ -172,11 +172,11 @@
172	172	<p><c:out value="${resultAllSentList.addrNm}"/></p>
173	173	</c:when>
174	174	<c:otherwise>
175		- <p><c:out value="${resultAllSentList.callTo}"/></p>
	175	+ <p><c:out value="${resultAllSentList.callToComma}"/></p>
176	176	</c:otherwise>
177	177	</c:choose>
178	178	</td>
179		- <td rowspan="2"><p><c:out value="${resultAllSentList.callFrom}"/></p></td>
	179	+ <td rowspan="2"><p><c:out value="${resultAllSentList.callFromComma}"/></p></td>
180	180	<td rowspan="2"><p><c:out value="${resultAllSentList.msgGroupCnt}"/></p></td>
181	181
182	182
...	...	@@ -309,7 +309,7 @@
309	309	<c:out value="${resultAllSentList.addrNm}"/>
310	310	</c:when>
311	311	<c:otherwise>
312		- <c:out value="${resultAllSentList.callTo}"/>
	312	+ <c:out value="${resultAllSentList.callToComma}"/>
313	313	</c:otherwise>
314	314	</c:choose> 외 <fmt:formatNumber value="${resultAllSentList.msgGroupCnt - 1}" pattern="#,###"/>명
315	315	</p>
...	...	@@ -318,11 +318,11 @@
318	318	<p><c:out value="${resultAllSentList.addrNm}"/></p>
319	319	</c:when>
320	320	<c:otherwise>
321		- <p><c:out value="${resultAllSentList.callTo}"/></p>
	321	+ <p><c:out value="${resultAllSentList.callToComma}"/></p>
322	322	</c:otherwise>
323	323	</c:choose>
324	324	</td>
325		- <td><p><c:out value="${resultAllSentList.callFrom}"/></p></td>
	325	+ <td><p><c:out value="${resultAllSentList.callFromComma}"/></p></td>
326	326	<td>
327	327	<c:choose>
328	328	<c:when test="${resultAllSentList.msgResult eq 'S'}">

...	...	@@ -196,7 +196,7 @@
196	196	<c:out value="${resultAllSentList.addrNm}"/>
197	197	</c:when>
198	198	<c:otherwise>
199		- <c:out value="${resultAllSentList.callTo}"/>
	199	+ <c:out value="${resultAllSentList.callToComma}"/>
200	200	</c:otherwise>
201	201	</c:choose>
202	202	</c:when>
...	...	@@ -204,13 +204,13 @@
204	204	<p><c:out value="${resultAllSentList.addrNm}"/></p>
205	205	</c:when>
206	206	<c:otherwise>
207		- <p><c:out value="${resultAllSentList.callTo}"/></p>
	207	+ <p><c:out value="${resultAllSentList.callToComma}"/></p>
208	208	</c:otherwise>
209	209	</c:choose>
210	210	</p>
211	211	</td>
212	212	<td>
213		- <p><c:out value="${resultAllSentList.callFrom}"/></p>
	213	+ <p><c:out value="${resultAllSentList.callFromComma}"/></p>
214	214	</td>
215	215	<td>
216	216	<c:choose>

Delete comment