이지우 - 요금사용내역 작업 중

src/main/java/itn/let/mjo/pay/service/MjonPayService.java

@@ -5,6 +5,8 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
+import itn.let.mjo.msg.service.MjonMsgVO;
+
 public interface MjonPayService {
 
 	List<MjonPayVO> selectPayList(MjonPayVO mjonPayVO)  throws Exception;
@@ -142,5 +144,7 @@ public interface MjonPayService {
 	public String selectTotSumPaymentAfterPay(String userId) throws Exception;
 
 	Map<String, Object> payUserSWList(MjonPayVO mjonPayVO) throws Exception;
+	
+	Map<String, Object> payUserSWListAjax(MjonMsgVO mjonMsgVO) throws Exception;
 
 }

src/main/java/itn/let/mjo/pay/service/impl/MjonPayServiceImpl.java

@@ -28,6 +28,7 @@ import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper;
 import itn.com.cmm.LoginVO;
 import itn.com.cmm.util.DateUtils;
 import itn.com.cmm.util.MJUtil;
+import itn.com.cmm.util.PayUtils;
 import itn.com.utl.fcc.service.EgovStringUtil;
 import itn.let.mjo.event.service.MjonEventVO;
 import itn.let.mjo.event.service.impl.MjonEventDAO;
@@ -2940,6 +2941,33 @@ public class MjonPayServiceImpl extends EgovAbstractServiceImpl implements MjonP
 		return returnData;
 	}
 
+	@Override
+	public Map<String, Object> payUserSWListAjax(MjonMsgVO mjonMsgVO) throws Exception{
+		
+		if("".equals(mjonMsgVO.getSearchSortCnd())){ //최초조회시 최신것 조회List
+			mjonMsgVO.setSearchSortCnd("regDate");
+			mjonMsgVO.setSearchSortOrd("desc");
+		}
+		
+		Map<String, Object> returnData = new HashMap<>();
+		
+		// 검색 데이터가 없거나
+		// 시작일자가 종료일자보다 이후이거나
+		// 총 기간이 365일이 넘으면 현재일부터 365일 전 날짜를 넣어서 검색
+		if(!DateUtils.dateChkAndValueChk(mjonMsgVO.getStartDate(),mjonMsgVO.getEndDate(), 12 )) {
 
+			mjonMsgVO.setStartDate(DateUtils.getDateMonthsAgo(12));
+			mjonMsgVO.setEndDate(DateUtils.getCurrentDate());
+			
+		};
+		
+		
+		List<MjonMsgVO> payUserSWList =  mjonMsgDataDAO.selectPayUserSWList(mjonMsgVO);
+		returnData.put("payUserSWList", payUserSWList);
+		returnData.put("totCnt", payUserSWList.size()> 0 ? payUserSWList.get(0).getTotCnt() : 0);
+		returnData.put("totSuccSendPrice", payUserSWList.size() > 0 ? PayUtils.getTrimToFirstDecimal(payUserSWList.get(0).getTotSuccSendPrice())  : 0);
+		
+		return returnData;
+	}
 	
 }

src/main/java/itn/let/mjo/pay/web/MjonPayController.java

