Commit @e3adc463819e425280c8ff1fbe349543d96b228b

이호영 2024-07-05

[사용자] 결제관리 > 요금 결제내역 ==> 조회에 대한 기건설정 필수값으로 변경

@e3adc463819e425280c8ff1fbe349543d96b228b

5c2f7f5

e3adc46

src/main/java/itn/com/cmm/util/DateUtil.java

--- src/main/java/itn/com/cmm/util/DateUtil.java

+++ src/main/java/itn/com/cmm/util/DateUtil.java


     }
 
 	
+	/** 
+	 * @methodName	: dateChkAndValueChk 
+	 * @author		: 이호영
+	 * @date		: 2024.07.05 
+	 * @description	: 검색 날짜 검증 및 일수 체크
+	 * @param searchStartDate
+	 * @param searchEndDate
+	 * @param dateVal
+	 * @return 
+	 */
 	public static boolean dateChkAndValueChk(String searchStartDate, String searchEndDate, int dateVal) {
 		
 

 				isValid = false;
 			}
 		}
+		System.out.println("isValid  : "+ isValid);
 		
 		return isValid;
 	}

5c2f7f5

e3adc46

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

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

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


 		
 		model.addAttribute("prePaymentYn", userManageVO.getPrePaymentYn());
     	
+		
+		System.out.println("pattern :: "+ pattern);
     	if(pattern.equals("/web/member/pay/PayListAllAjax.do")
     			|| pattern.equals("/web/member/pay/PayListMobileAjax.do")
     			|| pattern.equals("/web/member/pay/PayListCardAjax.do")

             	
             	model.addAttribute("resultRefundVO", resultRefundVO);
             	
-            	refundVO.setStartDate(mjonPayVO.getStartDate());
-            	refundVO.setEndDate(mjonPayVO.getEndDate());
-            	
+
+    			{
+    				// 초기 날짜 셋팅
+    				model.addAttribute("startDate", DateUtil.getDateDaysAgo(365));
+    				model.addAttribute("endDate", DateUtil.getCurrentDate());
+    			}
+
+
             	//환불 요청 리스트 조회하기
             	List<RefundVO> refundList = refundService.selectRefundList(refundVO);
                 int totCnt = 0;

 			voComCode.setCodeId("ITN031");
 			model.addAttribute("emailCode", cmmUseService.selectCmmCodeDetail(voComCode));
     		
+        	
+//			mjonPayVO.setStartDate(mjonPayVO.getStartDate() == null ? DateUtil.getDateDaysAgo(365) : mjonPayVO.getStartDate());
+//			mjonPayVO.setEndDate(mjonPayVO.getEndDate() == null ? DateUtil.getCurrentDate() : mjonPayVO.getEndDate());
+			
+			if(!DateUtil.dateChkAndValueChk(mjonPayVO.getSearchStartDate(),mjonPayVO.getSearchEndDate(), 365 )) {
+				mjonPayVO.setStartDate(DateUtil.getDateDaysAgo(365));
+				mjonPayVO.setEndDate(DateUtil.getCurrentDate());
+			};
+			
+			
     		//결제 리스트 정보 불러오기
             List<MjonPayVO> resultList = mjonPayService.selectPayList(mjonPayVO);   
             
             model.addAttribute("resultList", resultList);
             paginationInfo.setTotalRecordCount(resultList.size() > 0 ? ((MjonPayVO)resultList.get(0)).getTotCnt() : 0);
     		model.addAttribute("paginationInfo", paginationInfo);
-    		
+
     		return "/web/pay/PayListAllAjax";
 		}
-    	
 		return "/web/pay/PayList";
 	}
     

5c2f7f5

e3adc46

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

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

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


 }
 
 function linkPage(pageNo){
+
+	if(!fn_cmndataValueChk("startDate", "endDate", 365)){
+		return;
+	};
+	
 	//날자 체크
 	if( $('#startDate').val() != '' && $('#endDate').val() != '' ){
 		var iChkBeginDe = Number($('#startDate').val().replaceAll("/", ""));

5c2f7f5

e3adc46

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

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

+++ src/main/webapp/WEB-INF/jsp/web/pay/PayListRefundAjax.jsp


 }
 
 function rfLinkPage(pageNo){
+	
+	
 	var form = document.listForm;
 	
 	form.pageIndex.value = pageNo;

Add a comment

Open 0
Closed 0

List

...	...	@@ -135,6 +135,16 @@
135	135	}
136	136
137	137
	138	+ /**
	139	+ * @methodName : dateChkAndValueChk
	140	+ * @author : 이호영
	141	+ * @date : 2024.07.05
	142	+ * @description : 검색 날짜 검증 및 일수 체크
	143	+ * @param searchStartDate
	144	+ * @param searchEndDate
	145	+ * @param dateVal
	146	+ * @return
	147	+ */
138	148	public static boolean dateChkAndValueChk(String searchStartDate, String searchEndDate, int dateVal) {
139	149
140	150
...	...	@@ -174,6 +184,7 @@
174	184	isValid = false;
175	185	}
176	186	}
	187	+ System.out.println("isValid : "+ isValid);
