Commit @1452e555903d940a584b5d2578681cb78735f333

itn 2023-09-13

예약관리 문자 휴대폰번호 하이픈(-) 추가

@1452e555903d940a584b5d2578681cb78735f333

38cfd5e

1452e55

src/main/java/itn/let/mjo/reservmsg/service/MjonResvMsgVO.java

--- src/main/java/itn/let/mjo/reservmsg/service/MjonResvMsgVO.java

+++ src/main/java/itn/let/mjo/reservmsg/service/MjonResvMsgVO.java


 	private String strReqDate;		// 문자열 타입 발송시간
 	
 	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 int getOrderByCode() {
 		return orderByCode;
 	}

38cfd5e

1452e55

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


 import itn.let.kakao.user.sent.service.KakaoSentVO;
 import itn.let.mjo.apikey.service.ApiKeyMngService;
 import itn.let.mjo.apikey.service.ApiKeyVO;
-import itn.let.mjo.msgsent.service.MjonMsgSentCntVO;
-import itn.let.mjo.msgsent.service.MjonMsgSentVO;
 import itn.let.mjo.reservmsg.service.MjonMsgReservCntVO;
 import itn.let.mjo.reservmsg.service.MjonReservMsgService;
 import itn.let.mjo.reservmsg.service.MjonResvMsgVO;

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

 							}
 							if(j==5) cell.setCellValue((resultAllResList.get(i)).getSmsTxt()); 		//내용
 							if(j==6) cell.setCellValue((resultAllResList.get(i)).getMsgGroupCnt());	//발송건수	
-							if(j==7) cell.setCellValue((resultAllResList.get(i)).getCallFrom()); 	//발신번호
+							if(j==7) cell.setCellValue((resultAllResList.get(i)).getCallFromComma()); 	//발신번호
 							if(j==8) cell.setCellValue(totPriceStr); 	//금액
 							if(j==9) cell.setCellValue((resultAllResList.get(i)).getReserveCYn()); 	//예약 취소
 							

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

 							}
 							if(j==5) cell.setCellValue((resultAllResList.get(i)).getSmsTxt()); 		//내용
 							if(j==6) cell.setCellValue((resultAllResList.get(i)).getMsgGroupCnt());	//발송건수
-							if(j==7) cell.setCellValue((resultAllResList.get(i)).getCallFrom()); 	//발신번호
+							if(j==7) cell.setCellValue((resultAllResList.get(i)).getCallFromComma()); 	//발신번호
 							if(j==8) cell.setCellValue(totPriceStr); 	//금액
 							
 						}

38cfd5e

1452e55

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

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

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


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

38cfd5e

1452e55

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

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

+++ src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgAllListAjax.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>

38cfd5e

1452e55

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

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

+++ src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgCancelListAjax.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>

38cfd5e

1452e55

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

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

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


 		<table class="tType4">
 			<colgroup>
 				<col style="width: 40px;">
-				<col style="width: 15%;">
-				<col style="width: 15%;">
-				<col style="width: 15%;">
+				<col style="width: 14%;">
+				<col style="width: 14%;">
+				<col style="width: 14%;">
 				<col style="width: 7%;">
 				
 				<col style="width: 10%;">
 				<col style="width: 90px;">
 				<col style="width: 10%;">
-				<col style="width: 10%;">
+				<col style="width: 13%;">
 				<col style="width: 15%;">
 			</colgroup>
 			<thead>

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

38cfd5e

1452e55

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

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

+++ src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgReadyListAjax.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>

Add a comment

Open 0
Closed 0

List

...	...	@@ -45,8 +45,6 @@
45	45	import itn.let.kakao.user.sent.service.KakaoSentVO;
46	46	import itn.let.mjo.apikey.service.ApiKeyMngService;
47	47	import itn.let.mjo.apikey.service.ApiKeyVO;
48		-import itn.let.mjo.msgsent.service.MjonMsgSentCntVO;
49		-import itn.let.mjo.msgsent.service.MjonMsgSentVO;
50	48	import itn.let.mjo.reservmsg.service.MjonMsgReservCntVO;
51	49	import itn.let.mjo.reservmsg.service.MjonReservMsgService;
52	50	import itn.let.mjo.reservmsg.service.MjonResvMsgVO;
...	...	@@ -1132,7 +1130,7 @@
1132	1130	}
1133	1131	if(j==6) cell.setCellValue((resultAllResList.get(i)).getSmsTxt()); //내용
1134	1132	if(j==7) cell.setCellValue((resultAllResList.get(i)).getMsgGroupCnt()); //발송건수
1135		- if(j==8) cell.setCellValue((resultAllResList.get(i)).getCallFrom()); //발신번호
	1133	+ if(j==8) cell.setCellValue((resultAllResList.get(i)).getCallFromComma()); //발신번호
1136	1134	if(j==9) cell.setCellValue(totPriceStr); //금액
1137	1135
1138	1136	//발송결과 성공, 실패 처리
...	...	@@ -1206,7 +1204,7 @@
1206	1204	}
1207	1205	if(j==5) cell.setCellValue((resultAllResList.get(i)).getSmsTxt()); //내용
1208	1206	if(j==6) cell.setCellValue((resultAllResList.get(i)).getMsgGroupCnt()); //발송건수
1209		- if(j==7) cell.setCellValue((resultAllResList.get(i)).getCallFrom()); //발신번호
	1207	+ if(j==7) cell.setCellValue((resultAllResList.get(i)).getCallFromComma()); //발신번호