@@ -2603,10 +2603,10 @@ public class MjonPayController {
 	 * 2023.12.22 우영두 
 	 * @param mjonMsgVO
 	 * @param model
-	 * @return	"/web/member/pay/PayUserSWList.do"
+	 * @return	"/web/member/pay/payUserSWList.do"
 	 * @throws Exception
 	 */
-    @RequestMapping(value= {"/web/member/pay/PayUserSWList.do"})
+    @RequestMapping(value= {"/web/member/pay/payUserSWList.do"})
 	public String payUserSWList(@ModelAttribute("mjonMsgVO") MjonMsgVO mjonMsgVO,
 			MjonPayVO mjonPayVO,
 			MberManageVO mberManageVO, RedirectAttributes redirectAttributes,
@@ -2659,8 +2659,8 @@ public class MjonPayController {
 	 * @return	"/web/member/pay/PayUserSWListAjax.do"
 	 * @throws Exception
 	 */
-    @RequestMapping(value= {"/web/member/pay/PayUserSWListAjax.do"})
+    @RequestMapping(value= {"/web/member/pay/payUserSWListAjax.do"})
-	public String PayUserSWListAjax(@ModelAttribute("searchVO") MjonMsgVO mjonMsgVO,
+	public String payUserSWListAjax(@ModelAttribute("searchVO") MjonMsgVO mjonMsgVO,
 			HttpServletRequest request,
 			ModelMap model) throws Exception{
 		
@@ -2684,29 +2684,12 @@ public class MjonPayController {
 			mjonMsgVO.setLastIndex(paginationInfo.getLastRecordIndex());
 			mjonMsgVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); 
 			
-			if("".equals(mjonMsgVO.getSearchSortCnd())){ //최초조회시 최신것 조회List
+			Map<String, Object> resultMap = mjonPayService.payUserSWListAjax(mjonMsgVO);
-				mjonMsgVO.setSearchSortCnd("regDate");
-				mjonMsgVO.setSearchSortOrd("desc");
-			}
 			
-			// 검색 데이터가 없거나
+			paginationInfo.setTotalRecordCount((int)resultMap.get("totCnt"));
-			// 시작일자가 종료일자보다 이후이거나
-			// 총 기간이 365일이 넘으면 현재일부터 365일 전 날짜를 넣어서 검색
-			if(!DateUtils.dateChkAndValueChk(mjonMsgVO.getStartDate(),mjonMsgVO.getEndDate(), 12 )) {
-
-				mjonMsgVO.setStartDate(DateUtils.getDateMonthsAgo(12));
-				mjonMsgVO.setEndDate(DateUtils.getCurrentDate());
-				
-			};
-			
-			List<MjonMsgVO> payUserSWList =  mjonMsgDataService.selectPayUserSWList(mjonMsgVO);
-			
-			paginationInfo.setTotalRecordCount(payUserSWList.size()> 0 ? payUserSWList.get(0).getTotCnt() : 0);
 			model.addAttribute("paginationInfo", paginationInfo);
-			model.addAttribute("payUserSWList", payUserSWList);
+			model.addAttribute("payUserSWList", resultMap.get("payUserSWList"));
-
+			model.addAttribute("totSuccSendPrice", resultMap.get("totSuccSendPrice"));
-			model.addAttribute("totSuccSendPrice", payUserSWList.size() > 0 ? PayUtils.getTrimToFirstDecimal(payUserSWList.get(0).getTotSuccSendPrice())  : 0);
-			
 			model.addAttribute("mjonMsgVO", mjonMsgVO);
 			
 			

src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp

@@ -1652,7 +1652,7 @@ function actionLogin_end(){
 	            						<li><a href="<c:out value='/web/pay/PayGuide.do'/>" >요금안내/견적내기</a></li>
 	            						<li><a href="<c:out value='/web/member/pay/PayView.do'/>" >결제하기</a></li>
 	            						<li><a href="<c:out value='/web/member/pay/PayList.do'/>" >요금 결제내역</a></li>
-	            						<li><a href="<c:out value='/web/member/pay/PayUserSWList.do'/>" >요금 사용내역</a></li>
+	            						<li><a href="<c:out value='/web/member/pay/payUserSWList.do'/>" >요금 사용내역</a></li>
 										<!-- 현금영수증 자동발행 주석 -->
 	            						<%-- <li><a href="<c:out value='/web/member/pay/BillPub.do'/>" >계산서/현금영수증 발행 등록</a></li> --%>
 	            						<li><a href="<c:out value='/web/member/pay/BillPub.do'/>" >세금계산서 발행</a></li>

src/main/webapp/WEB-INF/jsp/web/pay/BillPub.jsp

@@ -495,7 +495,7 @@
                     <li class="tab"><button type="button" onclick="location.href='/web/pay/PayGuide.do'">요금안내/견적내기</button></li>
 	                <li class="tab"><button type="button" onclick="location.href='/web/member/pay/PayView.do'">결제하기</button></li>
 	                <li class="tab"><button type="button" onclick="location.href='/web/member/pay/PayList.do'">요금 결제내역</button></li>
-	                <li class="tab"><button type="button" onclick="location.href='/web/member/pay/PayUserSWList.do'">요금 사용내역</button></li>
+	                <li class="tab"><button type="button" onclick="location.href='/web/member/pay/payUserSWList.do'">요금 사용내역</button></li>
 	                <!-- <li class="tab active"><button type="button">계산서/현금영수증 발행 등록</button></li> -->
 	                <li class="tab active"><button type="button">세금계산서 발행 등록</button></li>
                 </ul><!--// tab button -->

src/main/webapp/WEB-INF/jsp/web/pay/PayList.jsp

@@ -176,7 +176,7 @@ function fnShowRefundPrintPopup(){
 			<li class="tab"><button type="button" onclick="location.href='/web/pay/PayGuide.do'">요금안내/견적내기</button></li>
 			<li class="tab"><button type="button" onclick="location.href='/web/member/pay/PayView.do'">결제하기</button></li>
 			<li class="tab active"><button type="button" >요금 결제내역</button></li>
-			<li class="tab"><button type="button" onclick="location.href='/web/member/pay/PayUserSWList.do'">요금 사용내역</button></li>
+			<li class="tab"><button type="button" onclick="location.href='/web/member/pay/payUserSWList.do'">요금 사용내역</button></li>
 			<!-- 현금영수증 자동발행 주석 -->
 			<!-- <li class="tab"><button type="button" onclick="location.href='/web/member/pay/BillPub.do'">계산서/현금영수증 발행 등록</button></li> -->
 			<li class="tab"><button type="button" onclick="location.href='/web/member/pay/BillPub.do'">세금계산서 발행 등록</button></li>

src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWList.jsp

@@ -75,7 +75,7 @@ function payUserListAjax(pageNo){
 	
 	document.listForm.pageIndex.value = pageNo;
 	var sendData= $(document.listForm).serializeArray();
-	$("#payUserListLoad").load("/web/member/pay/PayUserSWListAjax.do", sendData ,function(response, status, xhr){
+	$("#payUserListLoad").load("/web/member/pay/payUserSWListAjax.do", sendData ,function(response, status, xhr){
 	});
 }
 
@@ -85,7 +85,7 @@ function payUserListTabMoveAjax(pageNo){
 	
 	document.listForm.pageIndex.value = pageNo;
 	var sendData= $(document.listForm).serializeArray();
-	$("#payUserListLoad").load("/web/member/pay/PayUserSWListAjax.do", sendData ,function(response, status, xhr){
+	$("#payUserListLoad").load("/web/member/pay/payUserSWListAjax.do", sendData ,function(response, status, xhr){
 	});
 }
 

src/main/webapp/WEB-INF/jsp/web/pay/PayView.jsp

@@ -817,7 +817,7 @@ function fnShowVaViewPrintPopup() {
                     <li class="tab"><button type="button" onclick="location.href='/web/pay/PayGuide.do'">요금안내/견적내기</button></li>
                     <li class="tab active"><button type="button">결제하기</button></li>
                     <li class="tab"><button type="button" onclick="location.href='/web/member/pay/PayList.do'">요금 결제내역</button></li>
-                    <li class="tab"><button type="button" onclick="location.href='/web/member/pay/PayUserSWList.do'">요금 사용내역</button></li>
+                    <li class="tab"><button type="button" onclick="location.href='/web/member/pay/payUserSWList.do'">요금 사용내역</button></li>
 					<!-- 현금영수증 자동발행 주석 -->
 					<!-- <li class="tab"><button type="button" onclick="location.href='/web/member/pay/BillPub.do'">계산서/현금영수증 발행 등록</button></li> -->
 					<li class="tab"><button type="button" onclick="location.href='/web/member/pay/BillPub.do'">세금계산서 발행 등록</button></li>

src/main/webapp/WEB-INF/jsp/web/user/mberInfoIndex.jsp

@@ -669,7 +669,7 @@ function callTo() {
 						</c:otherwise>
 					</c:choose>
 					
-					<button type="button" onclick="location.href='/web/member/pay/PayUserSWList.do';">
+					<button type="button" onclick="location.href='/web/member/pay/payUserSWList.do';">
 						<img src="/publish/images/content/mypage_plus.png" alt="더보기">
 					</button>
 					<div class="table_wrap" id="send_reserv">