177	188
178	189	return isValid;
179	190	}

...	...	@@ -1940,6 +1940,8 @@
1940	1940
1941	1941	model.addAttribute("prePaymentYn", userManageVO.getPrePaymentYn());
1942	1942
	1943	+
	1944	+ System.out.println("pattern :: "+ pattern);
1943	1945	if(pattern.equals("/web/member/pay/PayListAllAjax.do")
1944	1946	\|\| pattern.equals("/web/member/pay/PayListMobileAjax.do")
1945	1947	\|\| pattern.equals("/web/member/pay/PayListCardAjax.do")
...	...	@@ -2013,9 +2015,14 @@
2013	2015
2014	2016	model.addAttribute("resultRefundVO", resultRefundVO);
2015	2017
2016		- refundVO.setStartDate(mjonPayVO.getStartDate());
2017		- refundVO.setEndDate(mjonPayVO.getEndDate());
2018		-
	2018	+
	2019	+ {
	2020	+ // 초기 날짜 셋팅
	2021	+ model.addAttribute("startDate", DateUtil.getDateDaysAgo(365));
	2022	+ model.addAttribute("endDate", DateUtil.getCurrentDate());
	2023	+ }
	2024	+
	2025	+
2019	2026	//환불 요청 리스트 조회하기
2020	2027	List<RefundVO> refundList = refundService.selectRefundList(refundVO);
2021	2028	int totCnt = 0;
...	...	@@ -2097,16 +2104,25 @@
2097	2104	voComCode.setCodeId("ITN031");
2098	2105	model.addAttribute("emailCode", cmmUseService.selectCmmCodeDetail(voComCode));
2099	2106
	2107	+
	2108	+// mjonPayVO.setStartDate(mjonPayVO.getStartDate() == null ? DateUtil.getDateDaysAgo(365) : mjonPayVO.getStartDate());
	2109	+// mjonPayVO.setEndDate(mjonPayVO.getEndDate() == null ? DateUtil.getCurrentDate() : mjonPayVO.getEndDate());
	2110	+
	2111	+ if(!DateUtil.dateChkAndValueChk(mjonPayVO.getSearchStartDate(),mjonPayVO.getSearchEndDate(), 365 )) {
	2112	+ mjonPayVO.setStartDate(DateUtil.getDateDaysAgo(365));
	2113	+ mjonPayVO.setEndDate(DateUtil.getCurrentDate());
	2114	+ };
	2115	+
	2116	+
2100	2117	//결제 리스트 정보 불러오기
2101	2118	List<MjonPayVO> resultList = mjonPayService.selectPayList(mjonPayVO);
2102	2119
2103	2120	model.addAttribute("resultList", resultList);
2104	2121	paginationInfo.setTotalRecordCount(resultList.size() > 0 ? ((MjonPayVO)resultList.get(0)).getTotCnt() : 0);
2105	2122	model.addAttribute("paginationInfo", paginationInfo);
2106		-
	2123	+
2107	2124	return "/web/pay/PayListAllAjax";
2108	2125	}
2109		-
2110	2126	return "/web/pay/PayList";
2111	2127	}
2112	2128

...	...	@@ -53,6 +53,11 @@
53	53	}
54	54
55	55	function linkPage(pageNo){
	56	+
	57	+ if(!fn_cmndataValueChk("startDate", "endDate", 365)){
	58	+ return;
	59	+ };
	60	+
56	61	//날자 체크
57	62	if( $('#startDate').val() != '' && $('#endDate').val() != '' ){
58	63	var iChkBeginDe = Number($('#startDate').val().replaceAll("/", ""));

...	...	@@ -402,6 +402,8 @@
402	402	}
403	403
404	404	function rfLinkPage(pageNo){
	405	+
	406	+
405	407	var form = document.listForm;
406	408
407	409	form.pageIndex.value = pageNo;

Delete comment