tolag3/mjon_git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'wyh'

Browse Source
This commit is contained in:
name 2023-07-27 14:49:39 +09:00
commit 53965fbfc3
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainDataController.java
View File

@ -843,7 +843,13 @@ public class MjonMsgCampainDataController {
if(letterVO.getPageUnit() != 10) {
letterVO.setPageUnit(letterVO.getPageUnit());
}
for(int i=0 ; i < cateConfList.size(); i++) {
if("선거".equals(cateConfList.get(i).getCateNm())) {
letterVO.setCategoryCode(cateConfList.get(i).getCateCode());
}
}
/** pageing */
PaginationInfo paginationInfo = new PaginationInfo();
paginationInfo.setCurrentPageNo(letterVO.getPageIndex());
@ -861,6 +867,8 @@ public class MjonMsgCampainDataController {
paginationInfo.setTotalRecordCount( resultPhoList.size()> 0 ? ((Long)((EgovMap)resultPhoList.get(0)).get("totCnt")).intValue() : 0);
model.addAttribute("paginationInfo", paginationInfo);
model.addAttribute("letterVO", letterVO);
return "web/msgcampain/excel/MsgExcelDataView";
}

13
src/main/webapp/WEB-INF/jsp/web/msgcampain/excel/MsgExcelDataView.jsp
View File

@ -32,6 +32,13 @@ $(document).ready(function(){
//그림문자 샘플 탭 활성화 시키기
TabType2($('.tabType2 li').eq(1), '2');
$(".tDep2_cateCode a").each(function(index, item){
if($(this).text() == "선거"){
$('.tDep2_cateCode').find('.on').removeClass('on');
$(this).addClass('on');
}
})
// 맞춤제작 요청 JSPark => 2023.02.21 추가
//맞춤제작 등록 Popup
//customPopup();
@ -83,11 +90,11 @@ function fnLetterListAjax(index){
if(document.letterForm.searchKeyword.value == ''){
$('.bottom_content .area_total_count').hide();
}
if(form.hashTag.value != ''){
/* if(form.hashTag.value != ''){
if($('#letterLoad .nodata_box').length > 0){
$('#letterLoad .nodata_box').hide().next('.nodata_box.hashTag').show();
}
}
} */
});
}
@ -117,7 +124,7 @@ function fnPhotoListAjax(index){
form.pageIndex.value = index;
var sendData = $(document.letterForm).serializeArray();
//하위 카테고리
$("#tDep2_depThrCateCode").load("/web/mjon/msgdata/selectCateConfThrDptListAjax.do", sendData ,function(response, status, xhr){
$("#tDep2_depThrCateCode").load("/web/mjon/msgcampain/selectCateConfThrDptListAjax.do", sendData ,function(response, status, xhr){
if(document.letterForm.searchKeyword.value == ''){
$('.bottom_content .area_total_count').hide();
}