diff --git a/src/main/java/com/wb/domainserver/domain/gcone/bbs/gnrlbbsctt/mapper/BOGnrlbbscttMapper.java b/src/main/java/com/wb/domainserver/domain/gcone/bbs/gnrlbbsctt/mapper/BOGnrlbbscttMapper.java index 3c874ce7..5b721716 100644 --- a/src/main/java/com/wb/domainserver/domain/gcone/bbs/gnrlbbsctt/mapper/BOGnrlbbscttMapper.java +++ b/src/main/java/com/wb/domainserver/domain/gcone/bbs/gnrlbbsctt/mapper/BOGnrlbbscttMapper.java @@ -81,6 +81,10 @@ public interface BOGnrlbbscttMapper { /*사용자 > 이용안내 조회*/ public List selectUseGuidanceCn(BOGnrlbbscttVO bbsctt); + /**********1:1문의**********/ + /*1:1문의 목록 조회*/ + public List selectBOM2mBbscttListInqire(BOGnrlbbscttVO bbsctt); + /******************* * 게시글 상세 조회 *******************/ diff --git a/src/main/java/com/wb/domainserver/domain/gcone/bbs/gnrlbbsctt/service/BOGnrlbbscttService.java b/src/main/java/com/wb/domainserver/domain/gcone/bbs/gnrlbbsctt/service/BOGnrlbbscttService.java index 90e3844e..7607b0af 100644 --- a/src/main/java/com/wb/domainserver/domain/gcone/bbs/gnrlbbsctt/service/BOGnrlbbscttService.java +++ b/src/main/java/com/wb/domainserver/domain/gcone/bbs/gnrlbbsctt/service/BOGnrlbbscttService.java @@ -32,6 +32,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; +import static java.lang.Integer.parseInt; + /** * 게시글 관리 Service * @@ -334,6 +336,14 @@ public class BOGnrlbbscttService { resultList = mapper.selectBOEvtBbscttListInqire(bbsctt); } break; + case "12": //1:1문의 + resultList = mapper.selectBOM2mBbscttListInqire(bbsctt); + if(resultList != null && resultList.size() !=0){ + resultCnt.setTotCnt(((BigInteger) resultList.get(0).get("totCnt")).intValue()); + }else{ + resultCnt.setTotCnt(0); + } + break; } /*비속어 필터*/ diff --git a/src/main/java/com/wb/domainserver/domain/mngr/bbs/gnrlsctt/controller/GnrlscttController.java b/src/main/java/com/wb/domainserver/domain/mngr/bbs/gnrlsctt/controller/GnrlscttController.java index 40bbab67..835c5cf0 100644 --- a/src/main/java/com/wb/domainserver/domain/mngr/bbs/gnrlsctt/controller/GnrlscttController.java +++ b/src/main/java/com/wb/domainserver/domain/mngr/bbs/gnrlsctt/controller/GnrlscttController.java @@ -303,6 +303,9 @@ public class GnrlscttController { case "11" : returnUrl = "mngr/bbs/gnrlsctt/EvtResultListR"; break; + case "12" : + returnUrl = "mngr/bbs/gnrlsctt/m2mQnaBbscttListR"; + break; } return returnUrl; } diff --git a/src/main/java/com/wb/domainserver/domain/mngr/bbs/rvw/controller/RvwController.java b/src/main/java/com/wb/domainserver/domain/mngr/bbs/rvw/controller/RvwController.java index 6d4f2765..e3926431 100644 --- a/src/main/java/com/wb/domainserver/domain/mngr/bbs/rvw/controller/RvwController.java +++ b/src/main/java/com/wb/domainserver/domain/mngr/bbs/rvw/controller/RvwController.java @@ -1,6 +1,8 @@ package com.wb.domainserver.domain.mngr.bbs.rvw.controller; import com.wb.domainserver.common.msg.GconeMessageSource; +import com.wb.domainserver.common.mvc.tags.ui.pagination.PaginationInfo; +import com.wb.domainserver.common.prop.PaginationProperties; import com.wb.domainserver.domain.gcone.bbs.bbs.service.BOBbsService; import com.wb.domainserver.domain.gcone.bbs.bbs.vo.BOBbsVO; import com.wb.domainserver.domain.gcone.bbs.gnrlbbsctt.service.BOGnrlbbscttService; @@ -84,6 +86,8 @@ public class RvwController { private BOMssageService boMssageService; @Autowired private BOOrdrService boOrdrService; + @Autowired + private PaginationProperties paginationProperties; /** * 게시글 목록 조회 팝업 (검색 section) @@ -177,67 +181,55 @@ public class RvwController { @RequestMapping(value = "/selectRvwListInqire") public String selectRvwListInqire(BOGnrlbbscttVO bbsctt, ModelMap model, @CookieValue(value = "authSopmalCd") String authSopmalCd) { bbsctt.setSopmalCd(authSopmalCd); - //게시글 노출 항목 설정값과 게시판 목록 조회 - Map content = new HashMap(); + AnonymousUser user = MemberJwtContextHolder.getMemberInfo(); - if ("01".equals(user.getSysDvCd())) { + + if ("01".equals(user.getSysDvCd())) {//사용자 조회 일 경우 bbsctt.setSopmalCd(user.getSopmalCd()); - bbsctt.setMbrDvCd(user.getMbrDvCd()); - bbsctt.setMbrInnb(user.getUserInnb()); } - if ("mpage".equals(bbsctt.getReqUrl()) || "crm".equals(bbsctt.getReqUrl())) { + + if (!"crm".equals(bbsctt.getReqUrl())) { if (user.getUserInnb() > 0) { bbsctt.setRegusr(user.getUserInnb()); - bbsctt.setRegusrDvCd("01"); + if ("sopmal".equals(bbsctt.getServerDv())) { + bbsctt.setRegusrDvCd("01"); + } else { + bbsctt.setRegusrDvCd("02"); + } } else { bbsctt.setRegusr(0); bbsctt.setRegusrDvCd("99"); } } + // pagination + PaginationInfo paginationInfo = new PaginationInfo(); + paginationInfo.setCurrentPageNo(bbsctt.getPageIndex()); + paginationInfo.setRecordCountPerPage(bbsctt.getPageUnit()); + paginationInfo.setPageSize(paginationProperties.getPageSize()); + + bbsctt.setPaginationInfo(paginationInfo); + bbsctt.setFirstIndex(paginationInfo.getFirstRecordIndex()); + bbsctt.setLastIndex(paginationInfo.getLastRecordIndex()); + bbsctt.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); + + // 게시글 목록조회 + Map resultList = new HashMap(); + resultList = service.selectBOBbscttListInqire(bbsctt); + + // 게시판 설정 정보 조회 BOBbsVO bbsVO = new BOBbsVO(); // bbsVO에 쇼핑몰코드, 해당 게시판 set bbsVO.setSopmalCd(bbsctt.getSopmalCd()); bbsVO.setBbsId(bbsctt.getBbsId()); bbsVO.setBbsTyCd(bbsctt.getBbsTyCd()); - // 게시판 설정 정보 조회 DataMap bbsInfo = new DataMap(); bbsInfo = bbsService.selectBOBbsSetupInfo(bbsVO); + DataMap content = new DataMap(); - //사용자에서 이벤트 폼 조회시 해당 쇼핑몰 이벤트 게시판 정보 조회(이벤트,당첨자발표 게시판) - List evtBbsList = new ArrayList<>(); - if ("sopmal".equals(bbsctt.getServerDv())) { - if ("03".equals((String) bbsInfo.get("bbsTyCd")) || "11".equals((String) bbsInfo.get("bbsTyCd"))) { - evtBbsList = bbsService.selectBOEvtBbsList(bbsVO); - content.put("evtBbsList", evtBbsList); - } - } - // 분류 조회 - List itmList = new ArrayList<>(); - itmList = service.selectBOBbscttItmInqire(bbsctt); - - // 게시판 목록 조회 및 게시글 개수 조회(관리자 페이지) - List bbsListCnt = new ArrayList<>(); - if (!"01".equals(user.getSysDvCd())) { - bbsListCnt = bbsService.selectBOBbsttListInqire(bbsVO); - content.put("bbsListCnt", bbsListCnt); - } - Map qesitmList = new HashMap(); - Map rvwQesitmList = new HashMap(); - //리뷰 목록 조회일 시 service 호출 - if ("rvw".equals(bbsctt.getRvwBbscttDv())) { - //추가항목 리스트, 추가항목 항목 리스트(리뷰) - qesitmList = service.selectBOBbscttRegistPopupForm(bbsctt); - //리뷰항목 리스트, 리뷰항목 항목 리스트 - rvwQesitmList = service.selectBOStarItm(bbsctt); - } content.put("bbsInfo", bbsInfo); - content.put("itmList", itmList); - if ("rvw".equals(bbsctt.getRvwBbscttDv())) { - content.put("qesitmList", qesitmList); - content.put("rvwQesitmList", rvwQesitmList); - } content.put("bbsctt", bbsctt); - + content.put("resultList", resultList); + content.put("paginationInfo", bbsctt.getPaginationInfo()); model.addAttribute("resultMap",content); // responseHandler.handleResponse( diff --git a/src/main/resources/mybatis/xml/mapper/gcone/bbs/gnrlbbsctt/BOGnrlbbscttMapper.xml b/src/main/resources/mybatis/xml/mapper/gcone/bbs/gnrlbbsctt/BOGnrlbbscttMapper.xml index add879bf..3ffb9ce7 100644 --- a/src/main/resources/mybatis/xml/mapper/gcone/bbs/gnrlbbsctt/BOGnrlbbscttMapper.xml +++ b/src/main/resources/mybatis/xml/mapper/gcone/bbs/gnrlbbsctt/BOGnrlbbscttMapper.xml @@ -1543,6 +1543,146 @@ ORDER BY -FB.SORT_ORDR DESC + +