Commit @59483958dcda47358244efa71026f38c74b4649d

name 2023-08-01

고객 문자전송리스트 방식 추가

@59483958dcda47358244efa71026f38c74b4649d

abcbbf0

5948395

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 int successCnt;	// 문자발송 성공건수
 	
+	private String sendKind;	//문자 전송 타입(H:홈페이지 A: API)
+	
 	private String msgKind;	//문자종류(일반:N, 광고:A , 선거:C, 관리자:S, 이벤트:E)
 	private String delayYn; //지연 문자 유무
 	private String delayCompleteYn; //지연문자 처리 완료 여부

 	public void setDelayCompleteYn(String delayCompleteYn) {
 		this.delayCompleteYn = delayCompleteYn;
 	}
-
-
+	public String getSendKind() {
+		return sendKind;
+	}
+	public void setSendKind(String sendKind) {
+		this.sendKind = sendKind;
+	}
 }

abcbbf0

5948395

src/main/java/itn/let/uss/umt/web/EgovUserManageController.java

--- src/main/java/itn/let/uss/umt/web/EgovUserManageController.java

+++ src/main/java/itn/let/uss/umt/web/EgovUserManageController.java


         paginationInfo.setTotalRecordCount(resultList.size() > 0 ? ((MjonMsgVO)resultList.get(0)).getTotCnt() : 0);
 		model.addAttribute("paginationInfo", paginationInfo);
 		
