diff --git a/src/main/java/itn/let/mjo/pay/web/MjonPayController.java b/src/main/java/itn/let/mjo/pay/web/MjonPayController.java index 08267bdb..80376b40 100644 --- a/src/main/java/itn/let/mjo/pay/web/MjonPayController.java +++ b/src/main/java/itn/let/mjo/pay/web/MjonPayController.java @@ -2607,7 +2607,7 @@ public class MjonPayController { * @throws Exception */ @RequestMapping(value= {"/web/member/pay/PayUserSWList.do"}) - public String PayUserSWList(@ModelAttribute("mjonMsgVO") MjonMsgVO mjonMsgVO, + public String payUserSWList(@ModelAttribute("mjonMsgVO") MjonMsgVO mjonMsgVO, MjonPayVO mjonPayVO, MberManageVO mberManageVO, RedirectAttributes redirectAttributes, HttpServletRequest request, @@ -2622,6 +2622,14 @@ public class MjonPayController { } String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId()); mjonMsgVO.setUserId(userId); + + + // 비즈니스 로직 부분 +// Map resultMap = mjonPayService.payUserSWList(mjonPayVO); + + + + /* { // 충전캐시 String sumPayMoney = mjonPayService.selectAgentSumPayMoney(userId); @@ -2733,6 +2741,15 @@ public class MjonPayController { model.addAttribute("endDate", DateUtils.getCurrentDate()); } + + + + + + + + + return "/web/pay/PayUserSWList"; } diff --git a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml index e924647a..3d6d35b2 100644 --- a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml @@ -3168,6 +3168,7 @@ WHERE 1 = 1 AND pf.SentEA > 0 AND mjf.USER_ID = #userId# + AND mjf.RESERVE_C_YN = 'N' ) AS pay WHERE 1=1 @@ -3277,7 +3278,7 @@ , M.fileName3 AS fileName3 , M.orderByCode AS orderByCode , M.msgId AS msgId - , M.reqDate AS reqDate + , DATE_FORMAT(M.reqDate, '%Y-%m-%d %H:%i') AS reqDate FROM (SELECT DATE_FORMAT(B.REGDATE, '%Y-%m-%d %H:%i' ) AS regDate @@ -3318,7 +3319,7 @@ /*and A.DEL_FLAG = 'N'*/ AND A.USER_ID = #userId# AND B.USER_ID = #userId# - /*AND B.RESERVE_C_YN = 'N'*/ + AND B.RESERVE_C_YN = 'N' ORDER BY 1=1 , msgGroupId DESC , sentDate DESC @@ -3366,6 +3367,7 @@ WHERE 1 = 1 AND pf.SentEA > 0 AND mjf.USER_ID = #userId# + AND mjf.RESERVE_C_YN = 'N' ) AS pay WHERE 1=1 diff --git a/src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWList.jsp b/src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWList.jsp index 1be55030..49b9dbdf 100644 --- a/src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWList.jsp @@ -47,8 +47,19 @@ $(document).ready(function(){ thisYearStart = date.getFullYear() + "/01/01" ; thisYearEnd = date.getFullYear() + "/12/31" ; + $(document).on('change','#pageUnitS', function(){ + setPageUnit($(this).val()); + + payUserListAjax(1); + + }); + }); +function setPageUnit(val){ + $('#pageUnit').val(val); +} + // 기간 요일 지정 function setCalVal(val,targetObj){ $('input[name='+targetObj+']').val(val) ; @@ -92,42 +103,6 @@ function payUserTab(obj, pageType){ } - - - -function getUsedCashTotList(){ - var sendData = { - "startDate" : $("#startDate").val(), - "endDate" : $("#endDate").val() - }; - - console.log('sendData : ', sendData); -// url: '/web/member/pay/getUsedCashTotList.do', - - $.ajax({ - type:"POST", - url:"", - data: sendData, - dataType:'json', - success:function(data){ - console.log('data :: ', data); - if(data.status == 'OK') { - // 성공 처리 - } else { - // 오류 처리 - } - }, - error: function(jqXHR, textStatus, errorThrown) { - console.error("AJAX Error:", textStatus, errorThrown); - console.error("Response:", jqXHR.responseText); - } - }); -} - - - - - /* 윈도우팝업 열기 */ function infoPop(pageUrl){ document.infoPopForm.pageType.value = pageUrl; @@ -534,6 +509,7 @@ function fnRevDetailPop03(msgGroupId){
+
diff --git a/src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWListAjax.jsp index 2b071585..4fb6b195 100644 --- a/src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWListAjax.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWListAjax.jsp @@ -91,8 +91,39 @@ $(document).ready(function(){ }); -/* 사용내역서 클릭 시 내역서 새창 팝업 오픈 */ +/* 250530 - 거래명세서, 사용내역서 분리 */ function fnShowPrintPopup() { + //만들려는 팝업의 크기 + var url = "printMsgUsageDetailsAjax.do"; + var popup_wid = '790'; + var popup_ht = '800'; + var popup_left = (window.screen.width/2)-(popup_wid/2); + var popup_top =(window.screen.height/2)-(popup_ht/2); + + //날짜 체크 + if(($('#startDate').val() != '' && $('#endDate').val() == '') || ($('#startDate').val() == '' && $('#endDate').val() != '')){ + alert("기간설정을 정상적으로 선택해 주세요."); + return; + } + + if( $('#startDate').val() != '' && $('#endDate').val() != '' ){ + var iChkBeginDe = Number($('#startDate').val().replaceAll("/", "")); + var iChkEndDe = Number($('#endDate').val().replaceAll("/", "")); + if(iChkBeginDe > iChkEndDe || iChkEndDe < iChkBeginDe ){ + alert("기간설정의 시작일자는 종료일자 보다 클수 없습니다."); + return; + } + } + + document.listForm.action = url; + document.listForm.method = "post"; + window.open("about:blank", 'printPop', 'width='+ popup_wid +', height='+ popup_ht +', left=' + popup_left + ', top='+ popup_top + ', fullscreen=no, menubar=no, status=no, toolbar=no, titlebar=yes, location=no, scrollbars=1'); + document.listForm.target = "printPop"; + document.listForm.submit(); +} + +/* 사용내역서 클릭 시 내역서 새창 팝업 오픈 */ +/* function fnShowPrintPopup() { //만들려는 팝업의 크기 var url = ""; var popup_wid = '830'; @@ -131,7 +162,7 @@ function fnShowPrintPopup() { window.open("about:blank", 'printPop', 'width='+ popup_wid +', height='+ popup_ht +', left=' + popup_left + ', top='+ popup_top + ', fullscreen=no, menubar=no, status=no, toolbar=no, titlebar=yes, location=no, scrollbars=1'); document.listForm.target = "printPop"; document.listForm.submit(); -} +} */ /* 사용내역서 클릭 시 내역서 새창 팝업 오픈 */ function fnShowPrintPopup_OLD() { @@ -214,41 +245,48 @@ function fnShowPdfPrintPopup(){
" /> " /> +

${paginationInfo.totalRecordCount}건   ( 원)

- + + + + + + +
- <%-- --%> - - - - - -<%-- --%> - <%-- + + - - --%> + + + - <%-- --%> - - - - - - + + - - - - - + + @@ -285,10 +313,6 @@ function fnShowPdfPrintPopup(){ - <%-- --%> @@ -339,11 +363,11 @@ function fnShowPdfPrintPopup(){ (매) - / - <%-- - - () - --%> +

+ +
- <%-- --%> - - <%-- - - - --%> - <%-- - --%> - @@ -412,7 +390,9 @@ function fnShowPdfPrintPopup(){
- - - 발송일시
@@ -256,28 +294,18 @@ function fnShowPdfPrintPopup(){
- 문자유형 + 형태
내용발송건수사용발송건수금액(원)
충전금성공실패
- - -

+

+

@@ -352,58 +376,12 @@ function fnShowPdfPrintPopup(){

-

- - -

-
-

- - -

-
-

- - -

-
-

- - -

-
-

- 0 -

-
-

- - -

-
-

- - -

-
+ 검색 결과가 없습니다.
-
+ + + <%--
@@ -434,7 +414,7 @@ function fnShowPdfPrintPopup(){
-
+
--%>