diff --git a/src/main/java/kcc/com/usr/search/service/SearchTotalWebVO.java b/src/main/java/kcc/com/usr/search/service/SearchTotalWebVO.java index 79ea8761..07e61938 100644 --- a/src/main/java/kcc/com/usr/search/service/SearchTotalWebVO.java +++ b/src/main/java/kcc/com/usr/search/service/SearchTotalWebVO.java @@ -12,5 +12,16 @@ import lombok.Setter; @NoArgsConstructor public class SearchTotalWebVO extends ComDefaultVO implements Serializable { + private static final long serialVersionUID = 1L; + + private String totalSearchKeyword; + private String searchType; + private String cnt; + + private String subject; + private String regDate; + private String menuNm; + private String url; + } \ No newline at end of file diff --git a/src/main/java/kcc/com/usr/search/web/SearchTotalController.java b/src/main/java/kcc/com/usr/search/web/SearchTotalController.java index ccdff056..8433a53f 100644 --- a/src/main/java/kcc/com/usr/search/web/SearchTotalController.java +++ b/src/main/java/kcc/com/usr/search/web/SearchTotalController.java @@ -1,6 +1,7 @@ package kcc.com.usr.search.web; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -15,12 +16,17 @@ import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; +import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; +import kcc.com.cmm.CmmUtil; import kcc.com.cmm.EgovMessageSource; import kcc.com.usr.search.service.SearchTotalService; import kcc.com.usr.search.service.SearchTotalWebVO; +import kcc.xxx.service.XxxVO; import seed.com.gtm.board.CaseBoardService; import seed.com.gtm.exam.ExamBoardService; +import seed.com.gtm.faqbbs.faqBpardService; import seed.com.gtm.util.Criteria; +import seed.utils.SeedUtils; @Controller public class SearchTotalController { @@ -36,10 +42,13 @@ public class SearchTotalController { EgovMessageSource egovMessageSource; @Autowired - private CaseBoardService service3; + private faqBpardService service; @Autowired private ExamBoardService service2; + + @Autowired + private CaseBoardService service3; @RequestMapping(value = "/web/usr/search/totalSearch.do") public String totalSearch( @@ -52,6 +61,8 @@ public class SearchTotalController { //페이징 관련 paramMap.put("pageStart", cri.getPageStart()); paramMap.put("perPageNum", 5); + paramMap.put("PAGESTART", cri.getPageStart()); + paramMap.put("PERPAGENUM", 5); //검색 관련 paramMap.put("totalSearchKeyword", searchTotalWebVO.getTotalSearchKeyword()); @@ -63,7 +74,7 @@ public class SearchTotalController { * boardIdx = law * 분쟁조정 안내 > 자료실 * boardIdx = data - * 분쟁조정 안내 > 뉴스레터 자료 + * 뉴스레터 > 뉴스레터 자료 * boardIdx = news * */ @@ -100,16 +111,240 @@ public class SearchTotalController { model.addAttribute("examCnt", examList.get(0).get("CNT")); totalCnt = totalCnt + ((BigDecimal)examList.get(0).get("CNT")).intValue(); }else { - model.addAttribute("bbsCnt", "0"); + model.addAttribute("examCnt", "0"); } + /* + * 자주하는질문 > 조정신청 + * FAQ_SETIDX = 101 + * 자주하는질문 > 절차진행 + * FAQ_SETIDX = 102 + * 자주하는질문 > 절차종료 + * FAQ_SETIDX = 103 + */ + + //자주하는 질문 + List> faqList = service.boardListAllFaq(paramMap); + if(faqList != null && faqList.size() > 0) { + model.addAttribute("faqCnt", faqList.get(0).get("CNT")); + totalCnt = totalCnt + ((BigDecimal)faqList.get(0).get("CNT")).intValue(); + }else { + model.addAttribute("faqCnt", "0"); + } model.addAttribute("bbsList", bbsList); model.addAttribute("examList", examList); + model.addAttribute("faqList", faqList); model.addAttribute("totalCnt", totalCnt); return "web/search/totalSearch"; } + + @RequestMapping(value = "/web/usr/search/totalSearchDetail.do") + public String totalSearchDetail( + @ModelAttribute(name = "searchTotalWebVO") SearchTotalWebVO searchTotalWebVO + , ModelMap model + , Criteria cri + , @RequestParam Map paramMap + ) throws Exception { + + //페이징 관련 + paramMap.put("pageStart", (searchTotalWebVO.getPageIndex()-1)*10); + paramMap.put("perPageNum", searchTotalWebVO.getPageIndex()*10); + paramMap.put("PAGESTART", (searchTotalWebVO.getPageIndex()-1)*10); + paramMap.put("PERPAGENUM", searchTotalWebVO.getPageIndex()*10); + + //검색 관련 + paramMap.put("totalSearchKeyword", searchTotalWebVO.getTotalSearchKeyword()); + + Integer listCnt = 0; + + List list = listSet(searchTotalWebVO, paramMap); + + model.addAttribute("list", list); + if(list != null && list.size() > 0) { + model.addAttribute("listCnt", list.get(0).getCnt()); + }else { + model.addAttribute("listCnt", "0"); + } + + // 페이징 처리 객체 + PaginationInfo paginationInfo = CmmUtil.getPageing(searchTotalWebVO, searchTotalWebVO.getPageUnit()); + if(list != null && list.size() > 0) { + paginationInfo.setTotalRecordCount(Integer.valueOf(list.get(0).getCnt())); + }else { + paginationInfo.setTotalRecordCount(0); + } + + model.addAttribute("paginationInfo", paginationInfo); + + + return "web/search/totalSearchDetail"; + } + + + + private List listSet( + SearchTotalWebVO searchTotalWebVO + , Map paramMap + ) { + + List list = new ArrayList<>(); + + + + if("bbs".equals(searchTotalWebVO.getSearchType())) { + //자료실 + List> bbsList = service3.selectAll(paramMap); + + bbsList.stream().forEach( t -> + { + SearchTotalWebVO tmpVO = new SearchTotalWebVO(); + tmpVO.setSubject(t.get("BBS_TITLE").toString()); + + String menuNmBbs; + String urlBbs; + + switch (t.get("BBS_ID").toString()) { + case "form": + menuNmBbs = "분쟁조정관련 서식"; + urlBbs = "/web/user/board/case/form/145/formDetail.do"; + break; + + case "law": + menuNmBbs = "법령자료실"; + urlBbs = "/web/user/board/case/law/261/lawDetail.do"; + break; + + case "data": + menuNmBbs = "자료실"; + urlBbs = "/web/user/board/case/data/381/dataDetail.do"; + break; + + case "news": + menuNmBbs = "뉴스레터 자료"; + urlBbs = "/web/user/board/case/news/340/newsDetail.do"; + break; + + default: + menuNmBbs = ""; + urlBbs = ""; + break; + } + tmpVO.setMenuNm(menuNmBbs); + tmpVO.setUrl(urlBbs+"?bbsNo="+t.get("BBS_NO").toString()); + tmpVO.setRegDate(t.get("BBS_REG_DATE").toString()); + + list.add(tmpVO); + }); + + if(bbsList != null && bbsList.size() > 0) { + list.get(0).setCnt(bbsList.get(0).get("CNT").toString()); + } + }else if("exam".equals(searchTotalWebVO.getSearchType())) { + //조정사례 + List> examList = service2.boardListAll(paramMap); + + examList.stream().forEach( t -> + { + SearchTotalWebVO tmpVO = new SearchTotalWebVO(); + tmpVO.setSubject(t.get("EXAM_SUBJ").toString()); + + String menuNmExam; + String urlExam; + + switch (t.get("EXAM_ID").toString()) { + case "402": + menuNmExam = "공정거래"; + urlExam = "/web/user/exam/case/402/162/exam402Detail.do"; + break; + + case "403": + menuNmExam = "가맹사업거래"; + urlExam = "/web/user/exam/case/403/163/exam403Detail.do"; + break; + + case "404": + menuNmExam = "하도급거래"; + urlExam = "/web/user/exam/case/404/164/exam404Detail.do"; + break; + + case "405": + menuNmExam = "대규모유통업거래"; + urlExam = "/web/user/exam/case/405/165/exam405Detail.do"; + break; + + case "406": + menuNmExam = "불공정약관"; + urlExam = "/web/user/exam/case/406/166/exam406Detail.do"; + break; + + case "407": + menuNmExam = "대리점거래"; + urlExam = "/web/user/exam/case/407/167/exam407Detail.do"; + break; + + default: + menuNmExam = ""; + urlExam = ""; + break; + } + tmpVO.setMenuNm(menuNmExam); + tmpVO.setUrl(urlExam+"?examNo="+t.get("EXAM_NO").toString()); + tmpVO.setRegDate(t.get("EXAM_REGDATE").toString()); + + list.add(tmpVO); + }); + if(examList != null && examList.size() > 0) { + list.get(0).setCnt(examList.get(0).get("CNT").toString()); + } + }else { + //자주하는 질문 + List> faqList = service.boardListAllFaq(paramMap); + + faqList.stream().forEach( t -> + { + SearchTotalWebVO tmpVO = new SearchTotalWebVO(); + tmpVO.setSubject(t.get("FAQ_SUBJ").toString()); + + String menuNmFaq; + String urlFaq; + + switch (t.get("FAQ_SETIDX").toString()) { + case "101": + menuNmFaq = "조정신청"; + urlFaq = "/web/user/faqBbs/case/101/147/faq101Detail.do"; + break; + + case "102": + menuNmFaq = "절차진행"; + urlFaq = "/web/user/faqBbs/case/102/148/faq102Detail.do"; + break; + + case "103": + menuNmFaq = "절차종료"; + urlFaq = "/web/user/faqBbs/case/103/149/faq103Detail.do"; + break; + + default: + menuNmFaq = ""; + urlFaq = ""; + break; + } + tmpVO.setMenuNm(menuNmFaq); + tmpVO.setUrl(urlFaq+"?faqSeq="+t.get("FAQ_SEQ_NUMBER").toString()); + tmpVO.setRegDate(t.get("REG_DATE_FORMAT").toString()); + + list.add(tmpVO); + }); + + if(faqList != null && faqList.size() > 0) { + list.get(0).setCnt(faqList.get(0).get("CNT").toString()); + } + } + + return list; + } } \ No newline at end of file diff --git a/src/main/java/seed/com/gtm/faqbbs/faqBpardService.java b/src/main/java/seed/com/gtm/faqbbs/faqBpardService.java index b4c236fb..3dd850a5 100644 --- a/src/main/java/seed/com/gtm/faqbbs/faqBpardService.java +++ b/src/main/java/seed/com/gtm/faqbbs/faqBpardService.java @@ -48,4 +48,5 @@ public class faqBpardService { List> boardList = dao.boardListAllFaq(paramMap); return boardList; } + } diff --git a/src/main/java/seed/com/user/mypage/WebMyPageController.java b/src/main/java/seed/com/user/mypage/WebMyPageController.java index 0b9b1aff..d08893c1 100644 --- a/src/main/java/seed/com/user/mypage/WebMyPageController.java +++ b/src/main/java/seed/com/user/mypage/WebMyPageController.java @@ -123,12 +123,7 @@ private Logger log = Logger.getLogger(this.getClass()); } if(SeedUtils.setReplaceNull(session.getAttribute("myPass")).equals("")){ - //본인인증 값셋팅 컨트롤러를 다녀왔나 안다녀왔나 표시 session.setAttribute("myPass", "pass"); -// return new ModelAndView("forward:/user/case/userCheck/setCheckCode/check.do?" + -// "nextUrl=/user/mypage/"+siteIdx+"/01/"+siteMenuIdx+"/myCheck.do" + -// "&commandCode=my" -// ); FairnetUtils.certSet(map, req, session, "my"); } diff --git a/src/main/java/seed/utils/FairnetUtils.java b/src/main/java/seed/utils/FairnetUtils.java index 80b1d21e..4d02dfc3 100644 --- a/src/main/java/seed/utils/FairnetUtils.java +++ b/src/main/java/seed/utils/FairnetUtils.java @@ -118,208 +118,11 @@ public class FairnetUtils { public static void certSet(ModelMap map, HttpServletRequest req, HttpSession session,String commandCode ) { - String nextUrl = req.getParameter("nextUrl"); -// String commandCode = req.getParameter("commandCode"); + //실서버 + String hpSrvNo = CertGlobalSet.getHpSrvNo(); + String hpRetUrl = CertGlobalSet.getHpRetUrl() + "/web/user/siren/case/04/154/check.do";//모바일 인증후 리턴 페이지 - String srvNo = ""; - String hpSrvNo = ""; - String agreeCheck = ""; - String personalCheck = ""; - String mediType = ""; - String retUrl = "";//아이핀 인증후 리턴 페이지 - String hpRetUrl = "";//모바일 인증후 리턴 페이지 - - String sServerName = req.getServerName(); - - if(commandCode.equals("medi")){//분쟁조정신청 본인인증 - - //개발서버 -// srvNo = "007001";// 아이핀 코드 -// hpSrvNo = "008001";//휴대폰 코드 - - //실서버 - srvNo = "009001";// 아이핀 코드 - hpSrvNo = "012001";//휴대폰 코드 - - agreeCheck = req.getParameter("agreeCheck"); - personalCheck = req.getParameter("personalCheck"); - mediType = req.getParameter("mediType"); - -// retUrl = "23http://fairnet.kofair.or.kr/user/extra/case/siren/ipin_popup_seed/jsp/Page.do"; - retUrl = CertGlobalSet.getRetUrl() + "/user/extra/case/siren/ipin_popup_seed/jsp/Page.do"; - -// hpRetUrl = "32http://fairnet.kofair.or.kr/user/extra/case/siren/hpParamPop/jsp/Page.do"; - hpRetUrl = CertGlobalSet.getHpRetUrl() + "/user/extra/case/siren/hpParamPop/jsp/Page.do"; - - session.setAttribute("agreeCheck", agreeCheck); - session.setAttribute("personalCheck", personalCheck); - session.setAttribute("mediType", mediType); - //hpName존재하면 이미 본인인증을 거쳤기 때문에 다음으로 바로 넘어간다. - if(!SeedUtils.setReplaceNull(session.getAttribute("hpName")).equals("")){ -// nextUrl = "/user/mediation/case/05/154/mediationStep04Ftc.do"; - nextUrl = "/user/mediation/case/05/154/mediationStep04.do"; - } - }else if(commandCode.equals("my")){//마이페이지 본인인증 - //개발서버 -// srvNo = "007002"; -// hpSrvNo = "008002"; - - //실서버 - srvNo = "009002"; -// hpSrvNo = "012002"; - hpSrvNo = CertGlobalSet.getHpSrvNo(); - -// retUrl = "23http://fairnet.kofair.or.kr/user/extra/case/siren/myPage_ipin_popup_seed/jsp/Page.do"; - retUrl = CertGlobalSet.getRetUrl() + "/web/user/extra/case/siren/myPage_ipin_popup_seed/jsp/Page.do"; - -// hpRetUrl = "32http://fairnet.kofair.or.kr/user/extra/case/siren/myPage_hpParamPop/jsp/Page.do"; -// hpRetUrl = CertGlobalSet.getHpRetUrl() + "/web/user/extra/case/siren/myPage_hpParamPop/jsp/Page.do"; - hpRetUrl = CertGlobalSet.getHpRetUrl() + "/web/user/siren/case/04/154/check.do"; - - }else if(commandCode.equals("online")){//온라인 분쟁조정 상담 본인인증 - //개발서버 - srvNo = "007003"; - hpSrvNo = "008003"; - - //실서버 -// srvNo = "009003"; -// hpSrvNo = "012003"; - - personalCheck = req.getParameter("personalCheck"); - session.setAttribute("personalCheck", personalCheck); - -// retUrl = "23http://fairnet.kofair.or.kr/user/extra/case/siren/onlineCounsel_ipin_popup_seed/jsp/Page.do"; - retUrl = CertGlobalSet.getRetUrl() + "/user/extra/case/siren/onlineCounsel_ipin_popup_seed/jsp/Page.do"; - -// hpRetUrl = "32http://fairnet.kofair.or.kr/user/extra/case/siren/onlineCounsel_hpParamPop/jsp/Page.do"; - hpRetUrl = CertGlobalSet.getHpRetUrl() + "/user/extra/case/siren/onlineCounsel_hpParamPop/jsp/Page.do"; - - //hpName존재하면 이미 본인인증을 거쳤기 때문에 다음으로 바로 넘어간다. - if(!SeedUtils.setReplaceNull(session.getAttribute("hpName")).equals("")){ - nextUrl = "/user/onlineCounsel/case/01/158/write.do"; - } - }else if(commandCode.equals("law")){ - //개발서버 -// srvNo = "007004"; -// hpSrvNo = "008005"; - - //실서버 - srvNo = "009004"; - hpSrvNo = "012004"; - - personalCheck = req.getParameter("personalCheck"); - session.setAttribute("personalCheck", personalCheck); - -// retUrl = "23http://fairnet.kofair.or.kr/user/extra/case/siren/lawCounsel_ipin_popup_seed/jsp/Page.do"; - retUrl = CertGlobalSet.getRetUrl() + "/user/extra/case/siren/lawCounsel_ipin_popup_seed/jsp/Page.do"; - -// hpRetUrl = "32http://fairnet.kofair.or.kr/user/extra/case/siren/lawCounsel_hpParamPop/jsp/Page.do"; - hpRetUrl = CertGlobalSet.getHpRetUrl() + "/user/extra/case/siren/lawCounsel_hpParamPop/jsp/Page.do"; - - //hpName존재하면 이미 본인인증을 거쳤기 때문에 다음으로 바로 넘어간다. - if(!SeedUtils.setReplaceNull(session.getAttribute("hpName")).equals("")){ - nextUrl = "/user/lawCounsel/case/02/159/lawWrite.do"; - } - }else if(commandCode.equals("medi_check")){ - //개발서버 -// srvNo = "007005"; -// hpSrvNo = "008006"; - - //실서버 - srvNo = "009005"; - hpSrvNo = "012005"; - - String caseNo = req.getParameter("caseNo"); - String checkPass = req.getParameter("checkPass"); - - session.setAttribute("caseNo", caseNo); - session.setAttribute("checkPass", checkPass); - -// retUrl = "23http://fairnet.kofair.or.kr/user/extra/case/siren/checkMedi_ipin_popup_seed/jsp/Page.do"; - retUrl = CertGlobalSet.getRetUrl() + "/user/extra/case/siren/checkMedi_ipin_popup_seed/jsp/Page.do"; - -// hpRetUrl = "32http://fairnet.kofair.or.kr/user/extra/case/siren/checkMedi_hpParamPop/jsp/Page.do"; - hpRetUrl = CertGlobalSet.getHpRetUrl() + "/user/extra/case/siren/checkMedi_hpParamPop/jsp/Page.do"; - - //hpName존재하면 이미 본인인증을 거쳤기 때문에 다음으로 바로 넘어간다. - /* if(!SeedUtils.setReplaceNull(session.getAttribute("hpName")).equals("")){ - nextUrl = "/user/mediation/case/03/155/checkMediationStep03.do"; - }*/ - } - - //나중에 메인 페이지 나오면 튕겨내기 -// if(nextUrl == null || agreeCheck == null){ -// map.put("siteIdx", "case"); -// map.put("url", "/case/index.do"); -// map.put("message", "잘못된 접근 입니다."); -// map.put("opener", ""); -// map.put("append", ""); -// map.put("self", ""); -// -// return "/_commccon/jsp/umessage"; -// throw new RuntimeException("강제 예외 발생!"); -// } - - - /** - * 아이핀 인증 시작 */ - - //String sServerName = req.getServerName(); - - //회원사 ID : KFA001 - String id = "KFA001"; - //회원가입화면용 결과 수신 URL : 23http:/211.43.219.170/hp/meb/pinSignupView.do - //String retUrl = "23http://ServerName/user/extra/case/siren/ipin_popup_seed/jsp/Page.do"; - //retUrl = retUrl.replaceAll("ServerName", sServerName); - //분쟁조정신청 서비스 번호 : 006001 - // String srvNo = "006001"; - //요청번호(유닉크한 랜덤값) : 40 byte까지 - String reqNum = "kofair" + EgovStringUtil.getTimeStamp() + EgovNumberUtil.getRandomNum(1000, 9999); - - session.setAttribute("id", id); - session.setAttribute("retUrl", retUrl); - session.setAttribute("srvNo", srvNo); - session.setAttribute("reqNum", reqNum); - //복호화용 임시필드 - - String exVar = "0000000000000000"; - - /** - * - * reqNum 값은 최종 결과값 복호화를 위한 SecuKey로 활용 되므로 중요합니다. - * reqNum 은 아이핀 서비스 요청시 항상 새로운 값으로 중복 되지 않게 생성 해야 합니다. - * 쿠키 또는 Session및 기타 방법을 사용해서 reqNum 값을 - * ipin_result_seed.jsp에서 가져 올 수 있도록 해야 함. - * 샘플을 위해서 쿠키를 사용한 것이므로 참고 하시길 바랍니다. - * - */ - /* Cookie c = new Cookie("reqNum", reqNum); - //c.setMaxAge(1800); // <== 필요시 설정(초단위로 설정됩니다) - response.addCookie(c);*/ - - session.setAttribute("reqNumKey", reqNum); - - // 암호화 모듈 선언 - SciSecuManager seed = new SciSecuManager(); - // 1차 암호화 - String encStr = ""; - String reqInfo = reqNum + "/" + id + "/" + srvNo + "/" + exVar; - encStr = seed.getEncPublic(reqInfo); - // 위변조 검증 값 등록 - SciHmac hmac = new SciHmac(); - String hmacMsg = SciHmac.HMacEncriptPublic(encStr); - // 2차 암호화 - reqInfo = seed.getEncPublic(encStr + "/" + hmacMsg + "/" + "00000000"); - session.setAttribute("reqInfo", reqInfo); - - /** - * 아이핀 인증 끝 */ - - - /** - * 핸드폰 인증 시작 */ - - //날짜 생성 + //날짜 생성 Calendar today = Calendar.getInstance(); SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss"); String day = sdf.format(today.getTime()); @@ -334,37 +137,13 @@ public class FairnetUtils { randomStr += ran.nextInt(10); } - //reqNum은 최대 40byte 까지 사용 가능 - String hpId = "SKFA001"; // 본인실명확인 회원사 아이디 - //String hpSrvNo = "005001"; // 본인실명확인 서비스번호 String hpReqNum = day + randomStr; // 본인실명확인 요청번호 String hpExVar = "0000000000000000"; // 복호화용 임시필드 String hpCertDate = day; // 본인실명확인 요청시간 String hpCertGb = "H"; // 본인실명확인 본인확인 인증수단 String hpAddVar = ""; // 본인실명확인 추가 파라메터 - //String hpRetUrl = "32http://ServerName/kmcis/kmcisIdSearch.jsp"; // 본인인증서비스 결과수신 POPUP URL - //String hpRetUrl = "32http://ServerName/user/extra/case/siren/hpParamPop/jsp/Page.do"; - - //hpRetUrl = "32http://kofair2.global-it.co.kr/kmcis/kmcisIdSearch.jsp"; - //hpRetUrl = hpRetUrl.replaceAll("ServerName", sServerName); //오픈할 때 주석으로 교체해줘야함 - - - /** - * - * reqNum 값은 최종 결과값 복호화를 위한 SecuKey로 활용 되므로 중요합니다. - * reqNum 은 본인 확인 요청시 항상 새로운 값으로 중복 되지 않게 생성 해야 합니다. - * 쿠키 또는 Session및 기타 방법을 사용해서 reqNum 값을 - * pcc_V3_result_seed.jsp에서 가져 올 수 있도록 해야 함. - * 샘플을 위해서 쿠키를 사용한 것이므로 참고 하시길 바랍니다. - * - */ - /*Cookie hpC = new Cookie("hpReqNum", hpReqNum); - //c.setMaxAge(1800); // <== 필요시 설정(초단위로 설정됩니다) - response.addCookie(hpC);*/ - -// session.setAttribute("hpReqNumKey", hpReqNum); req.getSession().setAttribute("hpReqNumKey", hpReqNum); // 결과값 복호화시 필요 //01. 암호화 모듈 선언 @@ -382,8 +161,6 @@ public class FairnetUtils { //03. 2차 암호화 hpReqInfo = hpSeed.getEncPublic(hpEncStr + "^" + hpHmacMsg + "^" + "0000000000000000"); //2차암호화 -// session.setAttribute("hpRetUrl", hpRetUrl); -// session.setAttribute("hpReqInfo", hpReqInfo); req.getSession().setAttribute("hpRetUrl", hpRetUrl); req.getSession().setAttribute("hpReqInfo", hpReqInfo); diff --git a/src/main/resources/egovframework/sqlmap/config/mappers/faqBbs/faqbbs_sql.xml b/src/main/resources/egovframework/sqlmap/config/mappers/faqBbs/faqbbs_sql.xml index 0ac0d5e3..de77e28e 100644 --- a/src/main/resources/egovframework/sqlmap/config/mappers/faqBbs/faqbbs_sql.xml +++ b/src/main/resources/egovframework/sqlmap/config/mappers/faqBbs/faqbbs_sql.xml @@ -126,6 +126,7 @@ FROM ( SELECT + count(1) over() as cnt, FAQ_SEQ_NUMBER, FAQ_SETIDX, FAQ_SUBJ, @@ -135,6 +136,7 @@ REG_MBER_ID, REG_MBER_NM, REG_DATE, + TO_CHAR(REG_DATE, 'YYYY-MM-DD') AS REG_DATE_FORMAT, MOD_MBER_ID, MOD_DATE FROM @@ -144,6 +146,12 @@ OR FAQ_SETIDX = '102' OR FAQ_SETIDX = '103' ) AND DEL_YN = 'N' + + AND ( + FAQ_SUBJ like '%' || #{totalSearchKeyword} || '%' + OR FAQ_CONT like '%' || #{totalSearchKeyword} || '%' + ) + ORDER BY REG_DATE DESC ) ROW_ diff --git a/src/main/webapp/WEB-INF/jsp/_common/jsp/umessage.jsp b/src/main/webapp/WEB-INF/jsp/_common/jsp/umessage.jsp index b1883474..837a494a 100644 --- a/src/main/webapp/WEB-INF/jsp/_common/jsp/umessage.jsp +++ b/src/main/webapp/WEB-INF/jsp/_common/jsp/umessage.jsp @@ -51,13 +51,12 @@
-

본인인증을 진행해 주세요.

+

- diff --git a/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrRegist.jsp b/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrRegist.jsp index 77c11c0e..62f9e4c4 100644 --- a/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrRegist.jsp @@ -161,7 +161,7 @@ function fn_egov_inqire_BBSMngInqire() {
-

게시판생성

+

게시판1생성

@@ -178,11 +178,11 @@ function fn_egov_inqire_BBSMngInqire() {
-
+
- - + + @@ -211,13 +211,11 @@ function fn_egov_inqire_BBSMngInqire() { @@ -347,13 +345,9 @@ function fn_egov_inqire_BBSMngInqire() { -
-
-
-
- - -
+
+ +
diff --git a/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrUpdt.jsp b/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrUpdt.jsp index 3fb35c1d..5ad93552 100644 --- a/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrUpdt.jsp +++ b/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrUpdt.jsp @@ -257,7 +257,7 @@ $( document ).ready(function() {
-
+
게시판유형 -
    -
  • - - -
    • -
+
+ + +
@@ -275,13 +275,11 @@ $( document ).ready(function() { diff --git a/src/main/webapp/WEB-INF/jsp/manager/bbs/bbs/bbsDataEdit.jsp b/src/main/webapp/WEB-INF/jsp/manager/bbs/bbs/bbsDataEdit.jsp index 19b18adf..c7c371ab 100644 --- a/src/main/webapp/WEB-INF/jsp/manager/bbs/bbs/bbsDataEdit.jsp +++ b/src/main/webapp/WEB-INF/jsp/manager/bbs/bbs/bbsDataEdit.jsp @@ -77,7 +77,7 @@ - + <%--

@@ -123,7 +123,7 @@
- + --%> @@ -409,7 +409,7 @@ -
+ <%--
-
+
--%> @@ -634,7 +634,6 @@ - $.blockUI({ message : '

  

' }); }); diff --git a/src/main/webapp/WEB-INF/jsp/manager/bbs/bbs/bbsDataList.jsp b/src/main/webapp/WEB-INF/jsp/manager/bbs/bbs/bbsDataList.jsp index b9e103cb..f8468426 100644 --- a/src/main/webapp/WEB-INF/jsp/manager/bbs/bbs/bbsDataList.jsp +++ b/src/main/webapp/WEB-INF/jsp/manager/bbs/bbs/bbsDataList.jsp @@ -62,12 +62,12 @@ - + <%-- ~ - + --%> " class="sch-text"> @@ -87,6 +87,7 @@ + <%-- 241118 주석 - 운영에서 별도의 다른 게시판도 없으며 사용하지 않는 기능으로 판별
-<%-- --%> -
+ + --%> @@ -120,25 +121,26 @@
게시판유형 -
    -
  • - - -
    • -
+
+ + +
- + <%-- - + --%> - - + <%-- + --%> - + <%-- --%> + - - + <%-- + --%> @@ -173,7 +175,7 @@ - - + --%> + <%-- --%> @@ -200,7 +202,8 @@ - + <%-- --%> + - - + --%> + <%-- --%> @@ -264,10 +267,10 @@
" />" />번호
+ <%-- @@ -190,8 +192,8 @@ <s:message code=" /> - "> ">
@@ -231,7 +234,7 @@ + <%-- @@ -248,8 +251,8 @@ <s:message code=" /> - "> ">
-
+ <%--
-
+
--%>
@@ -313,8 +316,8 @@
- - + <%-- + --%> <%-- @@ -340,6 +343,13 @@

협의회별 상세 현황

-
+
diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp index ac0b6aa9..b4171de9 100644 --- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp @@ -61,15 +61,15 @@ }); } function searchTotalHeader(){ - $('#totalSearchKeyword').val($('#searchText').val()); - $('#searchForm').attr("action","/web/usr/search/totalSearch.do") - $('#searchForm').submit(); + $('#searchFormHeader #totalSearchKeyword').val($('#searchTextHeader').val()); + $('#searchFormHeader').attr("action","/web/usr/search/totalSearch.do") + $('#searchFormHeader').submit(); } - + @@ -86,7 +86,7 @@
- + diff --git a/src/main/webapp/WEB-INF/jsp/web/search/totalSearch.jsp b/src/main/webapp/WEB-INF/jsp/web/search/totalSearch.jsp index 75485e13..e2e490b5 100644 --- a/src/main/webapp/WEB-INF/jsp/web/search/totalSearch.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/search/totalSearch.jsp @@ -9,15 +9,23 @@ }); function searchTotal(){ - $('#totalSearchKeyword').val($('#searchText').val()); + $('#searchForm #totalSearchKeyword').val($('#searchText').val()); $('#searchForm').attr("action","/web/usr/search/totalSearch.do") $('#searchForm').submit(); } + + function searchDetail(type){ + $('#searchForm #totalSearchKeyword').val($('#searchText').val()); + $('#searchType').val(type); + $('#searchForm').attr("action","/web/usr/search/totalSearchDetail.do") + $('#searchForm').submit(); + }
+
@@ -33,7 +41,7 @@
- +

@@ -59,51 +67,58 @@

- +
@@ -120,44 +135,51 @@

- +
@@ -165,12 +187,59 @@
자주하는 질문 -

총 25건

+

+ 총 + + + + 건 +

- + + +
+ +
+
diff --git a/src/main/webapp/WEB-INF/jsp/web/search/totalSearchDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/search/totalSearchDetail.jsp new file mode 100644 index 00000000..0b182d93 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/search/totalSearchDetail.jsp @@ -0,0 +1,69 @@ +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> + + + + + + + + + + + + +
+ + +
    +
    • +
  • 통합검색
    • +
+ + +
+ +
+ + +
+ +

+ ''에 대한 통합검색 결과 총 건 입니다. +

+ +
+
+ 분쟁조정 사례 +

총 건

+
+ + + +
    + +
+
+
+
+ \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/web/user/bbs/bbs/bbsDataList.jsp b/src/main/webapp/WEB-INF/jsp/web/user/bbs/bbs/bbsDataList.jsp index 4e928690..39151906 100644 --- a/src/main/webapp/WEB-INF/jsp/web/user/bbs/bbs/bbsDataList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/user/bbs/bbs/bbsDataList.jsp @@ -461,14 +461,14 @@ - + <%-- - + --%>
activeHidden">