-		String msgGroupSCntSum = "0";	//정상수신 총 건수 합계
-		String totSPriceSum = "0";	//정상수신 총 금액 합계
-		String msgGroupFWCntSum = "0";	//실패대기 총 건수 합계
-		String totFWPriceSum = "0";	//실패대기 총 금액 합계
+		String msgGroupSCntSum = "0";		//정상수신 총 건수 합계
+		String totSPriceSum = "0";			//정상수신 총 금액 합계
+		String msgGroupFWCntSum = "0";		//실패대기 총 건수 합계
+		String totFWPriceSum = "0";			//실패대기 총 금액 합계
 		
 		if(resultList.size() > 0) {
 			

 		
 		
 		//단문 건수 및 금액 변수 처리
-		String msgSmsGroupSCntSum = "0";	//정상수신 총 건수 합계
-		String totSmsSPriceSum = "0";	//정상수신 총 금액 합계
-		String msgSmsGroupFWCntSum = "0";	//실패대기 총 건수 합계
-		String totSmsFWPriceSum = "0";	//실패대기 총 금액 합계
+		String msgSmsGroupSCntSum = "0";		//정상수신 총 건수 합계
+		String totSmsSPriceSum = "0";			//정상수신 총 금액 합계
+		String msgSmsGroupFWCntSum = "0";		//실패대기 총 건수 합계
+		String totSmsFWPriceSum = "0";			//실패대기 총 금액 합계
 		
 		if(resultSmsList.size() > 0) {
 			

 		
 		
 		//장문 건수 및 금액 변수 처리
-		String msgLmsGroupSCntSum = "0";	//정상수신 총 건수 합계
-		String totLmsSPriceSum = "0";	//정상수신 총 금액 합계
-		String msgLmsGroupFWCntSum = "0";	//실패대기 총 건수 합계
-		String totLmsFWPriceSum = "0";	//실패대기 총 금액 합계
+		String msgLmsGroupSCntSum = "0";		//정상수신 총 건수 합계
+		String totLmsSPriceSum = "0";			//정상수신 총 금액 합계
+		String msgLmsGroupFWCntSum = "0";		//실패대기 총 건수 합계
+		String totLmsFWPriceSum = "0";			//실패대기 총 금액 합계
 		
 		if(resultLmsList.size() > 0) {
 			

 		
 		
 		//그림 건수 및 금액 변수 처리
-		String msgMmsGroupSCntSum = "0";	//정상수신 총 건수 합계
-		String totMmsSPriceSum = "0";	//정상수신 총 금액 합계
-		String msgMmsGroupFWCntSum = "0";	//실패대기 총 건수 합계
-		String totMmsFWPriceSum = "0";	//실패대기 총 금액 합계
+		String msgMmsGroupSCntSum = "0";		//정상수신 총 건수 합계
+		String totMmsSPriceSum = "0";			//정상수신 총 금액 합계
+		String msgMmsGroupFWCntSum = "0";		//실패대기 총 건수 합계
+		String totMmsFWPriceSum = "0";			//실패대기 총 금액 합계
 		
 		if(resultMmsList.size() > 0) {
 			

abcbbf0

5948395

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

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

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


 			, msgGroupId
 			, callFrom
 			, callTo
+			, sendKind
 			, smsTxt
 			, fileCnt
 			, msgType

 			, smiId
 			, delayYn
 			, delayCompleteYn
- 			,(
-				SELECT
-					CONCAT(
-					(
-					  	IF(B.FILE_PATH1 IS NOT NULL, (SELECT
-	 	 	 	 			ATCH_FILE_ID
-	 	 	 	 		FROM LETTNFILEDETAIL 
-	 	 	 	 		WHERE CONCAT(STRE_FILE_NM, '.', FILE_EXTSN) = CONCAT(SUBSTRING_INDEX(B.FILE_PATH1, '/', -1))
-	 	 	 	 		LIMIT 1), '')
-	 	 	 	 	)
-	 	 	 	 	,'^',
-					(
-					  	IF(B.FILE_PATH2 IS NOT NULL, (SELECT
-	 	 	 	 			ATCH_FILE_ID
-	 	 	 	 		FROM LETTNFILEDETAIL 
-	 	 	 	 		WHERE CONCAT(STRE_FILE_NM, '.', FILE_EXTSN) = CONCAT(SUBSTRING_INDEX(B.FILE_PATH2, '/', -1))
-	 	 	 	 		LIMIT 1), '')
-	 	 	 	 	)
-	 	 	 	 	,'^',
-					(
-					  	IF(B.FILE_PATH3 IS NOT NULL, (SELECT
-	 	 	 	 			ATCH_FILE_ID
-	 	 	 	 		FROM LETTNFILEDETAIL 
-	 	 	 	 		WHERE CONCAT(STRE_FILE_NM, '.', FILE_EXTSN) = CONCAT(SUBSTRING_INDEX(B.FILE_PATH3, '/', -1))
-	 	 	 	 		LIMIT 1), '')
-	 	 	 	 	))	 	 	 		 	 	 	 	
-				FROM
-					MJ_MSG_DATA B
-				WHERE 
-					B.MSG_GROUP_ID = msgGroupId
-					LIMIT 1
-			) AS atchFiles				
+ 			,(SELECT
+				CONCAT(
+					(IF(B.FILE_PATH1 IS NOT NULL
+						, (SELECT
+								ATCH_FILE_ID
+							FROM
+								LETTNFILEDETAIL 
+							WHERE 1=1
+								AND CONCAT(STRE_FILE_NM, '.', FILE_EXTSN) = CONCAT(SUBSTRING_INDEX(B.FILE_PATH1, '/', -1))
+							LIMIT 1)
+						, '')
+					)
+					, '^'
+					, (IF(B.FILE_PATH2 IS NOT NULL
+						, (SELECT 
+								ATCH_FILE_ID
+							FROM
+								LETTNFILEDETAIL 
+							WHERE 1=1
+								AND CONCAT(STRE_FILE_NM, '.', FILE_EXTSN) = CONCAT(SUBSTRING_INDEX(B.FILE_PATH2, '/', -1))
+							LIMIT 1)
+						, '')
+					)
+					, '^'
+					, (IF(B.FILE_PATH3 IS NOT NULL
+						, (SELECT
+								ATCH_FILE_ID
+							FROM
+								LETTNFILEDETAIL
+							WHERE 1=1
+								AND CONCAT(STRE_FILE_NM, '.', FILE_EXTSN) = CONCAT(SUBSTRING_INDEX(B.FILE_PATH3, '/', -1))
+							LIMIT 1)
+						, '')
+					)
+				)
+			FROM
+				MJ_MSG_DATA B
+			WHERE 1=1
+				AND B.MSG_GROUP_ID = msgGroupId
+			LIMIT 1
+			) AS atchFiles
 		FROM
 			(SELECT
-				(SELECT	count(1) 
-					 FROM
-						(SELECT
-								(<include refid="MjonMsgSentDAO.selectAgentResultQuery_MD"/>) AS resultCodeTxt,
-								MGD.MSG_GROUP_ID
-						FROM	MJ_MSG_GROUP_DATA MGD
+				(SELECT
+					count(1) 
+				FROM
+					(SELECT
+						(<include refid="MjonMsgSentDAO.selectAgentResultQuery_MD"/>) AS resultCodeTxt
+						, MGD.MSG_GROUP_ID
+					FROM
+						MJ_MSG_GROUP_DATA MGD
 						LEFT JOIN MJ_MSG_DATA MD
 						ON	MD.MSG_GROUP_ID = MGD.MSG_GROUP_ID
-						WHERE	MGD.USER_ID = #userId#
+					WHERE 1=1
+						AND MGD.USER_ID = #userId#
 						AND DATE_FORMAT(MGD.REQ_DATE, '%Y-%m-%d') BETWEEN #ntceBgnde# AND #ntceEndde#
+						
+						<isNotEmpty property="sendKind">
+							<isEqual property="sendKind" compareValue="H">
+								AND MGD.SEND_KIND = 'H'
+							</isEqual>
+							<isEqual property="sendKind" compareValue="A">
+								AND MGD.SEND_KIND = 'A'
+							</isEqual>
+						</isNotEmpty>
+						
+						<isNotEmpty property="searchKeyword">
+							<isEqual prepend="AND" property="searchCondition" compareValue="">
+								( MD.CALL_FROM LIKE CONCAT('%' , #searchKeyword#, '%')  OR  MD.SMS_TXT LIKE CONCAT('%' , #searchKeyword#, '%') )
+							</isEqual>
+							<isEqual prepend="AND" property="searchCondition" compareValue="1">
+								MD.CALL_FROM LIKE CONCAT('%' , #searchKeyword#, '%')
+							</isEqual>
+							<isEqual prepend="AND" property="searchCondition" compareValue="2">
+								MD.SMS_TXT LIKE CONCAT('%' , #searchKeyword#, '%')
+							</isEqual>
+						</isNotEmpty>
+						
 						<isNotEmpty property="reserveType">
 							<isEqual property="reserveType" compareValue="D">
 								<![CDATA[ 

 								]]>
 							</isEqual>
 						</isNotEmpty>
-							) sub2
-						WHERE	sub2.resultCodeTxt = 'S'
-						AND		sub2.MSG_GROUP_ID = IN1.MSG_GROUP_ID
-					) AS msgGroupSCnt
+					) sub2
+				WHERE 1=1
+					AND sub2.resultCodeTxt = 'S'
+					AND sub2.MSG_GROUP_ID = IN1.MSG_GROUP_ID
+				) AS msgGroupSCnt
 				, COUNT(MSG_GROUP_ID) * EACH_PRICE	AS totSPrice
-				, (SELECT	count(1) 
-					 FROM
+				, (SELECT
+						count(1)
+					FROM
 						(SELECT
-								(<include refid="MjonMsgSentDAO.selectAgentResultQuery_MD"/>) AS resultCodeTxt,
-								MGD.MSG_GROUP_ID
-							FROM	MJ_MSG_GROUP_DATA MGD
+							(<include refid="MjonMsgSentDAO.selectAgentResultQuery_MD"/>) AS resultCodeTxt
+							, MGD.MSG_GROUP_ID
+						FROM
+							MJ_MSG_GROUP_DATA MGD
 							LEFT JOIN MJ_MSG_DATA MD
-							ON	MD.MSG_GROUP_ID = MGD.MSG_GROUP_ID
-							WHERE	MGD.USER_ID = #userId#
+							ON MD.MSG_GROUP_ID = MGD.MSG_GROUP_ID
+						WHERE 1=1
+							AND MGD.USER_ID = #userId#
 							AND DATE_FORMAT(MGD.REQ_DATE, '%Y-%m-%d') BETWEEN #ntceBgnde# AND #ntceEndde#
 							<isNotEmpty property="reserveType">
 								<isEqual property="reserveType" compareValue="D">

 									]]>
 								</isEqual>
 							</isNotEmpty>
-							) sub2
-						WHERE	<![CDATA[ sub2.resultCodeTxt <> 'S' ]]>
-						AND		sub2.MSG_GROUP_ID = IN1.MSG_GROUP_ID
+						) sub2
+						WHERE 1=1
+							AND <![CDATA[ sub2.resultCodeTxt <> 'S' ]]>
+							AND sub2.MSG_GROUP_ID = IN1.MSG_GROUP_ID
 					) AS msgGroupFWCnt
 				, '0'								AS totFWPrice
 				, MSG_GROUP_ID						AS msgGroupId
 				, USER_ID							AS userId
 				, CALL_FROM							AS callFrom
 				, CALL_TO							AS callTo
+				, SEND_KIND							AS sendKind
 				, SMS_TXT							AS smsTxt
 				, FILE_CNT							AS fileCnt
 				, MSG_TYPE							AS msgType

 					, MGD.USER_ID
 					, MGD.CALL_FROM
 					, MD.CALL_TO
+					, MGD.SEND_KIND
 					, MGD.SMS_TXT
 					, MGD.FILE_CNT
 					, MD.MSG_TYPE

 					</isEqual>
 					AND DATE_FORMAT(MGD.REQ_DATE, '%Y-%m-%d') BETWEEN #ntceBgnde# AND #ntceEndde#
 					
+					<isNotEmpty property="sendKind">
+						<isEqual property="sendKind" compareValue="H">
+							AND MGD.SEND_KIND = 'H'
+						</isEqual>
+						<isEqual property="sendKind" compareValue="A">
+							AND MGD.SEND_KIND = 'A'
+						</isEqual>
+					</isNotEmpty>
+					
+					<isNotEmpty property="searchKeyword">
+						<isEqual prepend="AND" property="searchCondition" compareValue="">
+							( MD.CALL_FROM LIKE CONCAT('%' , #searchKeyword#, '%')  OR  MD.SMS_TXT LIKE CONCAT('%' , #searchKeyword#, '%') )
+						</isEqual>
+						<isEqual prepend="AND" property="searchCondition" compareValue="1">
+							MD.CALL_FROM LIKE CONCAT('%' , #searchKeyword#, '%')
+						</isEqual>
+						<isEqual prepend="AND" property="searchCondition" compareValue="2">
+							MD.SMS_TXT LIKE CONCAT('%' , #searchKeyword#, '%')
+						</isEqual>
+					</isNotEmpty>
 					<isNotEmpty property="reserveType">
 						<isEqual property="reserveType" compareValue="D">
 						<![CDATA[ 

 						AND MGD.RESERVE_YN = 'Y'
 						]]>
 						/**30분 지연이 아니거나 지연 처리가 완료된 건들 불러오기*/
-		                 AND
-	                         (
-	                                 (
-	                                         MGD.DELAY_YN          = 'N'
-	                                 AND     MGD.DELAY_COMPLETE_YN = 'N'
-	                                 )
-	                         OR
-	                                 (
-	                                         MGD.DELAY_YN          = 'Y'
-	                                 AND     MGD.DELAY_COMPLETE_YN = 'Y'
-	                                 )
-	                         )
+						AND
+						(
+							(
+								MGD.DELAY_YN = 'N'
+								AND MGD.DELAY_COMPLETE_YN = 'N'
+							)
+							OR
+							(
+								MGD.DELAY_YN = 'Y'
+								AND MGD.DELAY_COMPLETE_YN = 'Y'
+							)
+						)
 						</isEqual>
 					</isNotEmpty>
 					

 						ON MD.MSG_GROUP_ID = MGD.MSG_GROUP_ID
 					LEFT JOIN (SELECT CODE_NM  ,CODE , CODE_DC FROM LETTCCMMNDETAILCODE WHERE USE_AT  = 'Y' AND CODE_ID = 'ITN019' )B
 						ON MD.AGENT_CODE = B.CODE
-				WHERE
-					MGD.USER_ID = #userId#
+				WHERE 1=1
+					AND MGD.USER_ID = #userId#
 					AND MGD.MSG_TYPE IN (4, 6)
 					<isNotEmpty property="msgType">
 					AND MGD.MSG_TYPE = #msgType#

 					AND MGD.FILE_CNT = 0
 					</isEqual>
 					AND DATE_FORMAT(MGD.REQ_DATE, '%Y-%m-%d') BETWEEN #ntceBgnde# AND #ntceEndde#
+					
+					<isNotEmpty property="sendKind">
+						<isEqual property="sendKind" compareValue="H">
+							AND MGD.SEND_KIND = 'H'
+						</isEqual>
+						<isEqual property="sendKind" compareValue="A">
+							AND MGD.SEND_KIND = 'A'
+						</isEqual>
+					</isNotEmpty>
+					
+					<isNotEmpty property="searchKeyword">
+						<isEqual prepend="AND" property="searchCondition" compareValue="">
+							( MD.CALL_FROM LIKE CONCAT('%' , #searchKeyword#, '%')  OR  MD.SMS_TXT LIKE CONCAT('%' , #searchKeyword#, '%') )
+						</isEqual>
+						<isEqual prepend="AND" property="searchCondition" compareValue="1">
+							MD.CALL_FROM LIKE CONCAT('%' , #searchKeyword#, '%')
+						</isEqual>
+						<isEqual prepend="AND" property="searchCondition" compareValue="2">
+							MD.SMS_TXT LIKE CONCAT('%' , #searchKeyword#, '%')
+						</isEqual>
+					</isNotEmpty>
+					
 					<isNotEmpty property="reserveType">
 						<isEqual property="reserveType" compareValue="D">
 						<![CDATA[ 

 					</isEqual>
 					AND DATE_FORMAT(MGD.REQ_DATE, '%Y-%m-%d') BETWEEN #ntceBgnde# AND #ntceEndde#
 					
+					<isNotEmpty property="sendKind">
+						<isEqual property="sendKind" compareValue="H">
+							AND MGD.SEND_KIND = 'H'
+						</isEqual>
+						<isEqual property="sendKind" compareValue="A">
+							AND MGD.SEND_KIND = 'A'
+						</isEqual>
+					</isNotEmpty>
+					
+					<isNotEmpty property="searchKeyword">
+						<isEqual prepend="AND" property="searchCondition" compareValue="">
+							( MD.CALL_FROM LIKE CONCAT('%' , #searchKeyword#, '%')  OR  MD.SMS_TXT LIKE CONCAT('%' , #searchKeyword#, '%') )
+						</isEqual>
+						<isEqual prepend="AND" property="searchCondition" compareValue="1">
+							MD.CALL_FROM LIKE CONCAT('%' , #searchKeyword#, '%')
+						</isEqual>
+						<isEqual prepend="AND" property="searchCondition" compareValue="2">
+							MD.SMS_TXT LIKE CONCAT('%' , #searchKeyword#, '%')
+						</isEqual>
+					</isNotEmpty>
+					
 					<isNotEmpty property="reserveType">
 						<isEqual property="reserveType" compareValue="D">
 						<![CDATA[ 

abcbbf0

5948395

src/main/resources/egovframework/sqlmap/let/uss/umt/EgovMberManage_SQL_Mysql.xml

--- src/main/resources/egovframework/sqlmap/let/uss/umt/EgovMberManage_SQL_Mysql.xml

+++ src/main/resources/egovframework/sqlmap/let/uss/umt/EgovMberManage_SQL_Mysql.xml


 					AND A.MSG_GROUP_ID = A.msgGroupId
 					AND (<include refid="MjonMsgSentDAO.selectAgentResultQuery_A"/>) = 'S'
 			) AS successCnt
+			, MGD.SEND_KIND	AS sendKind
 			, MGD.SMS_TXT	AS smsTxt
 			, userdata
 			, curState

 					AND A.MSG_GROUP_ID = A.msgGroupId
 					AND (<include refid="MjonMsgSentDAO.selectAgentResultQuery_A"/>) = 'S'
 			) AS successCnt
+			, MGD.SEND_KIND	AS sendKind
 			, MGD.SMS_TXT	AS smsTxt
 			, userdata
 			, curState

 					AND A.MSG_GROUP_ID = A.msgGroupId
 					AND (<include refid="MjonMsgSentDAO.selectAgentResultQuery_A"/>) = 'S'
 			) AS successCnt
+			, MGD.SEND_KIND	AS sendKind
 			, MGD.SMS_TXT	AS smsTxt
 			, userdata
 			, curState

abcbbf0

5948395

src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectMsgDataListPop.jsp

--- src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectMsgDataListPop.jsp

+++ src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectMsgDataListPop.jsp


 	$('#ntceEnddeYYYMMDD').val('');
 	$('#ntceBgnde').val('');
 	$('#ntceEndde').val('');
+	
+	$('#searchKeyword').val('');
+	$('#sendKind').val('').prop("selected",true);
+	$('#searchCondition').val('').prop("selected",true);
 }
 
 

 				<table class="tbType1">
 					<colgroup>
 						<col style="width:5.00%">
+						<col style="width:5.00%">
 						<col style="width:5.50%">
 						<col style="width:7.00%">
 						<col style="width:7.50%">

 					</colgroup>
 					<thead>
 						<tr>
+							<th rowspan="2">방식</th>
 							<th colspan="4">단문</th>
 							<th colspan="4">장문</th>
 							<th colspan="4">그림문자</th>

 					</thead>
 					<tbody>
 						<tr>
-							<td><span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${msgSmsGroupSCntSum}" pattern="#,###" /></span></td>
-							<td><span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${totSmsSPriceSum}" pattern="#,###" /></span></td>
-							<td><span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${msgSmsGroupFWCntSum}" pattern="#,###" /></span></td>
-							<td><span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${totSmsFWPriceSum}" pattern="#,###" /></span></td>
-							<td><span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${msgLmsGroupSCntSum}" pattern="#,###" /></span></td>
-							<td><span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${totLmsSPriceSum}" pattern="#,###" /></span></td>
-							<td><span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${msgLmsGroupFWCntSum}" pattern="#,###" /></span></td>
-							<td><span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${totLmsFWPriceSum}" pattern="#,###" /></span></td>
-							<td><span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${msgMmsGroupSCntSum}" pattern="#,###" /></span></td>
-							<td><span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${totMmsSPriceSum}" pattern="#,###" /></span></td>
-							<td><span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${msgMmsGroupFWCntSum}" pattern="#,###" /></span></td>
-							<td><span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${totMmsFWPriceSum}" pattern="#,###" /></span></td>
-							<td><span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${msgGroupSCntSum}" pattern="#,###" /></span></td>
-							<td><span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${totSPriceSum}" pattern="#,###" /></span></td>
-							<td><span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${msgGroupFWCntSum}" pattern="#,###" /></span></td>
-							<td><span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${totFWPriceSum}" pattern="#,###" /></span></td>
+							<td>
+								전체
+							</td>
+							<td>
+								<span class="tType4 c_456ded fwBold">
+									<fmt:formatNumber value="${msgSmsGroupSCntSum}" pattern="#,###" />
+								</span>
+							</td>
+							<td>
+								<span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${totSmsSPriceSum}" pattern="#,###" /></span>
+							</td>
+							<td>
+								<span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${msgSmsGroupFWCntSum}" pattern="#,###" /></span>
+							</td>
+							<td>
+								<span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${totSmsFWPriceSum}" pattern="#,###" /></span>
+							</td>
+							<td>
+								<span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${msgLmsGroupSCntSum}" pattern="#,###" /></span>
+							</td>
+							<td>
+								<span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${totLmsSPriceSum}" pattern="#,###" /></span>
+							</td>
+							<td>
+								<span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${msgLmsGroupFWCntSum}" pattern="#,###" /></span>
+							</td>
+							<td>
+								<span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${totLmsFWPriceSum}" pattern="#,###" /></span>
+							</td>
+							<td>
+								<span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${msgMmsGroupSCntSum}" pattern="#,###" /></span>
+							</td>
+							<td>
+								<span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${totMmsSPriceSum}" pattern="#,###" /></span>
+							</td>
+							<td>
+								<span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${msgMmsGroupFWCntSum}" pattern="#,###" /></span>
+							</td>
+							<td>
+								<span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${totMmsFWPriceSum}" pattern="#,###" /></span>
+							</td>
+							<td>
+								<span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${msgGroupSCntSum}" pattern="#,###" /></span>
+							</td>
+							<td>
+								<span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${totSPriceSum}" pattern="#,###" /></span>
+							</td>
+							<td>
+								<span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${msgGroupFWCntSum}" pattern="#,###" /></span>
+							</td>
+							<td>
+								<span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${totFWPriceSum}" pattern="#,###" /></span>
+							</td>
 						</tr>
 					</tbody>
 				</table>
 			</div>
 			
 			<div class="listSerch">
-				<select name="searchCondition" class="select" title="검색조건 선택">
+				
+				<select id="sendKind" name="sendKind" class="select" title="검색조건 선택">
+					<option value="" <c:if test="${searchVO.sendKind == ''}">selected="selected"</c:if>>발송방식 전체</option>
+					<option value="H" <c:if test="${searchVO.sendKind == 'H'}">selected="selected"</c:if>>WEB</option>
+					<option value="A" <c:if test="${searchVO.sendKind == 'A'}">selected="selected"</c:if>>API</option>
+				</select>
+				
+				<select id="searchCondition" name="searchCondition" class="select" title="검색조건 선택">
 					<option value="" <c:if test="${searchVO.searchCondition == ''}">selected="selected"</c:if>>발신번호/내용</option>
-					<%-- <option value="1" <c:if test="${searchVO.searchCondition == '1'}">selected="selected"</c:if>>사용자ID</option> --%>
-					<option value="2" <c:if test="${searchVO.searchCondition == '2'}">selected="selected"</c:if>>발신번호</option>
-					<option value="3" <c:if test="${searchVO.searchCondition == '3'}">selected="selected"</c:if>>전송내용</option>
+					<option value="1" <c:if test="${searchVO.searchCondition == '1'}">selected="selected"</c:if>>발신번호</option>
+					<option value="2" <c:if test="${searchVO.searchCondition == '2'}">selected="selected"</c:if>>전송내용</option>
 				</select>
 				
 				<input id="searchKeyword" name="searchKeyword" class="recentSearch" type="text" value="<c:out value='${searchVO.searchKeyword}'/>" size="25" title="검색" maxlength="100" />
 				<input type="button" class="btnType1" value="검색" onclick="fn_search(); return false;">
 				
 				<input type="hidden" name="cal_url" id="cal_url" value="/sym/cmm/EgovNormalCalPopup.do">
-			    <a href="#" onclick="javascript:fn_egov_NormalCalendar(document.forms.listForm, document.forms.listForm.ntceBgndeYYYMMDD);">
-			    <input style="width:auto;min-width: 83px;" type="text" class="date_format" name="ntceBgndeYYYMMDD" id="ntceBgndeYYYMMDD" size="4" maxlength="4" readonly=""
-			    value="<c:out value="${searchVO.ntceBgnde}" />" >
-			   	 	<input type="button" class="calBtn">
-		    	</a>
-		    	&nbsp;&nbsp;~    	
-			    <a href="#" onclick="javascript:fn_egov_NormalCalendar(document.forms.listForm, document.forms.listForm.ntceEnddeYYYMMDD);">
-				<input style="width:auto;min-width: 83px;" type="text" class="date_format" name="ntceEnddeYYYMMDD" id="ntceEnddeYYYMMDD" size="4" maxlength="4" readonly=""
-		    	value="<c:out value="${searchVO.ntceEndde}" />"
-		    	>
-			   	 	<input type="button" class="calBtn">
-		    	</a>
+				<a href="#" onclick="javascript:fn_egov_NormalCalendar(document.forms.listForm, document.forms.listForm.ntceBgndeYYYMMDD);">
+					<input style="width:auto;min-width: 83px;" type="text" class="date_format" name="ntceBgndeYYYMMDD" id="ntceBgndeYYYMMDD" size="4" maxlength="4" readonly=""
+					value="<c:out value="${searchVO.ntceBgnde}" />" >
+					<input type="button" class="calBtn">
+				</a>
+				&nbsp;&nbsp;~
+				<a href="#" onclick="javascript:fn_egov_NormalCalendar(document.forms.listForm, document.forms.listForm.ntceEnddeYYYMMDD);">
+					<input style="width:auto;min-width: 83px;" type="text" class="date_format" name="ntceEnddeYYYMMDD" id="ntceEnddeYYYMMDD" size="4" maxlength="4" readonly=""
+					value="<c:out value="${searchVO.ntceEndde}" />" >
+					<input type="button" class="calBtn">
+				</a>
 				<a href="#" style="margin-left: 17px;" onclick="init_date(); return false;">
 					<img src="/pb/img/common/topTimeOut.png" alt="타임아웃 아이콘">
 				</a>		    

 						<col style="width: 6%">
 						<%-- <col style="width: 8%"> --%>
 						<%-- <col style="width: 6%"> --%>
-						<%--<col style="width: 6%">--%>
+						<col style="width: 6%">
 						<col style="width: 8%">
 						<col style="width: 7%">
 						<col style="width: 7%">

 							<th>예약</th>
 							<th>내용</th>
 							<th>타입</th>
-							<!-- <th>금액</th> -->
-							<!-- <th>발송결과</th> -->
-							<%--<th>전송사</th>--%>
+							<th>방식</th>
 							<th>스미싱의심</th>
 							<th>이용정지</th>
 							<th>발송처리</th>

 						<tr>
 							<td>
 								<c:if test="${searchVO.searchSortOrd eq 'desc' }">
-		                			<c:out value="${ ( paginationInfo.totalRecordCount - ((paginationInfo.currentPageNo -1)*paginationInfo.recordCountPerPage) ) - status.index }"/>
-			                	</c:if>
-			                	<c:if test="${searchVO.searchSortOrd eq 'asc' }">
+									<c:out value="${ ( paginationInfo.totalRecordCount - ((paginationInfo.currentPageNo -1)*paginationInfo.recordCountPerPage) ) - status.index }"/>
+								</c:if>
+								<c:if test="${searchVO.searchSortOrd eq 'asc' }">
 									<c:out value="${(paginationInfo.currentPageNo - 1) * paginationInfo.recordCountPerPage + status.count}"/>                   		
-			                	</c:if>
+								</c:if>
 							</td>
 							<td>
 								<c:out value="${result.callFrom}"/>
 							</td>
 							<td title="<c:out value="${result.regDate}"/>">
 								<fmt:parseDate value="${result.regDate}" var="regDateValue" pattern="yyyy-MM-dd HH:mm"/>
-								<fmt:formatDate value="${regDateValue}" pattern="MM-dd HH:mm"/>																						
+								<fmt:formatDate value="${regDateValue}" pattern="MM-dd HH:mm"/>
 							</td>
 							<td>
 								<c:choose>
 									<c:when test="${result.reserveCYn eq 'Y'}">
 										<c:out value="${result.cancelDate}"/>
-									</c:when>                                                
+									</c:when>
 									<c:when test="${result.reserveYn eq 'Y' && result.reserveCYn eq 'N'}">
 										<c:out value="${result.reqDate}"/>
 									</c:when>

 								</c:choose>
 							</td>
 							<td>
-								<%-- <c:choose>
-									<c:when test="${result.resultCodeTxt eq 'S'}">
-										<fmt:formatNumber value="${result.msgGroupSCnt}" pattern="#,###" />
-									</c:when>
-									<c:otherwise>
-										<fmt:formatNumber value="${result.msgGroupFWCnt}" pattern="#,###" />
-									</c:otherwise>
-								</c:choose> --%>
 								<fmt:formatNumber value="${result.msgGroupSCnt}" pattern="#,###" />/<fmt:formatNumber value="${result.msgGroupFWCnt}" pattern="#,###" />(<fmt:formatNumber value="${(result.msgGroupSCnt / (result.msgGroupSCnt + result.msgGroupFWCnt)) * 100}" pattern="#,###" />%)
 							</td>							
 							<td>
 								<c:choose>
 									<c:when test="${result.reserveCYn eq 'Y'}">
 										예약취소
-									</c:when>                                                
+									</c:when>
 									<c:when test="${result.reserveYn eq 'Y' && result.reserveCYn eq 'N'}">
 										예약
 									</c:when>

 										즉시
 									</c:otherwise>
 								</c:choose>
-
-							</td>							
-							<%--
-							<td class="msg_detail">
-									<button type="button" class="btnType btnType20" id="msgDetail" name="msgDetail" onclick="msgDetailView(this, '<c:out value="${result.msgGroupId}"/>', '${status.count}'); return false;">상세보기</button>
-								<div class="layer_msg_wrap">
-									<div class="layer_msg_detail">
-										<button type="button" onclick="msgDetailClose(this);"></button>
-										<div class="title">
-										<c:choose>
-											<c:when test="${result.msgType eq '4'}">단문</c:when>
-											<c:when test="${result.msgType eq '6' && result.fileCnt > 0}">그림(<c:out value="${result.fileCnt}"/>장)</c:when>
-											<c:otherwise>장문</c:otherwise>
-										</c:choose>
-										</div>
-										<div class="content msgSentDetailPopLoad${status.count}">
-										</div>
-									</div>
-								</div>
 							</td>
-							--%>
 							<td class="sms_detail left">
 								<c:choose>
 									<c:when test="${empty result.smsTxt}">

 										</div>
 									</c:otherwise>
 								</c:choose>
-							</td>							
-							
+							</td>
 							<td>
 								<c:choose>
 									<c:when test="${result.msgType eq '4'}">

 									</c:otherwise>
 								</c:choose>
 							</td>
-							<%-- <td>
+							<td>
 								<c:choose>
-									<c:when test="${result.resultCodeTxt eq 'S'}">
-										<fmt:formatNumber value="${result.totSPrice}" pattern="#,###" />
+									<c:when test="${result.sendKind eq 'A'}">
+										API
 									</c:when>
-									<c:otherwise>
-										<fmt:formatNumber value="${result.totFWPrice}" pattern="#,###" />
-									</c:otherwise>
+									<c:when test="${result.sendKind eq 'H'}">
+										홈페이지
+									</c:when>
 								</c:choose>
-							</td> --%>
-							<%-- <td>
-								<c:choose>
-									<c:when test="${result.resultCodeTxt eq 'S'}">
-										정상수신
-									</c:when>
-									<c:when test="${result.resultCodeTxt eq 'F'}">
-										수신오류
-									</c:when>
-									<c:otherwise>
-										결과대기
-									</c:otherwise>
-								</c:choose>
-							</td> --%>
-							<%--<td><c:out value="${result.agentCodeTxt}"/></td>--%>
+							</td>
 							<td>
 								<c:choose>
 									<c:when test="${result.delayYn eq 'Y'}">

 						</tr>
 						</c:forEach>
 						<c:if test="${empty resultList}">
-		         			<tr><td colspan="11"><spring:message code="common.nodata.msg" /></td></tr>
+		         			<tr><td colspan="12"><spring:message code="common.nodata.msg" /></td></tr>
 		         		</c:if>    
 					</tbody>
 				</table>

abcbbf0

5948395

src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp

--- src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp

+++ src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp

...	...	@@ -3721,6 +3721,7 @@
3721	3721	<colgroup>
3722	3722	<col style="width:5%;">
3723	3723	<col style="width:7%;">
	3724	+ <col style="width:7%;">
3724	3725	<col style="width:9%;">
3725	3726	<col style="width:13%;">
3726	3727	<col style="width:15%;">
...	...	@@ -3733,6 +3734,7 @@
3733	3734	<tr>
3734	3735	<th>번호</th>
3735	3736	<th>종류</th>
	3737	+ <th>방식</th>
3736	3738	<th>등록일시</th>
3737	3739	<th>전송일시</th>
3738	3740	<th>발신번호</th>
...	...	@@ -3747,7 +3749,9 @@
3747	3749	<c:when test="${not empty mjonMsgSentList}">
3748	3750	<c:forEach var="mjonMsgSentList" items="${mjonMsgSentList}" varStatus="status">
3749	3751	<tr>
3750		- <td><c:out value="${status.count}"/></td>
	3752	+ <td>
	3753	+ <c:out value="${status.count}"/>
	3754	+ </td>
3751	3755	<td>
3752	3756	<c:choose>
3753	3757	<c:when test="${mjonMsgSentList.msgType == '4'}">
...	...	@@ -3769,6 +3773,16 @@
3769	3773	<c:otherwise>
3770	3774	장문
3771	3775	</c:otherwise>
	3776	+ </c:choose>
	3777	+ </td>
	3778	+ <td>
	3779	+ <c:choose>
	3780	+ <c:when test="${mjonMsgSentList.sendKind == 'H'}">
	3781	+ WEB
	3782	+ </c:when>
	3783	+ <c:when test="${mjonMsgSentList.sendKind == 'A'}">
	3784	+ API
	3785	+ </c:when>
3772	3786	</c:choose>
3773	3787	</td>
3774	3788	<td>
...	...	@@ -3898,7 +3912,7 @@
3898	3912	</c:when>
3899	3913	<c:otherwise>
3900	3914	<tr>
3901		- <td colspan="9">문자 발송 내역이 없습니다.</td>
	3915	+ <td colspan="10">문자 발송 내역이 없습니다.</td>
3902	3916	</tr>
3903	3917	</c:otherwise>
3904	3918	</c:choose>
...	...	@@ -3916,6 +3930,7 @@
3916	3930	<colgroup>
3917	3931	<col style="width:5%;">
3918	3932	<col style="width:7%;">
	3933	+ <col style="width:7%;">
3919	3934	<col style="width:9%;">
3920	3935	<col style="width:13%;">
3921	3936	<col style="width:15%;">
...	...	@@ -3928,6 +3943,7 @@
3928	3943	<tr>
3929	3944	<th>번호</th>
3930	3945	<th>종류</th>
	3946	+ <th>방식</th>
3931	3947	<th>등록일시</th>
3932	3948	<th>요청일시</th>
3933	3949	<th>발신번호</th>
...	...	@@ -3964,6 +3980,16 @@
3964	3980	<c:otherwise>
3965	3981	장문
3966	3982	</c:otherwise>
	3983	+ </c:choose>
	3984	+ </td>
	3985	+ <td>
	3986	+ <c:choose>
	3987	+ <c:when test="${mjonMsgSentList.sendKind == 'H'}">
	3988	+ WEB
	3989	+ </c:when>
	3990	+ <c:when test="${mjonMsgSentList.sendKind == 'A'}">
	3991	+ API
	3992	+ </c:when>
3967	3993	</c:choose>
3968	3994	</td>
3969	3995	<td>
...	...	@@ -4094,7 +4120,7 @@
4094	4120	</c:when>
4095	4121	<c:otherwise>
4096	4122	<tr>
4097		- <td colspan="9">예약 문자 내역이 없습니다.</td>
	4123	+ <td colspan="10">예약 문자 내역이 없습니다.</td>
4098	4124	</tr>
4099	4125	</c:otherwise>
4100	4126	</c:choose>
...	...	@@ -4116,6 +4142,7 @@
4116	4142	<colgroup>
4117	4143	<col style="width:5%;">
4118	4144	<col style="width:7%;">
	4145	+ <col style="width:7%;">
4119	4146	<col style="width:13%;">
4120	4147	<col style="width:14%;">
4121	4148	<col style="width:15%;">
...	...	@@ -4128,6 +4155,7 @@
4128	4155	<tr>
4129	4156	<th><input type="checkbox" name="checkDelayAll" id="checkAll" onclick="fnCheckAll();" /><label for="checkAll"></label></th>
4130	4157	<th>종류</th>
	4158	+ <th>방식</th>
4131	4159	<th>등록일시</th>
4132	4160	<th>전송일시</th>
4133	4161	<th>발신번호</th>
...	...	@@ -4168,6 +4196,16 @@
4168	4196	<c:otherwise>
4169	4197	장문
4170	4198	</c:otherwise>
	4199	+ </c:choose>
	4200	+ </td>
	4201	+ <td>
	4202	+ <c:choose>
	4203	+ <c:when test="${mjonMsgDelaySentList.sendKind == 'H'}">
	4204	+ WEB
	4205	+ </c:when>
	4206	+ <c:when test="${mjonMsgDelaySentList.sendKind == 'A'}">
	4207	+ API
	4208	+ </c:when>
4171	4209	</c:choose>
4172	4210	</td>
4173	4211	<td>
...	...	@@ -4293,7 +4331,7 @@
4293	4331	</c:when>
4294	4332	<c:otherwise>
4295	4333	<tr>
4296		- <td colspan="9">문자 지연 내역이 없습니다.</td>
	4334	+ <td colspan="10">문자 지연 내역이 없습니다.</td>
4297	4335	</tr>
4298	4336	</c:otherwise>
4299	4337	</c:choose>

Add a comment

Open 0
Closed 0

List

...	...	@@ -1788,10 +1788,10 @@
1788	1788	paginationInfo.setTotalRecordCount(resultList.size() > 0 ? ((MjonMsgVO)resultList.get(0)).getTotCnt() : 0);
1789	1789	model.addAttribute("paginationInfo", paginationInfo);
1790	1790
1791		- String msgGroupSCntSum = "0"; //정상수신 총 건수 합계
1792		- String totSPriceSum = "0"; //정상수신 총 금액 합계
1793		- String msgGroupFWCntSum = "0"; //실패대기 총 건수 합계
1794		- String totFWPriceSum = "0"; //실패대기 총 금액 합계
	1791	+ String msgGroupSCntSum = "0"; //정상수신 총 건수 합계
	1792	+ String totSPriceSum = "0"; //정상수신 총 금액 합계
	1793	+ String msgGroupFWCntSum = "0"; //실패대기 총 건수 합계
	1794	+ String totFWPriceSum = "0"; //실패대기 총 금액 합계
1795	1795
1796	1796	if(resultList.size() > 0) {
1797	1797
...	...	@@ -1809,10 +1809,10 @@
1809	1809
1810	1810
1811	1811	//단문 건수 및 금액 변수 처리
1812		- String msgSmsGroupSCntSum = "0"; //정상수신 총 건수 합계
1813		- String totSmsSPriceSum = "0"; //정상수신 총 금액 합계
1814		- String msgSmsGroupFWCntSum = "0"; //실패대기 총 건수 합계
1815		- String totSmsFWPriceSum = "0"; //실패대기 총 금액 합계
	1812	+ String msgSmsGroupSCntSum = "0"; //정상수신 총 건수 합계
	1813	+ String totSmsSPriceSum = "0"; //정상수신 총 금액 합계
	1814	+ String msgSmsGroupFWCntSum = "0"; //실패대기 총 건수 합계
	1815	+ String totSmsFWPriceSum = "0"; //실패대기 총 금액 합계
1816	1816
1817	1817	if(resultSmsList.size() > 0) {
1818	1818
...	...	@@ -1830,10 +1830,10 @@
1830	1830
1831	1831
1832	1832	//장문 건수 및 금액 변수 처리
1833		- String msgLmsGroupSCntSum = "0"; //정상수신 총 건수 합계
1834		- String totLmsSPriceSum = "0"; //정상수신 총 금액 합계
1835		- String msgLmsGroupFWCntSum = "0"; //실패대기 총 건수 합계
1836		- String totLmsFWPriceSum = "0"; //실패대기 총 금액 합계
	1833	+ String msgLmsGroupSCntSum = "0"; //정상수신 총 건수 합계
	1834	+ String totLmsSPriceSum = "0"; //정상수신 총 금액 합계
	1835	+ String msgLmsGroupFWCntSum = "0"; //실패대기 총 건수 합계
	1836	+ String totLmsFWPriceSum = "0"; //실패대기 총 금액 합계
1837	1837
1838	1838	if(resultLmsList.size() > 0) {
1839	1839
...	...	@@ -1851,10 +1851,10 @@
1851	1851
1852	1852
1853	1853	//그림 건수 및 금액 변수 처리
1854		- String msgMmsGroupSCntSum = "0"; //정상수신 총 건수 합계
1855		- String totMmsSPriceSum = "0"; //정상수신 총 금액 합계
1856		- String msgMmsGroupFWCntSum = "0"; //실패대기 총 건수 합계
1857		- String totMmsFWPriceSum = "0"; //실패대기 총 금액 합계
	1854	+ String msgMmsGroupSCntSum = "0"; //정상수신 총 건수 합계
	1855	+ String totMmsSPriceSum = "0"; //정상수신 총 금액 합계
	1856	+ String msgMmsGroupFWCntSum = "0"; //실패대기 총 건수 합계
	1857	+ String totMmsFWPriceSum = "0"; //실패대기 총 금액 합계
1858	1858
1859	1859	if(resultMmsList.size() > 0) {
1860	1860

...	...	@@ -1331,6 +1331,7 @@
1331	1331	AND A.MSG_GROUP_ID = A.msgGroupId
1332	1332	AND (<include refid="MjonMsgSentDAO.selectAgentResultQuery_A"/>) = 'S'
1333	1333	) AS successCnt
	1334	+ , MGD.SEND_KIND AS sendKind
1334	1335	, MGD.SMS_TXT AS smsTxt
1335	1336	, userdata
1336	1337	, curState
...	...	@@ -1451,6 +1452,7 @@
1451	1452	AND A.MSG_GROUP_ID = A.msgGroupId
1452	1453	AND (<include refid="MjonMsgSentDAO.selectAgentResultQuery_A"/>) = 'S'
1453	1454	) AS successCnt
	1455	+ , MGD.SEND_KIND AS sendKind
1454	1456	, MGD.SMS_TXT AS smsTxt
1455	1457	, userdata
1456	1458	, curState
...	...	@@ -1574,6 +1576,7 @@
1574	1576	AND A.MSG_GROUP_ID = A.msgGroupId
1575	1577	AND (<include refid="MjonMsgSentDAO.selectAgentResultQuery_A"/>) = 'S'
1576	1578	) AS successCnt
	1579	+ , MGD.SEND_KIND AS sendKind
1577	1580	, MGD.SMS_TXT AS smsTxt
1578	1581	, userdata
1579	1582	, curState

...	...	@@ -70,6 +70,8 @@
70	70
71	71	private int successCnt; // 문자발송 성공건수
72	72
	73	+ private String sendKind; //문자 전송 타입(H:홈페이지 A: API)
	74	+
73	75	private String msgKind; //문자종류(일반:N, 광고:A , 선거:C, 관리자:S, 이벤트:E)
74	76	private String delayYn; //지연 문자 유무
75	77	private String delayCompleteYn; //지연문자 처리 완료 여부
...	...	@@ -420,6 +422,10 @@
420	422	public void setDelayCompleteYn(String delayCompleteYn) {
421	423	this.delayCompleteYn = delayCompleteYn;
422	424	}
423		-
424		-
	425	+ public String getSendKind() {
	426	+ return sendKind;
	427	+ }
	428	+ public void setSendKind(String sendKind) {
	429	+ this.sendKind = sendKind;
	430	+ }
425	431	}

...	...	@@ -4451,6 +4451,7 @@
4451	4451	, msgGroupId
4452	4452	, callFrom
4453	4453	, callTo
	4454	+ , sendKind
4454	4455	, smsTxt
4455	4456	, fileCnt
4456	4457	, msgType
...	...	@@ -4475,50 +4476,84 @@
4475	4476	, smiId
4476	4477	, delayYn
4477	4478	, delayCompleteYn
4478		- ,(
4479		- SELECT
4480		- CONCAT(
4481		- (
4482		- IF(B.FILE_PATH1 IS NOT NULL, (SELECT
4483		- ATCH_FILE_ID
4484		- FROM LETTNFILEDETAIL
4485		- WHERE CONCAT(STRE_FILE_NM, '.', FILE_EXTSN) = CONCAT(SUBSTRING_INDEX(B.FILE_PATH1, '/', -1))
4486		- LIMIT 1), '')
4487		- )
4488		- ,'^',
4489		- (
4490		- IF(B.FILE_PATH2 IS NOT NULL, (SELECT
4491		- ATCH_FILE_ID
4492		- FROM LETTNFILEDETAIL
4493		- WHERE CONCAT(STRE_FILE_NM, '.', FILE_EXTSN) = CONCAT(SUBSTRING_INDEX(B.FILE_PATH2, '/', -1))
4494		- LIMIT 1), '')
4495		- )
4496		- ,'^',
4497		- (
4498		- IF(B.FILE_PATH3 IS NOT NULL, (SELECT
4499		- ATCH_FILE_ID
4500		- FROM LETTNFILEDETAIL
4501		- WHERE CONCAT(STRE_FILE_NM, '.', FILE_EXTSN) = CONCAT(SUBSTRING_INDEX(B.FILE_PATH3, '/', -1))
4502		- LIMIT 1), '')
4503		- ))
4504		- FROM
4505		- MJ_MSG_DATA B
4506		- WHERE
4507		- B.MSG_GROUP_ID = msgGroupId
4508		- LIMIT 1
4509		- ) AS atchFiles
	4479	+ ,(SELECT
	4480	+ CONCAT(
	4481	+ (IF(B.FILE_PATH1 IS NOT NULL
	4482	+ , (SELECT
	4483	+ ATCH_FILE_ID
	4484	+ FROM
	4485	+ LETTNFILEDETAIL
	4486	+ WHERE 1=1
	4487	+ AND CONCAT(STRE_FILE_NM, '.', FILE_EXTSN) = CONCAT(SUBSTRING_INDEX(B.FILE_PATH1, '/', -1))
	4488	+ LIMIT 1)
	4489	+ , '')
	4490	+ )
	4491	+ , '^'
	4492	+ , (IF(B.FILE_PATH2 IS NOT NULL
	4493	+ , (SELECT
	4494	+ ATCH_FILE_ID
	4495	+ FROM
	4496	+ LETTNFILEDETAIL
	4497	+ WHERE 1=1
	4498	+ AND CONCAT(STRE_FILE_NM, '.', FILE_EXTSN) = CONCAT(SUBSTRING_INDEX(B.FILE_PATH2, '/', -1))
	4499	+ LIMIT 1)
	4500	+ , '')
	4501	+ )
	4502	+ , '^'
	4503	+ , (IF(B.FILE_PATH3 IS NOT NULL
	4504	+ , (SELECT
	4505	+ ATCH_FILE_ID
	4506	+ FROM
	4507	+ LETTNFILEDETAIL
	4508	+ WHERE 1=1
	4509	+ AND CONCAT(STRE_FILE_NM, '.', FILE_EXTSN) = CONCAT(SUBSTRING_INDEX(B.FILE_PATH3, '/', -1))
	4510	+ LIMIT 1)
	4511	+ , '')
	4512	+ )
	4513	+ )
	4514	+ FROM
	4515	+ MJ_MSG_DATA B
	4516	+ WHERE 1=1
	4517	+ AND B.MSG_GROUP_ID = msgGroupId
	4518	+ LIMIT 1
	4519	+ ) AS atchFiles
4510	4520	FROM
4511	4521	(SELECT
4512		- (SELECT count(1)
4513		- FROM
4514		- (SELECT
4515		- (<include refid="MjonMsgSentDAO.selectAgentResultQuery_MD"/>) AS resultCodeTxt,
4516		- MGD.MSG_GROUP_ID
4517		- FROM MJ_MSG_GROUP_DATA MGD
	4522	+ (SELECT
	4523	+ count(1)
	4524	+ FROM
	4525	+ (SELECT
	4526	+ (<include refid="MjonMsgSentDAO.selectAgentResultQuery_MD"/>) AS resultCodeTxt
	4527	+ , MGD.MSG_GROUP_ID
	4528	+ FROM
	4529	+ MJ_MSG_GROUP_DATA MGD
4518	4530	LEFT JOIN MJ_MSG_DATA MD
4519	4531	ON MD.MSG_GROUP_ID = MGD.MSG_GROUP_ID
4520		- WHERE MGD.USER_ID = #userId#
	4532	+ WHERE 1=1
	4533	+ AND MGD.USER_ID = #userId#
4521	4534	AND DATE_FORMAT(MGD.REQ_DATE, '%Y-%m-%d') BETWEEN #ntceBgnde# AND #ntceEndde#
	4535	+
	4536	+ <isNotEmpty property="sendKind">
	4537	+ <isEqual property="sendKind" compareValue="H">
	4538	+ AND MGD.SEND_KIND = 'H'
	4539	+ </isEqual>
	4540	+ <isEqual property="sendKind" compareValue="A">
	4541	+ AND MGD.SEND_KIND = 'A'
	4542	+ </isEqual>
	4543	+ </isNotEmpty>
	4544	+
	4545	+ <isNotEmpty property="searchKeyword">
	4546	+ <isEqual prepend="AND" property="searchCondition" compareValue="">
	4547	+ ( MD.CALL_FROM LIKE CONCAT('%' , #searchKeyword#, '%') OR MD.SMS_TXT LIKE CONCAT('%' , #searchKeyword#, '%') )
	4548	+ </isEqual>
	4549	+ <isEqual prepend="AND" property="searchCondition" compareValue="1">
	4550	+ MD.CALL_FROM LIKE CONCAT('%' , #searchKeyword#, '%')
	4551	+ </isEqual>
	4552	+ <isEqual prepend="AND" property="searchCondition" compareValue="2">
	4553	+ MD.SMS_TXT LIKE CONCAT('%' , #searchKeyword#, '%')
	4554	+ </isEqual>
	4555	+ </isNotEmpty>
	4556	+
4522	4557	<isNotEmpty property="reserveType">
4523	4558	<isEqual property="reserveType" compareValue="D">
4524	4559	<![CDATA[
...	...	@@ -4533,20 +4568,24 @@
4533	4568	]]>
4534	4569	</isEqual>
4535	4570	</isNotEmpty>
4536		- ) sub2
4537		- WHERE sub2.resultCodeTxt = 'S'
4538		- AND sub2.MSG_GROUP_ID = IN1.MSG_GROUP_ID
4539		- ) AS msgGroupSCnt
	4571	+ ) sub2
	4572	+ WHERE 1=1
	4573	+ AND sub2.resultCodeTxt = 'S'
	4574	+ AND sub2.MSG_GROUP_ID = IN1.MSG_GROUP_ID
	4575	+ ) AS msgGroupSCnt
4540	4576	, COUNT(MSG_GROUP_ID) * EACH_PRICE AS totSPrice
4541		- , (SELECT count(1)
4542		- FROM
	4577	+ , (SELECT
	4578	+ count(1)
	4579	+ FROM
4543	4580	(SELECT
4544		- (<include refid="MjonMsgSentDAO.selectAgentResultQuery_MD"/>) AS resultCodeTxt,
4545		- MGD.MSG_GROUP_ID
4546		- FROM MJ_MSG_GROUP_DATA MGD
	4581	+ (<include refid="MjonMsgSentDAO.selectAgentResultQuery_MD"/>) AS resultCodeTxt
	4582	+ , MGD.MSG_GROUP_ID
	4583	+ FROM
	4584	+ MJ_MSG_GROUP_DATA MGD
4547	4585	LEFT JOIN MJ_MSG_DATA MD
4548		- ON MD.MSG_GROUP_ID = MGD.MSG_GROUP_ID
4549		- WHERE MGD.USER_ID = #userId#
	4586	+ ON MD.MSG_GROUP_ID = MGD.MSG_GROUP_ID
	4587	+ WHERE 1=1
	4588	+ AND MGD.USER_ID = #userId#
4550	4589	AND DATE_FORMAT(MGD.REQ_DATE, '%Y-%m-%d') BETWEEN #ntceBgnde# AND #ntceEndde#
4551	4590	<isNotEmpty property="reserveType">
4552	4591	<isEqual property="reserveType" compareValue="D">
...	...	@@ -4562,15 +4601,17 @@
4562	4601	]]>
4563	4602	</isEqual>
4564	4603	</isNotEmpty>
4565		- ) sub2
4566		- WHERE <![CDATA[ sub2.resultCodeTxt <> 'S' ]]>
4567		- AND sub2.MSG_GROUP_ID = IN1.MSG_GROUP_ID
	4604	+ ) sub2
	4605	+ WHERE 1=1
	4606	+ AND <![CDATA[ sub2.resultCodeTxt <> 'S' ]]>
	4607	+ AND sub2.MSG_GROUP_ID = IN1.MSG_GROUP_ID
4568	4608	) AS msgGroupFWCnt
4569	4609	, '0' AS totFWPrice
4570	4610	, MSG_GROUP_ID AS msgGroupId
4571	4611	, USER_ID AS userId
4572	4612	, CALL_FROM AS callFrom
4573	4613	, CALL_TO AS callTo
	4614	+ , SEND_KIND AS sendKind
4574	4615	, SMS_TXT AS smsTxt
4575	4616	, FILE_CNT AS fileCnt
4576	4617	, MSG_TYPE AS msgType
...	...	@@ -4601,6 +4642,7 @@
4601	4642	, MGD.USER_ID
4602	4643	, MGD.CALL_FROM
4603	4644	, MD.CALL_TO
	4645	+ , MGD.SEND_KIND
4604	4646	, MGD.SMS_TXT
4605	4647	, MGD.FILE_CNT
4606	4648	, MD.MSG_TYPE
...	...	@@ -4657,6 +4699,26 @@
4657	4699	</isEqual>
4658	4700	AND DATE_FORMAT(MGD.REQ_DATE, '%Y-%m-%d') BETWEEN #ntceBgnde# AND #ntceEndde#
4659	4701
	4702	+ <isNotEmpty property="sendKind">
	4703	+ <isEqual property="sendKind" compareValue="H">
	4704	+ AND MGD.SEND_KIND = 'H'
	4705	+ </isEqual>
	4706	+ <isEqual property="sendKind" compareValue="A">
	4707	+ AND MGD.SEND_KIND = 'A'
	4708	+ </isEqual>
	4709	+ </isNotEmpty>
	4710	+
	4711	+ <isNotEmpty property="searchKeyword">
	4712	+ <isEqual prepend="AND" property="searchCondition" compareValue="">
	4713	+ ( MD.CALL_FROM LIKE CONCAT('%' , #searchKeyword#, '%') OR MD.SMS_TXT LIKE CONCAT('%' , #searchKeyword#, '%') )
	4714	+ </isEqual>
	4715	+ <isEqual prepend="AND" property="searchCondition" compareValue="1">
	4716	+ MD.CALL_FROM LIKE CONCAT('%' , #searchKeyword#, '%')
	4717	+ </isEqual>
	4718	+ <isEqual prepend="AND" property="searchCondition" compareValue="2">
	4719	+ MD.SMS_TXT LIKE CONCAT('%' , #searchKeyword#, '%')
	4720	+ </isEqual>
	4721	+ </isNotEmpty>
4660	4722	<isNotEmpty property="reserveType">
4661	4723	<isEqual property="reserveType" compareValue="D">
4662	4724	<![CDATA[
...	...	@@ -4670,18 +4732,18 @@
4670	4732	AND MGD.RESERVE_YN = 'Y'
4671	4733	]]>
4672	4734	/*30분 지연이 아니거나 지연 처리가 완료된 건들 불러오기/
4673		- AND
4674		- (
4675		- (
4676		- MGD.DELAY_YN = 'N'
4677		- AND MGD.DELAY_COMPLETE_YN = 'N'
4678		- )
4679		- OR
4680		- (
4681		- MGD.DELAY_YN = 'Y'
4682		- AND MGD.DELAY_COMPLETE_YN = 'Y'
4683		- )
4684		- )
	4735	+ AND
	4736	+ (
	4737	+ (
	4738	+ MGD.DELAY_YN = 'N'
	4739	+ AND MGD.DELAY_COMPLETE_YN = 'N'
	4740	+ )
	4741	+ OR
	4742	+ (
	4743	+ MGD.DELAY_YN = 'Y'
	4744	+ AND MGD.DELAY_COMPLETE_YN = 'Y'
	4745	+ )
	4746	+ )
4685	4747	</isEqual>
4686	4748	</isNotEmpty>
4687	4749
...	...	@@ -4803,8 +4865,8 @@
4803	4865	ON MD.MSG_GROUP_ID = MGD.MSG_GROUP_ID
4804	4866	LEFT JOIN (SELECT CODE_NM ,CODE , CODE_DC FROM LETTCCMMNDETAILCODE WHERE USE_AT = 'Y' AND CODE_ID = 'ITN019' )B
4805	4867	ON MD.AGENT_CODE = B.CODE
4806		- WHERE
4807		- MGD.USER_ID = #userId#
	4868	+ WHERE 1=1
	4869	+ AND MGD.USER_ID = #userId#
4808	4870	AND MGD.MSG_TYPE IN (4, 6)
4809	4871	<isNotEmpty property="msgType">
4810	4872	AND MGD.MSG_TYPE = #msgType#
...	...	@@ -4816,6 +4878,28 @@
4816	4878	AND MGD.FILE_CNT = 0
4817	4879	</isEqual>
4818	4880	AND DATE_FORMAT(MGD.REQ_DATE, '%Y-%m-%d') BETWEEN #ntceBgnde# AND #ntceEndde#
	4881	+
	4882	+ <isNotEmpty property="sendKind">
	4883	+ <isEqual property="sendKind" compareValue="H">
	4884	+ AND MGD.SEND_KIND = 'H'
	4885	+ </isEqual>
	4886	+ <isEqual property="sendKind" compareValue="A">
	4887	+ AND MGD.SEND_KIND = 'A'
	4888	+ </isEqual>
	4889	+ </isNotEmpty>
	4890	+
	4891	+ <isNotEmpty property="searchKeyword">
	4892	+ <isEqual prepend="AND" property="searchCondition" compareValue="">
	4893	+ ( MD.CALL_FROM LIKE CONCAT('%' , #searchKeyword#, '%') OR MD.SMS_TXT LIKE CONCAT('%' , #searchKeyword#, '%') )
	4894	+ </isEqual>
	4895	+ <isEqual prepend="AND" property="searchCondition" compareValue="1">
	4896	+ MD.CALL_FROM LIKE CONCAT('%' , #searchKeyword#, '%')
	4897	+ </isEqual>
	4898	+ <isEqual prepend="AND" property="searchCondition" compareValue="2">
	4899	+ MD.SMS_TXT LIKE CONCAT('%' , #searchKeyword#, '%')
	4900	+ </isEqual>
	4901	+ </isNotEmpty>
	4902	+
4819	4903	<isNotEmpty property="reserveType">
4820	4904	<isEqual property="reserveType" compareValue="D">
4821	4905	<![CDATA[
...	...	@@ -4924,6 +5008,27 @@
4924	5008	</isEqual>
4925	5009	AND DATE_FORMAT(MGD.REQ_DATE, '%Y-%m-%d') BETWEEN #ntceBgnde# AND #ntceEndde#
4926	5010
	5011	+ <isNotEmpty property="sendKind">
	5012	+ <isEqual property="sendKind" compareValue="H">
	5013	+ AND MGD.SEND_KIND = 'H'
	5014	+ </isEqual>
	5015	+ <isEqual property="sendKind" compareValue="A">
	5016	+ AND MGD.SEND_KIND = 'A'
	5017	+ </isEqual>
	5018	+ </isNotEmpty>
	5019	+
	5020	+ <isNotEmpty property="searchKeyword">
	5021	+ <isEqual prepend="AND" property="searchCondition" compareValue="">
	5022	+ ( MD.CALL_FROM LIKE CONCAT('%' , #searchKeyword#, '%') OR MD.SMS_TXT LIKE CONCAT('%' , #searchKeyword#, '%') )
	5023	+ </isEqual>
	5024	+ <isEqual prepend="AND" property="searchCondition" compareValue="1">
	5025	+ MD.CALL_FROM LIKE CONCAT('%' , #searchKeyword#, '%')
	5026	+ </isEqual>
	5027	+ <isEqual prepend="AND" property="searchCondition" compareValue="2">
	5028	+ MD.SMS_TXT LIKE CONCAT('%' , #searchKeyword#, '%')
	5029	+ </isEqual>
	5030	+ </isNotEmpty>
	5031	+
4927	5032	<isNotEmpty property="reserveType">
4928	5033	<isEqual property="reserveType" compareValue="D">
4929	5034	<![CDATA[

...	...	@@ -120,6 +120,10 @@
120	120	$('#ntceEnddeYYYMMDD').val('');
121	121	$('#ntceBgnde').val('');
122	122	$('#ntceEndde').val('');
	123	+
	124	+ $('#searchKeyword').val('');
	125	+ $('#sendKind').val('').prop("selected",true);
	126	+ $('#searchCondition').val('').prop("selected",true);
123	127	}
124	128
125	129
...	...	@@ -343,6 +347,7 @@
343	347	<table class="tbType1">
344	348	<colgroup>
345	349	<col style="width:5.00%">
	350	+ <col style="width:5.00%">
346	351	<col style="width:5.50%">
347	352	<col style="width:7.00%">
348	353	<col style="width:7.50%">
...	...	@@ -361,6 +366,7 @@
361	366	</colgroup>
362	367	<thead>
363	368	<tr>
	369	+ <th rowspan="2">방식</th>
364	370	<th colspan="4">단문</th>
365	371	<th colspan="4">장문</th>
366	372	<th colspan="4">그림문자</th>
...	...	@@ -387,51 +393,93 @@
387	393	</thead>
388	394	<tbody>
389	395	<tr>
390		- <td><span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${msgSmsGroupSCntSum}" pattern="#,###" /></span></td>
391		- <td><span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${totSmsSPriceSum}" pattern="#,###" /></span></td>
392		- <td><span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${msgSmsGroupFWCntSum}" pattern="#,###" /></span></td>
393		- <td><span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${totSmsFWPriceSum}" pattern="#,###" /></span></td>
394		- <td><span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${msgLmsGroupSCntSum}" pattern="#,###" /></span></td>
395		- <td><span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${totLmsSPriceSum}" pattern="#,###" /></span></td>
396		- <td><span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${msgLmsGroupFWCntSum}" pattern="#,###" /></span></td>
397		- <td><span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${totLmsFWPriceSum}" pattern="#,###" /></span></td>
398		- <td><span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${msgMmsGroupSCntSum}" pattern="#,###" /></span></td>
399		- <td><span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${totMmsSPriceSum}" pattern="#,###" /></span></td>
400		- <td><span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${msgMmsGroupFWCntSum}" pattern="#,###" /></span></td>
401		- <td><span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${totMmsFWPriceSum}" pattern="#,###" /></span></td>
402		- <td><span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${msgGroupSCntSum}" pattern="#,###" /></span></td>
403		- <td><span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${totSPriceSum}" pattern="#,###" /></span></td>
404		- <td><span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${msgGroupFWCntSum}" pattern="#,###" /></span></td>
405		- <td><span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${totFWPriceSum}" pattern="#,###" /></span></td>
	396	+ <td>
	397	+ 전체
	398	+ </td>
	399	+ <td>
	400	+ <span class="tType4 c_456ded fwBold">
	401	+ <fmt:formatNumber value="${msgSmsGroupSCntSum}" pattern="#,###" />
	402	+ </span>
	403	+ </td>
	404	+ <td>
	405	+ <span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${totSmsSPriceSum}" pattern="#,###" /></span>
	406	+ </td>
	407	+ <td>
	408	+ <span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${msgSmsGroupFWCntSum}" pattern="#,###" /></span>
	409	+ </td>
	410	+ <td>
	411	+ <span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${totSmsFWPriceSum}" pattern="#,###" /></span>
	412	+ </td>
	413	+ <td>
	414	+ <span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${msgLmsGroupSCntSum}" pattern="#,###" /></span>
	415	+ </td>
	416	+ <td>
	417	+ <span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${totLmsSPriceSum}" pattern="#,###" /></span>
	418	+ </td>
	419	+ <td>
	420	+ <span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${msgLmsGroupFWCntSum}" pattern="#,###" /></span>
	421	+ </td>
	422	+ <td>
	423	+ <span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${totLmsFWPriceSum}" pattern="#,###" /></span>
	424	+ </td>
	425	+ <td>
	426	+ <span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${msgMmsGroupSCntSum}" pattern="#,###" /></span>
	427	+ </td>
	428	+ <td>
	429	+ <span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${totMmsSPriceSum}" pattern="#,###" /></span>
	430	+ </td>
	431	+ <td>
	432	+ <span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${msgMmsGroupFWCntSum}" pattern="#,###" /></span>
	433	+ </td>
	434	+ <td>
	435	+ <span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${totMmsFWPriceSum}" pattern="#,###" /></span>
	436	+ </td>
	437	+ <td>
	438	+ <span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${msgGroupSCntSum}" pattern="#,###" /></span>
	439	+ </td>
	440	+ <td>
	441	+ <span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${totSPriceSum}" pattern="#,###" /></span>
	442	+ </td>
	443	+ <td>
	444	+ <span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${msgGroupFWCntSum}" pattern="#,###" /></span>
	445	+ </td>
	446	+ <td>
	447	+ <span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${totFWPriceSum}" pattern="#,###" /></span>
	448	+ </td>
406	449	</tr>
407	450	</tbody>
408	451	</table>
409	452	</div>
410	453
411	454	<div class="listSerch">
412		- <select name="searchCondition" class="select" title="검색조건 선택">
	455	+
	456	+ <select id="sendKind" name="sendKind" class="select" title="검색조건 선택">
	457	+ <option value="" <c:if test="${searchVO.sendKind == ''}">selected="selected"</c:if>>발송방식 전체</option>
	458	+ <option value="H" <c:if test="${searchVO.sendKind == 'H'}">selected="selected"</c:if>>WEB</option>
	459	+ <option value="A" <c:if test="${searchVO.sendKind == 'A'}">selected="selected"</c:if>>API</option>
	460	+ </select>
	461	+
	462	+ <select id="searchCondition" name="searchCondition" class="select" title="검색조건 선택">
413	463	<option value="" <c:if test="${searchVO.searchCondition == ''}">selected="selected"</c:if>>발신번호/내용</option>
414		- <%-- <option value="1" <c:if test="${searchVO.searchCondition == '1'}">selected="selected"</c:if>>사용자ID</option> --%>
415		- <option value="2" <c:if test="${searchVO.searchCondition == '2'}">selected="selected"</c:if>>발신번호</option>
416		- <option value="3" <c:if test="${searchVO.searchCondition == '3'}">selected="selected"</c:if>>전송내용</option>
	464	+ <option value="1" <c:if test="${searchVO.searchCondition == '1'}">selected="selected"</c:if>>발신번호</option>
	465	+ <option value="2" <c:if test="${searchVO.searchCondition == '2'}">selected="selected"</c:if>>전송내용</option>
417	466	</select>
418	467
419	468	<input id="searchKeyword" name="searchKeyword" class="recentSearch" type="text" value="<c:out value='${searchVO.searchKeyword}'/>" size="25" title="검색" maxlength="100" />
420	469	<input type="button" class="btnType1" value="검색" onclick="fn_search(); return false;">
421	470
422	471	<input type="hidden" name="cal_url" id="cal_url" value="/sym/cmm/EgovNormalCalPopup.do">
423		- <a href="#" onclick="javascript:fn_egov_NormalCalendar(document.forms.listForm, document.forms.listForm.ntceBgndeYYYMMDD);">
424		- <input style="width:auto;min-width: 83px;" type="text" class="date_format" name="ntceBgndeYYYMMDD" id="ntceBgndeYYYMMDD" size="4" maxlength="4" readonly=""
425		- value="<c:out value="${searchVO.ntceBgnde}" />" >
426		- <input type="button" class="calBtn">
427		- </a>
428		-   ~
429		- <a href="#" onclick="javascript:fn_egov_NormalCalendar(document.forms.listForm, document.forms.listForm.ntceEnddeYYYMMDD);">
430		- <input style="width:auto;min-width: 83px;" type="text" class="date_format" name="ntceEnddeYYYMMDD" id="ntceEnddeYYYMMDD" size="4" maxlength="4" readonly=""
431		- value="<c:out value="${searchVO.ntceEndde}" />"
432		- >
433		- <input type="button" class="calBtn">
434		- </a>
	472	+ <a href="#" onclick="javascript:fn_egov_NormalCalendar(document.forms.listForm, document.forms.listForm.ntceBgndeYYYMMDD);">
	473	+ <input style="width:auto;min-width: 83px;" type="text" class="date_format" name="ntceBgndeYYYMMDD" id="ntceBgndeYYYMMDD" size="4" maxlength="4" readonly=""
	474	+ value="<c:out value="${searchVO.ntceBgnde}" />" >
	475	+ <input type="button" class="calBtn">
	476	+ </a>
	477	+   ~
	478	+ <a href="#" onclick="javascript:fn_egov_NormalCalendar(document.forms.listForm, document.forms.listForm.ntceEnddeYYYMMDD);">
	479	+ <input style="width:auto;min-width: 83px;" type="text" class="date_format" name="ntceEnddeYYYMMDD" id="ntceEnddeYYYMMDD" size="4" maxlength="4" readonly=""
	480	+ value="<c:out value="${searchVO.ntceEndde}" />" >
	481	+ <input type="button" class="calBtn">
	482	+ </a>
435	483	<a href="#" style="margin-left: 17px;" onclick="init_date(); return false;">
436	484	<img src="/pb/img/common/topTimeOut.png" alt="타임아웃 아이콘">
437	485	</a>
...	...	@@ -462,7 +510,7 @@
462	510	<col style="width: 6%">
463	511	<%-- <col style="width: 8%"> --%>
464	512	<%-- <col style="width: 6%"> --%>
465		- <%--<col style="width: 6%">--%>
	513	+ <col style="width: 6%">
466	514	<col style="width: 8%">
467	515	<col style="width: 7%">
468	516	<col style="width: 7%">
...	...	@@ -482,9 +530,7 @@
482	530	<th>예약</th>
483	531	<th>내용</th>
484	532	<th>타입</th>
485		- <!-- <th>금액</th> -->
486		- <!-- <th>발송결과</th> -->
487		- <%--<th>전송사</th>--%>
	533	+ <th>방식</th>
488	534	<th>스미싱의심</th>
489	535	<th>이용정지</th>
490	536	<th>발송처리</th>
...	...	@@ -495,24 +541,24 @@
495	541	<tr>
496	542	<td>
497	543	<c:if test="${searchVO.searchSortOrd eq 'desc' }">
498		- <c:out value="${ ( paginationInfo.totalRecordCount - ((paginationInfo.currentPageNo -1)*paginationInfo.recordCountPerPage) ) - status.index }"/>
499		- </c:if>
500		- <c:if test="${searchVO.searchSortOrd eq 'asc' }">
	544	+ <c:out value="${ ( paginationInfo.totalRecordCount - ((paginationInfo.currentPageNo -1)*paginationInfo.recordCountPerPage) ) - status.index }"/>
	545	+ </c:if>
	546	+ <c:if test="${searchVO.searchSortOrd eq 'asc' }">
501	547	<c:out value="${(paginationInfo.currentPageNo - 1) * paginationInfo.recordCountPerPage + status.count}"/>
502		- </c:if>
	548	+ </c:if>
503	549	</td>
504	550	<td>
505	551	<c:out value="${result.callFrom}"/>
506	552	</td>
507	553	<td title="<c:out value="${result.regDate}"/>">
508	554	<fmt:parseDate value="${result.regDate}" var="regDateValue" pattern="yyyy-MM-dd HH:mm"/>
509		- <fmt:formatDate value="${regDateValue}" pattern="MM-dd HH:mm"/>
	555	+ <fmt:formatDate value="${regDateValue}" pattern="MM-dd HH:mm"/>
510	556	</td>
511	557	<td>
512	558	<c:choose>
513	559	<c:when test="${result.reserveCYn eq 'Y'}">
514	560	<c:out value="${result.cancelDate}"/>
515		- </c:when>
	561	+ </c:when>
516	562	<c:when test="${result.reserveYn eq 'Y' && result.reserveCYn eq 'N'}">
517	563	<c:out value="${result.reqDate}"/>
518	564	</c:when>
...	...	@@ -525,21 +571,13 @@
525	571	</c:choose>
526	572	</td>
527	573	<td>
528		- <%-- <c:choose>
529		- <c:when test="${result.resultCodeTxt eq 'S'}">
530		- <fmt:formatNumber value="${result.msgGroupSCnt}" pattern="#,###" />
531		- </c:when>
532		- <c:otherwise>
533		- <fmt:formatNumber value="${result.msgGroupFWCnt}" pattern="#,###" />
534		- </c:otherwise>
535		- </c:choose> --%>
536	574	<fmt:formatNumber value="${result.msgGroupSCnt}" pattern="#,###" />/<fmt:formatNumber value="${result.msgGroupFWCnt}" pattern="#,###" />(<fmt:formatNumber value="${(result.msgGroupSCnt / (result.msgGroupSCnt + result.msgGroupFWCnt)) * 100}" pattern="#,###" />%)
537	575	</td>
538	576	<td>
539	577	<c:choose>
540	578	<c:when test="${result.reserveCYn eq 'Y'}">
541	579	예약취소
542		- </c:when>
	580	+ </c:when>
543	581	<c:when test="${result.reserveYn eq 'Y' && result.reserveCYn eq 'N'}">
544	582	예약
545	583	</c:when>
...	...	@@ -547,27 +585,7 @@
547	585	즉시
548	586	</c:otherwise>
549	587	</c:choose>
550		-
551		- </td>
552		- <%--
553		- <td class="msg_detail">
554		- <button type="button" class="btnType btnType20" id="msgDetail" name="msgDetail" onclick="msgDetailView(this, '<c:out value="${result.msgGroupId}"/>', '${status.count}'); return false;">상세보기</button>
555		- <div class="layer_msg_wrap">
556		- <div class="layer_msg_detail">
557		- <button type="button" onclick="msgDetailClose(this);"></button>
558		- <div class="title">
559		- <c:choose>
560		- <c:when test="${result.msgType eq '4'}">단문</c:when>
561		- <c:when test="${result.msgType eq '6' && result.fileCnt > 0}">그림(<c:out value="${result.fileCnt}"/>장)</c:when>
562		- <c:otherwise>장문</c:otherwise>
563		- </c:choose>
564		- </div>
565		- <div class="content msgSentDetailPopLoad${status.count}">
566		- </div>
567		- </div>
568		- </div>
569	588	</td>
570		- --%>
571	589	<td class="sms_detail left">
572	590	<c:choose>
573	591	<c:when test="${empty result.smsTxt}">
...	...	@@ -612,8 +630,7 @@
612	630	</div>
613	631	</c:otherwise>
614	632	</c:choose>
615		- </td>
616		-
	633	+ </td>
617	634	<td>
618	635	<c:choose>
619	636	<c:when test="${result.msgType eq '4'}">
...	...	@@ -627,30 +644,16 @@
627	644	</c:otherwise>
628	645	</c:choose>
629	646	</td>
630		- <%-- <td>
	647	+ <td>
631	648	<c:choose>
632		- <c:when test="${result.resultCodeTxt eq 'S'}">
633		- <fmt:formatNumber value="${result.totSPrice}" pattern="#,###" />
	649	+ <c:when test="${result.sendKind eq 'A'}">
	650	+ API
634	651	</c:when>
635		- <c:otherwise>
636		- <fmt:formatNumber value="${result.totFWPrice}" pattern="#,###" />
637		- </c:otherwise>
	652	+ <c:when test="${result.sendKind eq 'H'}">
	653	+ 홈페이지
	654	+ </c:when>
638	655	</c:choose>
639		- </td> --%>
640		- <%-- <td>
641		- <c:choose>
642		- <c:when test="${result.resultCodeTxt eq 'S'}">
643		- 정상수신
644		- </c:when>
645		- <c:when test="${result.resultCodeTxt eq 'F'}">
646		- 수신오류
647		- </c:when>
648		- <c:otherwise>
649		- 결과대기
650		- </c:otherwise>
651		- </c:choose>
652		- </td> --%>
653		- <%--<td><c:out value="${result.agentCodeTxt}"/></td>--%>
	656	+ </td>
654	657	<td>
655	658	<c:choose>
656	659	<c:when test="${result.delayYn eq 'Y'}">
...	...	@@ -702,7 +705,7 @@
702	705	</tr>
703	706	</c:forEach>
704	707	<c:if test="${empty resultList}">
705		- <tr><td colspan="11"><spring:message code="common.nodata.msg" /></td></tr>
	708	+ <tr><td colspan="12"><spring:message code="common.nodata.msg" /></td></tr>
706	709	</c:if>
707	710	</tbody>
708	711	</table>

Delete comment