관리자 일/월별 매출액 엑셀 다운로드 시 데이터 결제일 정렬 오류 수정 리스트 화면 1/3/6개월 검색 후 개월 선택값 초기화 현상 오류 수정
리스트 화면 1/3/6개월 검색 후 개월 선택값 초기화 현상 오류 수정
@6076cc3e3dd543750034160313f460a2665a1199
--- src/main/java/itn/let/mjo/pay/service/MjonPayVO.java
+++ src/main/java/itn/let/mjo/pay/service/MjonPayVO.java
... | ... | @@ -68,6 +68,7 @@ |
| 68 | 68 |
private String recvUserId; // 받는 사용자 아이디 |
| 69 | 69 |
private String admUserId; // 관리자 아이디 |
| 70 | 70 |
private String blineCode; |
| 71 |
+ private String monthTerm; //검색 개월 1/3/6개월 |
|
| 71 | 72 |
|
| 72 | 73 |
|
| 73 | 74 |
public String getBlineCode() {
|
... | ... | @@ -1735,6 +1736,14 @@ |
| 1735 | 1736 |
public void setAmtAfterPayCnt(String amtAfterPayCnt) {
|
| 1736 | 1737 |
this.amtAfterPayCnt = amtAfterPayCnt; |
| 1737 | 1738 |
} |
| 1739 |
+ |
|
| 1740 |
+ public String getMonthTerm() {
|
|
| 1741 |
+ return monthTerm; |
|
| 1742 |
+ } |
|
| 1743 |
+ |
|
| 1744 |
+ public void setMonthTerm(String monthTerm) {
|
|
| 1745 |
+ this.monthTerm = monthTerm; |
|
| 1746 |
+ } |
|
| 1738 | 1747 |
|
| 1739 | 1748 |
|
| 1740 | 1749 |
} |
--- src/main/java/itn/let/mjo/pay/web/MjonPayController.java
+++ src/main/java/itn/let/mjo/pay/web/MjonPayController.java
... | ... | @@ -5416,6 +5416,8 @@ |
| 5416 | 5416 |
HttpServletResponse response , |
| 5417 | 5417 |
ModelMap model) throws Exception {
|
| 5418 | 5418 |
|
| 5419 |
+ mjonPayVO.setSearchSortCnd("regDate");
|
|
| 5420 |
+ mjonPayVO.setSearchSortOrd("asc");
|
|
| 5419 | 5421 |
mjonPayVO.setRecordCountPerPage(mjonPayVO.getPageUnit()); |
| 5420 | 5422 |
mjonPayVO.setFirstIndex(0); |
| 5421 | 5423 |
LoginVO loginVO = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser(); |
... | ... | @@ -5704,7 +5706,9 @@ |
| 5704 | 5706 |
HttpServletResponse response , |
| 5705 | 5707 |
ModelMap model) throws Exception {
|
| 5706 | 5708 |
|
| 5707 |
- mjonPayVO.setRecordCountPerPage(mjonPayVO.getPageUnit()); |
|
| 5709 |
+ mjonPayVO.setSearchSortCnd("regDate");
|
|
| 5710 |
+ mjonPayVO.setSearchSortOrd("asc");
|
|
| 5711 |
+ mjonPayVO.setRecordCountPerPage(20); |
|
| 5708 | 5712 |
mjonPayVO.setFirstIndex(0); |
| 5709 | 5713 |
LoginVO loginVO = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser(); |
| 5710 | 5714 |
if(null != loginVO && !"super".equals(loginVO.getSiteId())){
|
--- src/main/webapp/WEB-INF/jsp/uss/ion/pay/PayDayChart.jsp
+++ src/main/webapp/WEB-INF/jsp/uss/ion/pay/PayDayChart.jsp
... | ... | @@ -180,11 +180,11 @@ |
| 180 | 180 |
|
| 181 | 181 |
<div class="pageCont"> |
| 182 | 182 |
<div class="listSerch"> |
| 183 |
- <select name="setCalMonth" onchange="fnSetCalMonth(this.value)"> |
|
| 184 |
- <option value="0">전체</option> |
|
| 185 |
- <option value="1" selected="selected">1개월</option> |
|
| 186 |
- <option value="3">3개월</option> |
|
| 187 |
- <option value="6">6개월</option> |
|
| 183 |
+ <select id="monthTerm" name="monthTerm" onchange="fnSetCalMonth(this.value)"> |
|
| 184 |
+ <option value="0" <c:if test="${searchVO.monthTerm eq '0'}">selected</c:if> >전체</option>
|
|
| 185 |
+ <option value="1" <c:if test="${searchVO.monthTerm eq '1'}">selected</c:if> >1개월</option>
|
|
| 186 |
+ <option value="3" <c:if test="${searchVO.monthTerm eq '3'}">selected</c:if> >3개월</option>
|
|
| 187 |
+ <option value="6" <c:if test="${searchVO.monthTerm eq '6'}">selected</c:if> >6개월</option>
|
|
| 188 | 188 |
</select> |
| 189 | 189 |
<input type="hidden" name="cal_url" id="cal_url" value="/sym/cmm/EgovNormalCalPopup.do"> |
| 190 | 190 |
<a href="#" onclick="javascript:fn_egov_NormalCalendar(document.forms.listForm, document.forms.listForm.ntceBgndeYYYMMDD);"> |
... | ... | @@ -385,6 +385,8 @@ |
| 385 | 385 |
<form id="payExcelDwnForm" name="payExcelDwnForm" method="post"> |
| 386 | 386 |
<input type="hidden" name="ntceBgnde" id="excelNtceBgnde" value="<c:out value="${searchVO.ntceBgnde}" />">
|
| 387 | 387 |
<input type="hidden" name="ntceEndde" id="excelNtceEndde" value="<c:out value="${searchVO.ntceEndde}" />">
|
| 388 |
+ <input type="hidden" name="pageUnit" id="excelPageUnit" value="<c:out value="${paginationInfo.totalRecordCount}" />"><!-- 엑셀의 총 건수로 넘겨줌 -->
|
|
| 389 |
+ |
|
| 388 | 390 |
</form> |
| 389 | 391 |
|
| 390 | 392 |
</body> |
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?