1210	1208	if(j==8) cell.setCellValue(totPriceStr); //금액
1211	1209	if(j==9) cell.setCellValue((resultAllResList.get(i)).getReserveCYn()); //예약 취소
1212	1210
...	...	@@ -1254,7 +1252,7 @@
1254	1252	}
1255	1253	if(j==5) cell.setCellValue((resultAllResList.get(i)).getSmsTxt()); //내용
1256	1254	if(j==6) cell.setCellValue((resultAllResList.get(i)).getMsgGroupCnt()); //발송건수
1257		- if(j==7) cell.setCellValue((resultAllResList.get(i)).getCallFrom()); //발신번호
	1255	+ if(j==7) cell.setCellValue((resultAllResList.get(i)).getCallFromComma()); //발신번호
1258	1256	if(j==8) cell.setCellValue(totPriceStr); //금액
1259	1257	//발송결과 성공, 실패 처리
1260	1258	String resSucCnt = "0";
...	...	@@ -1326,7 +1324,7 @@
1326	1324	}
1327	1325	if(j==5) cell.setCellValue((resultAllResList.get(i)).getSmsTxt()); //내용
1328	1326	if(j==6) cell.setCellValue((resultAllResList.get(i)).getMsgGroupCnt()); //발송건수
1329		- if(j==7) cell.setCellValue((resultAllResList.get(i)).getCallFrom()); //발신번호
	1327	+ if(j==7) cell.setCellValue((resultAllResList.get(i)).getCallFromComma()); //발신번호
1330	1328	if(j==8) cell.setCellValue(totPriceStr); //금액
1331	1329
1332	1330	}

...	...	@@ -205,6 +205,7 @@
205	205	DATE_FORMAT(REQ_DATE, '%Y-%m-%d %T') AS reqdate,
206	206	TIMESTAMPDIFF(MINUTE,DATE_FORMAT(REQ_DATE, '%Y-%m-%d %T'), DATE_FORMAT(NOW(), '%Y-%m-%d %T')) AS diffMin,
207	207	CALL_FROM AS callFrom,
	208	+ REGEXP_REPLACE(CALL_FROM, '(02\|.{3})(.+)(.{4})', '\\1-\\2-\\3') AS callFromComma,
208	209	TOT_PRICE AS totPrice,
209	210	EACH_PRICE AS eachPrice,
210	211	CUR_STATE AS curState,

...	...	@@ -245,7 +245,7 @@
245	245	<p><c:out value="${resultAllResList.msgGroupCnt}"/></p>
246	246	</td>
247	247	<td>
248		- <p><c:out value="${resultAllResList.callFrom}"/></p>
	248	+ <p><c:out value="${resultAllResList.callFromComma}"/></p>
249	249	</td>
250	250	<td>
251	251	<p>

...	...	@@ -201,7 +201,7 @@
201	201	<p><c:out value="${resultAllResList.msgGroupCnt}"/></p>
202	202	</td>
203	203	<td>
204		- <p><c:out value="${resultAllResList.callFrom}"/></p>
	204	+ <p><c:out value="${resultAllResList.callFromComma}"/></p>
205	205	</td>
206	206	<td>
207	207	<p>

...	...	@@ -70,15 +70,15 @@
70	70	<table class="tType4">
71	71	<colgroup>
72	72	<col style="width: 40px;">
73		- <col style="width: 15%;">
74		- <col style="width: 15%;">
75		- <col style="width: 15%;">
	73	+ <col style="width: 14%;">
	74	+ <col style="width: 14%;">
	75	+ <col style="width: 14%;">
76	76	<col style="width: 7%;">
77	77
78	78	<col style="width: 10%;">
79	79	<col style="width: 90px;">
80	80	<col style="width: 10%;">
81		- <col style="width: 10%;">
	81	+ <col style="width: 13%;">
82	82	<col style="width: 15%;">
83	83	</colgroup>
84	84	<thead>
...	...	@@ -205,7 +205,7 @@
205	205	<p><c:out value="${resultAllResList.msgGroupCnt}"/></p>
206	206	</td>
207	207	<td>
208		- <p><c:out value="${resultAllResList.callFrom}"/></p>
	208	+ <p><c:out value="${resultAllResList.callFromComma}"/></p>
209	209	</td>
210	210	<td>
211	211	<p>

...	...	@@ -58,7 +58,21 @@
58	58	private String strReqDate; // 문자열 타입 발송시간
59	59
60	60	private String sendKind; // 문자열 타입 발송시간
	61	+ private String callFromComma;
	62	+ private String callToComma;
61	63
	64	+ public String getCallFromComma() {
	65	+ return callFromComma;
	66	+ }
	67	+ public void setCallFromComma(String callFromComma) {
	68	+ this.callFromComma = callFromComma;
	69	+ }
	70	+ public String getCallToComma() {
	71	+ return callToComma;
	72	+ }
	73	+ public void setCallToComma(String callToComma) {
	74	+ this.callToComma = callToComma;
	75	+ }
62	76	public int getOrderByCode() {
63	77	return orderByCode;
64	78	}

...	...	@@ -218,7 +218,7 @@
218	218	<p><c:out value="${resultAllResList.msgGroupCnt}"/></p>
219	219	</td>
220	220	<td>
221		- <p><c:out value="${resultAllResList.callFrom}"/></p>
	221	+ <p><c:out value="${resultAllResList.callFromComma}"/></p>
222	222	</td>
223	223	<td>
224	224	<p>

Delete comment