diff --git a/src/main/java/kcc/let/uat/uia/web/SocialCertController.java b/src/main/java/kcc/let/uat/uia/web/SocialCertController.java index 56113c18..d010a2a7 100644 --- a/src/main/java/kcc/let/uat/uia/web/SocialCertController.java +++ b/src/main/java/kcc/let/uat/uia/web/SocialCertController.java @@ -231,7 +231,7 @@ public class SocialCertController { returnData.put("msg", "인증되었습니다."); //세션 등록 - FairnetUtils.setCertSession(reqeust, nDecrypt(result.getReceiverName()), nDecrypt(result.getReceiverHP())); + FairnetUtils.setCertSession(reqeust, nDecrypt(result.getReceiverName()), nDecrypt(result.getReceiverHP()), ""); certVO.setPhone(nDecrypt(result.getReceiverHP())); certVO.setName(nDecrypt(result.getReceiverName())); @@ -302,7 +302,7 @@ public class SocialCertController { returnData.put("msg", "인증되었습니다."); //세션 등록 - FairnetUtils.setCertSession(reqeust, kDecrypt(result.getReceiverName()), kDecrypt(result.getReceiverHP())); + FairnetUtils.setCertSession(reqeust, kDecrypt(result.getReceiverName()), kDecrypt(result.getReceiverHP()), ""); certVO.setPhone(kDecrypt(result.getReceiverHP())); certVO.setName(kDecrypt(result.getReceiverName())); diff --git a/src/main/java/seed/com/user/check/WebUserCheckController.java b/src/main/java/seed/com/user/check/WebUserCheckController.java index f0a36ff8..c9c73983 100644 --- a/src/main/java/seed/com/user/check/WebUserCheckController.java +++ b/src/main/java/seed/com/user/check/WebUserCheckController.java @@ -419,7 +419,7 @@ public class WebUserCheckController { e.printStackTrace(); } - FairnetUtils.setCertSession(req, hpName, hpCellNo); + FairnetUtils.setCertSession(req, hpName, hpCellNo, hpDi); CertVO certVO = new CertVO(); certVO.setName(hpName); diff --git a/src/main/java/seed/com/user/mediation/WebMediationController.java b/src/main/java/seed/com/user/mediation/WebMediationController.java index f025d97c..dbb8ec49 100644 --- a/src/main/java/seed/com/user/mediation/WebMediationController.java +++ b/src/main/java/seed/com/user/mediation/WebMediationController.java @@ -2970,7 +2970,7 @@ public class WebMediationController { caseAuthVO.setCertId(certVO.getCertId()); //등록자 승인 완료 설정 - caseAuthVO.setCaseAuthType("REG"); + caseAuthVO.setCaseAuthType("reg"); caseAuthVO.setCaseAuthYn("Y"); caseAuthService.insertCaseAuth(caseAuthVO); diff --git a/src/main/java/seed/com/user/mypage/WebMyPageController.java b/src/main/java/seed/com/user/mypage/WebMyPageController.java index 57661921..569e527a 100644 --- a/src/main/java/seed/com/user/mypage/WebMyPageController.java +++ b/src/main/java/seed/com/user/mypage/WebMyPageController.java @@ -461,6 +461,7 @@ private Logger log = Logger.getLogger(this.getClass()); //페이지용 추가 1 try { paramMap.put("hpDi", session.getAttribute("hpDi")); + paramMap.put("certDi", session.getAttribute("certDi")); }catch(Exception ex) { paramMap.put("hpDi", "hpDi"); ex.printStackTrace(); @@ -480,8 +481,8 @@ private Logger log = Logger.getLogger(this.getClass()); PageMaker pageMaker = new PageMaker(); pageMaker.setCri(cri); + //2025년 1월 1일 데이터부터 조회 pageMaker.setTotalCount(service.myPageListCnt(paramMap)); - map.put("myPageList", service.myPageList(paramMap)); map.put("pageMaker", pageMaker); }catch(Exception ex) { @@ -503,6 +504,236 @@ private Logger log = Logger.getLogger(this.getClass()); return new ModelAndView("/_extra/web/user/myPage/myMediationList"); } + // /user/mypage/case/01/169/myMediationList.do + @RequestMapping("/web/user/mypage/{siteIdx}/01/{siteMenuIdx}/myPastMediationList.do") + public ModelAndView myPastMediationList(ModelMap map, HttpSession session, HttpServletRequest req, @RequestParam Map paramMap, Criteria cri, + @PathVariable(value="siteIdx") String siteIdx, + @PathVariable(value="siteMenuIdx") Integer siteMenuIdx + ){ + + /* + if(SeedUtils.setReplaceNull(session.getAttribute("hpName")).equals("")){ + map.put("siteIdx", "case"); + map.put("url", "/web/user/mypage/case/01/168/myCheck.do"); + map.put("message", "common.message.my.check"); + map.put("opener", ""); + map.put("append", ""); + map.put("self", ""); + + return new ModelAndView("/_common/jsp/umessage"); + } + */ + + // CI 체크 + if(!FairnetUtils.ciCheck(map, session)) { + return new ModelAndView("/_common/jsp/umessage"); + } + + System.out.println("1"); + + boolean b_ret_u = true; + map = FairnetUtils.myCheck(map, session); + b_ret_u = (boolean)map.get("b_ret"); + + if (!b_ret_u) { + return new ModelAndView("/_common/jsp/umessage"); + } + + setSessionMessageRemove(session); + + /*----권한체크----*/ + Integer memberIdx = Integer.valueOf(SeedUtils.setReplaceNull(session.getAttribute("memberIdx"),"0")); + String memberGrant = (memberIdx == 0) ? "N" : SeedUtils.setReplaceNull(managerMemberService.getMemberMapForm(memberIdx, new String[] {"memberGrant"}).get("_memberGrant"), "N"); + boolean memberAuthM = managerSiteManagerService.getSiteManagerListCnt(siteIdx, memberIdx); + boolean memberAuth = managerSiteMenuManagerService.getSiteMenuManagerListCnt(siteMenuIdx, memberIdx); + + System.out.println("12"); + + //메뉴 권한설정 + /* + if(!memberGrant.equals("S") && !memberAuthM && !memberAuth && + !managerSiteMenuAuthService.getSiteMenuAuthChk(siteMenuIdx, memberIdx)){ + + map.put("message", "common.message.no.grant"); + + if(memberIdx.equals(0)){ + map.put("url", "/"+siteIdx+"/index.do"); + }else{ + map.put("self", "history"); + } + + return new ModelAndView("/_common/jsp/umessage"); + } + */ + + boolean b_ret = true; + b_ret = FairnetUtils.hasUserAuth(memberIdx, memberGrant, memberAuth, session, map); + + if (!b_ret) { + return new ModelAndView("/_common/jsp/message"); + } + + + Map tSiteMenuDB = managerSiteMenuService.getSiteMenuMapForm(siteMenuIdx, + new String[] {"siteMenuName", "siteMenuParentTitle", "siteMenuStatus", "siteMenuType", "siteMenuLinkUrl", "siteMenuCharge", "siteMenuCharge", "siteMenuSNS", + "siteMenuTitle", "siteMenuRegDate", "siteMenuModDate", "siteMenuNameType", "siteMenuIdxs", "siteMenuDepth", "siteMenuSatisfaction", "siteMenuIdx1", + "tSite.siteActiveMenuWidth", "tSite.siteService", "tSite.siteServiceSdate", "tSite.siteServiceSdate"}); + + System.out.println("13"); + + /* + if(!memberGrant.equals("S") && !memberAuthM && !memberAuth){ + if(!SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuStatus")).equals("U")){ + map.put("message", "common.message.no.siteMenu"); + map.put("self", "history"); + return new ModelAndView("/_common/jsp/umessage"); + } + } + */ + + if(SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteService")).equals("Y")){ + + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); + + try{ + + Date getDate = new Date(); + + Date sDate = formatter.parse(SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteServiceSdate"))); + Date eDate = formatter.parse(SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteServiceEdate"))); + + if((sDate.compareTo(formatter.parse(formatter.format(getDate))) > 0 && eDate.compareTo(formatter.parse(formatter.format(getDate))) > 0) || + (sDate.compareTo(formatter.parse(formatter.format(getDate))) < 0 && eDate.compareTo(formatter.parse(formatter.format(getDate))) < 0)){ + return new ModelAndView("redirect:/user/common/service/"+siteIdx+".do"); + } + + }catch(ParseException e){ + log.error("CHECK ERROR:",e); + } + } + + System.out.println("14"); + + if(SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuType")).equals("F") || + SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuType")).equals("L")){ + return new ModelAndView("redirect:"+SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuLinkUrl"))); + } + + String siteMenuManager = "N"; + StringBuffer siteMenuManagerIdx = new StringBuffer(); + String siteMenuCharge = SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuCharge"), "N"); + + List> siteMenuManagerList = + managerSiteMenuManagerService.getSiteMenuManagerMapList(siteMenuIdx, new String[] {"siteMenuManagerStatus", "tMember.memberIdx"}); + + System.out.println("15"); + + for(int i=0; i tSiteMenuManagerDB = siteMenuManagerList.get(i); + + if(SeedUtils.setReplaceNull(tSiteMenuManagerDB.get("_siteMenuManagerStatus")).equals("U")){ + + if(!memberIdx.equals(0) && + memberIdx.equals(Integer.parseInt(SeedUtils.setReplaceNull(tSiteMenuManagerDB.get("_memberIdx"), "0"))) && + siteMenuManager.equals("N")){ + siteMenuManager = "Y"; + } + siteMenuManagerIdx.append(SeedUtils.setReplaceNull(tSiteMenuManagerDB.get("_memberIdx")).toString()); + siteMenuManagerIdx.append(","); + } + } + + if(memberGrant.equals("S") || memberAuthM){ + siteMenuManager = "Y"; + } + + System.out.println("16"); + + //편집 권한 + map.put("siteMenuManager", siteMenuManager); + //담당자 보기 설정 + map.put("siteMenuCharge", siteMenuCharge); + //담당자 이름 + map.put("siteMenuManagerIdx", siteMenuManagerIdx.toString()); + //만족도 설정 + map.put("siteMenuSatisfaction", SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuSatisfaction"), "N")); + + map.put("siteMenuSubTitle", managerSiteMenuService.getSiteMenuSubTitleForm(siteIdx, SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuIdx1")))); + + String siteMenuTitle = managerSiteMenuService.getSiteMenuParentName(siteIdx, SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuIdxs")), "edit").replaceAll("》", "|") + + " | " + SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuName")); + + map.put("siteMenuTitle", siteMenuTitle); + + System.out.println("157"); + + //부모메뉴 타이틀 설정한 경우 해당 글의 부모 타이틀을 가져옴 + if(SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuParentTitle") ,"N").equals("Y")){ + String[] siteMenuTitles = siteMenuTitle.split("\\|"); + tSiteMenuDB.put("_siteMenuName", siteMenuTitles[Integer.parseInt(tSiteMenuDB.get("_siteMenuDepth").toString())-1]); + } + + map.put("tSiteMenuDB", tSiteMenuDB); + + map.put("memberAuthM", memberAuthM); + map.put("seedMenuAuth", managerGroupService.getGroupList(siteIdx, memberIdx, memberMerge, memberMergeSiteIdx)); + /*----권한체크 종료----*/ + + System.out.println("158"); + + //여기서부터 작업할거 + //페이징 관련 + paramMap.put("pageStart", cri.getPageStart()); + paramMap.put("perPageNum", cri.getPerPageNum()); + + //페이지용 추가 1 + try { + paramMap.put("hpDi", session.getAttribute("hpDi")); + paramMap.put("certDi", session.getAttribute("certDi")); + }catch(Exception ex) { + paramMap.put("hpDi", "hpDi"); + ex.printStackTrace(); + } + + //사건권한 설정 + try { + CertVO certVO = certService.selectCert(FairnetUtils.getCertSession(req)); + paramMap.put("certName", certVO.getName()); + paramMap.put("certPhone", certVO.getPhone()); + }catch(Exception ex) { + ex.printStackTrace(); + } + + //페이지용 추가 2 + try { + PageMaker pageMaker = new PageMaker(); + pageMaker.setCri(cri); + + //2025년 1월 1일 이전 데이터 조회 + paramMap.put("viewPoint", "past"); + pageMaker.setTotalCount(service.myPageListCnt(paramMap)); + map.put("myPageList", service.myPageList(paramMap)); + map.put("pageMaker", pageMaker); + }catch(Exception ex) { + ex.printStackTrace(); + } + + System.out.println("159"); + + System.out.println(paramMap); + System.out.println("160"); + System.out.println(map); + + System.out.println("161"); + + if ("temp".equals((String)paramMap.get("command"))) { + return new ModelAndView("/_extra/web/user/myPage/myMediationTempList"); + } + + return new ModelAndView("/_extra/web/user/myPage/myPastMediationList"); + } + // /user/mypage/case/01/169/myMediationView.do @RequestMapping("/web/user/mypage/{siteIdx}/01/{siteMenuIdx}/myMediationDetail.do") public ModelAndView myMediationView(ModelMap map, HttpSession session, HttpServletRequest req, @RequestParam Map paramMap, @@ -659,8 +890,17 @@ private Logger log = Logger.getLogger(this.getClass()); CaseAuthVO caseAuthVO = new CaseAuthVO(); caseAuthVO.setCertId(certVO.getCertId()); caseAuthVO.setRceptNo(SeedUtils.setReplaceNull(paramMap.get("rceptNo"))); + + //등록자 이전사건조회에서 상세 넘어갈 시 권한 등록하기 + caseAuthVO.setCaseAuthType("reg"); + caseAuthVO.setCaseAuthYn("N"); + caseAuthService.insertCaseAuth(caseAuthVO); + caseAuthVO = caseAuthService.selectCaseAuthExist(caseAuthVO); map.put("caseAuthVO", caseAuthVO);//구분 + + + } }catch(Exception e) { e.printStackTrace(); @@ -1082,6 +1322,7 @@ private Logger log = Logger.getLogger(this.getClass()); req.getSession().removeAttribute("certNm"); req.getSession().removeAttribute("certHpNo"); + req.getSession().removeAttribute("certDi"); return "redirect:/"; } diff --git a/src/main/java/seed/utils/FairnetUtils.java b/src/main/java/seed/utils/FairnetUtils.java index 796a0ac1..3a922466 100644 --- a/src/main/java/seed/utils/FairnetUtils.java +++ b/src/main/java/seed/utils/FairnetUtils.java @@ -251,10 +251,14 @@ public class FairnetUtils { HttpServletRequest reqeust , String certNm , String certHpNo + , String certDi ) { HttpSession session = reqeust.getSession(); session.setAttribute("certNm", certNm); session.setAttribute("certHpNo", certHpNo); + if(!"".equals(certDi)) { + session.setAttribute("certDi", certDi); + } session.setMaxInactiveInterval(60*60*2); } diff --git a/src/main/resources/egovframework/sqlmap/config/mappers/mypage/mypage_sql.xml b/src/main/resources/egovframework/sqlmap/config/mappers/mypage/mypage_sql.xml index 677b6429..bb7ae257 100644 --- a/src/main/resources/egovframework/sqlmap/config/mappers/mypage/mypage_sql.xml +++ b/src/main/resources/egovframework/sqlmap/config/mappers/mypage/mypage_sql.xml @@ -69,15 +69,18 @@ WHERE UCA.RCEPT_NO = RCEPT_NO AND UC.CERT_NAME = #{certName} AND UC.CERT_PHONE = #{certPhone} - AND UCA.CASE_AUTH_YN = 'Y' ) - OR APPLCNT_DI = #{hpDi} + OR APPLCNT_DI = #{certDi} ) AND DEL_GUBUN = 'N' AND REQUEST_CHECK = '1601000000' AND REQUEST_CHECK = '1602000000' + + AND TO_DATE('2025-01-01', 'YYYY-MM-DD') > CASE_DATE + AND CASE_DATE >= TO_DATE('2025-01-01', 'YYYY-MM-DD') + ORDER BY RCEPT_NO DESC ) ROW_ ) @@ -97,15 +100,18 @@ WHERE UCA.RCEPT_NO = RCEPT_NO AND UC.CERT_NAME = #{certName} AND UC.CERT_PHONE = #{certPhone} - AND UCA.CASE_AUTH_YN = 'Y' ) - OR APPLCNT_DI = #{hpDi} + OR APPLCNT_DI = #{certDi} ) AND DEL_GUBUN = 'N' AND REQUEST_CHECK = '1601000000' AND REQUEST_CHECK = '1602000000' + + AND TO_DATE('2025-01-01', 'YYYY-MM-DD') > CASE_DATE + AND CASE_DATE >= TO_DATE('2025-01-01', 'YYYY-MM-DD') + diff --git a/src/main/webapp/WEB-INF/jsp/_extra/web/user/myPage/myMediationView.jsp b/src/main/webapp/WEB-INF/jsp/_extra/web/user/myPage/myMediationView.jsp index 568748e6..ff3b9205 100644 --- a/src/main/webapp/WEB-INF/jsp/_extra/web/user/myPage/myMediationView.jsp +++ b/src/main/webapp/WEB-INF/jsp/_extra/web/user/myPage/myMediationView.jsp @@ -30,8 +30,12 @@ } function goList(){ - - location.href="/web/user/mypage/case/01/169/myMediationList.do?page=1"; + var viewPoint = '${param.viewPoint}'; + if(viewPoint == 'past'){ + location.href="/web/user/mypage/case/01/169/myPastMediationList.do?page=1"; + }else{ + location.href="/web/user/mypage/case/01/169/myMediationList.do?page=1"; + } } diff --git a/src/main/webapp/WEB-INF/jsp/_extra/web/user/myPage/myPastMediationList.jsp b/src/main/webapp/WEB-INF/jsp/_extra/web/user/myPage/myPastMediationList.jsp new file mode 100644 index 00000000..7aff5716 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/_extra/web/user/myPage/myPastMediationList.jsp @@ -0,0 +1,131 @@ +<%@ page language='java' contentType='text/html; charset=UTF-8'%> +<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c' %> +<%@ taglib uri='http://www.springframework.org/tags/form' prefix='form'%> + + + + + + + + + + + + + + + + + + + + + + +
+ + +
    +
    • +
  • 마이페이지
    • +
  • 이전사건조회
    • +
+ + +

이전사건조회

+ +
    +
+ +
+ +
+

전체 건 (1/1페이지)

+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
상태문서 등록번호신청인피신청인사건번호담당자신청일
${list.STATE}문서 등록번호 : ${list.RCEPT_NO }${list.APPLCNT_NM}${list.RESPONDENT_CEO } 외${list.RES_CNT-1 }명${list.CASE_NO}${list.EXAMINER_ASSIGN_NAME}${list.REG_DT}
등록된 데이터가 없습니다.
+
+

※ 사건접수 완료 후 진행상황은 홈페이지 메뉴 분쟁조정 사건조회에서 조회가 가능합니다.

+ +
+ + +
+ diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/fileAtchPop.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/fileAtchPop.jsp index 4c43edef..5168e74f 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/fileAtchPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/fileAtchPop.jsp @@ -335,7 +335,7 @@ function fn_gwGo(fileKey){ - +
diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp index 24551442..6392c5f0 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp @@ -3347,10 +3347,10 @@ function atendReqPopOpen(caseNo){ window.open(popUrl, "", popOption); } -function fileFirstPopOpen(p_caseNo, p_rceptNo, p_fileFuncType, p_approKey, fileGubun){ +function fileFirstPopOpen(p_caseNo, p_rceptNo, p_gwId, p_fileFuncType, p_approKey, fileGubun){ //alert('작업중') //return; - var popUrl = "/gtm/case/trublprocessmng/fileAtchPop/jsp/Page.do?caseNo="+p_caseNo+ "&rceptNo=" + p_rceptNo +"&fileFuncType="+p_fileFuncType+"&approKey="+p_approKey+"&fileGubun="+fileGubun; + var popUrl = "/gtm/case/trublprocessmng/fileAtchPop/jsp/Page.do?caseNo="+p_caseNo+ "&rceptNo=" + p_rceptNo + "&loginId=" + p_gwId + "&fileFuncType="+p_fileFuncType+"&approKey="+p_approKey+"&fileGubun="+fileGubun; var popOption = "width=1024, height=750, resizable=no, scrollbars=no, status=no;"; window.open(popUrl, "", popOption); } @@ -3772,17 +3772,17 @@ function nanumApi(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4, if (jobID=='1-1'||jobID=='2-1' ||jobID=='3-1'||jobID=='4-1' ||jobID=='5-1'||jobID=='6-1'){ - fileFirstPopOpen($("#caseNo").val(), $("#rceptNo").val(),'x-1',r.data2.docId, '4840000000'); + fileFirstPopOpen($("#caseNo").val(), $("#rceptNo").val(), r.gwId, 'x-1',r.data2.docId, '4840000000'); }else if(jobID=='1-11'||jobID=='2-11' ||jobID=='3-11'||jobID=='4-11' ||jobID=='5-11'||jobID=='6-11'){ - fileFirstPopOpen($("#caseNo").val(), $("#rceptNo").val(),'x-2',r.data2.docId, '4841000000'); + fileFirstPopOpen($("#caseNo").val(), $("#rceptNo").val(), r.gwId, 'x-2',r.data2.docId, '4841000000'); }else if(jobID=='1-12'||jobID=='2-12' ||jobID=='3-12'||jobID=='4-12' ||jobID=='5-12'||jobID=='6-12'){ - fileFirstPopOpen($("#caseNo").val(), $("#rceptNo").val(),'x-3',r.data2.docId, '4842000000'); + fileFirstPopOpen($("#caseNo").val(), $("#rceptNo").val(), r.gwId, 'x-3',r.data2.docId, '4842000000'); }else{ var f = document.nanumViewFrm;