From 53a984a7407429744d7cee85026df5ac1908bc92 Mon Sep 17 00:00:00 2001 From: tolag3 Date: Thu, 12 Dec 2024 15:49:49 +0900 Subject: [PATCH] Merge branch 'tolag3' --- .../kcc/com/cmm/web/EgovComUtlController.java | 5 +- .../kcc/let/main/web/EgovMainController.java | 87 ++++++++++++++++++- .../seed/com/gtm/base/BaseController.java | 7 +- .../mediation/WebMediationController.java | 23 ++++- .../com/user/mypage/WebMyPageController.java | 14 +++ .../user/mediation/checkMediationStep03.jsp | 12 ++- .../WEB-INF/jsp/main/inc/EgovIncLeftmenu.jsp | 17 ++-- 7 files changed, 148 insertions(+), 17 deletions(-) diff --git a/src/main/java/kcc/com/cmm/web/EgovComUtlController.java b/src/main/java/kcc/com/cmm/web/EgovComUtlController.java index 1ce2b65c..4af3a99f 100644 --- a/src/main/java/kcc/com/cmm/web/EgovComUtlController.java +++ b/src/main/java/kcc/com/cmm/web/EgovComUtlController.java @@ -102,7 +102,7 @@ public class EgovComUtlController { */ @RequestMapping(value = "/EgovTopPageLink.do") public String EgovTopPageLink(@RequestParam("link") String linkPage , @RequestParam("baseMenuNo") String baseMenuNo , - ModelMap model, RedirectAttributes redirectAttributes, HttpServletRequest req) + ModelMap model, RedirectAttributes redirectAttributes, HttpServletRequest req, HttpSession session) throws Exception{ String link = linkPage; // service 사용하여 리턴할 결과값 처리하는 부분은 생략하고 단순 페이지 링크만 처리함 @@ -112,6 +112,9 @@ public class EgovComUtlController { //linkPage = linkPage+"?baseMenuNo=" + baseMenuNo ; redirectAttributes.addFlashAttribute("baseMenuNo", baseMenuNo); //파라미터숨기기 + req.setAttribute("baseMenuNo", baseMenuNo); + session.setAttribute("baseMenuNo", (String)req.getAttribute("baseMenuNo")); + RedirectUrlMaker redirectUrlMaker = new RedirectUrlMaker(link); return redirectUrlMaker.getRedirectUrl(); diff --git a/src/main/java/kcc/let/main/web/EgovMainController.java b/src/main/java/kcc/let/main/web/EgovMainController.java index 152fd34b..bf12c845 100644 --- a/src/main/java/kcc/let/main/web/EgovMainController.java +++ b/src/main/java/kcc/let/main/web/EgovMainController.java @@ -10,6 +10,7 @@ import java.lang.management.ThreadMXBean; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; @@ -21,6 +22,7 @@ import javax.servlet.http.HttpSession; import org.json.simple.JSONArray; import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.ModelAttribute; @@ -61,6 +63,9 @@ import kcc.let.sym.site.service.EgovSiteManagerService; import kcc.let.uss.olp.qmc.service.EgovQustnrManageService; import kcc.let.uss.umt.service.EgovUserManageService; import seed.com.gtm.join.MemberJoinService; +import seed.com.gtm.service.BaseService; +import seed.com.gtm.team.TeamBoardService; +import seed.com.gtm.util.JSPUtil; /** * 템플릿 메인 페이지 컨트롤러 클래스(Sample 소스) @@ -131,6 +136,12 @@ public class EgovMainController { @Resource(name = "memberJoinService") private MemberJoinService memberJoinService; + @Autowired + private BaseService bservice; + + @Autowired + private TeamBoardService boardService; + /** * 메인 페이지에서 각 업무 화면으로 연계하는 기능을 제공한다. @@ -159,6 +170,15 @@ public class EgovMainController { public String selectGetMgtMainPage(HttpServletRequest request, ModelMap model, HttpSession session) throws Exception{ // LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser(); + //최근접수사건 + model.addAttribute("rceptList", rceptList(request, session)); + + //진행 중 사건목록 + model.addAttribute("caseList", caseList(request, session)); + + //진행 중 사건목록 + model.addAttribute("boardList", boardList(session)); + return "main/EgovMainView"; @@ -264,7 +284,8 @@ public class EgovMainController { public String selectMainMenuLeft( @RequestParam Map commandMap, @ModelAttribute("menuManageVO") MenuManageVO menuManageVO, - ModelMap model) + ModelMap model + ,HttpServletRequest req) throws Exception { LoginVO user = @@ -284,6 +305,8 @@ public class EgovMainController { model.addAttribute("list_headmenu", list_headmenu); model.addAttribute("list_menulist", list_menulist); + + model.addAttribute("requestURI", req.getRequestURI()); } return "main/inc/EgovIncLeftmenu"; } @@ -670,4 +693,66 @@ public class EgovMainController { System.out.println( "CPU Usage: " + usage ); } + //메인 페이지 - 최근접수사건 + private List rceptList( + HttpServletRequest request + , HttpSession session + ){ + EgovMap params; + params = JSPUtil.makeRequestParams(request, session, true); + params.put("pageStart", 0); + params.put("perPageNum", 5); + params.put("searchMa", "N"); + params.put("sql", "trublreqstmngAdministPagingList"); + + return JSPUtil.fixNull(bservice.list(params)); + } + + //진행 중 사건목록 + private List caseList( + HttpServletRequest request + , HttpSession session + ){ + EgovMap params; + params = JSPUtil.makeRequestParams(request, session, true); + params.put("pageStart", 0); + params.put("perPageNum", 5); + params.put("sql", "trublprocessmngTrublprocessmngPagingList"); + + return JSPUtil.fixNull(bservice.list(params)); + } + + //진행 중 사건목록 + private List boardList( + HttpSession session + ){ + + Map paramMap = new HashMap(); + + //페이징 관련 + paramMap.put("pageStart", 0); + paramMap.put("perPageNum", 5); + paramMap.put("memberDept", session.getAttribute("memberDept")); + List> bbsList = boardService.boardList(paramMap); + + return bbsList; + } + + //분쟁조정협의회(예정) 목록 + private List trublcfrncmngList( + HttpServletRequest request + , HttpSession session + ){ + EgovMap params; + params = JSPUtil.makeRequestParams(request, session, true); + params.put("pageStart", 0); + params.put("perPageNum", 5); + params.put("sql", "trublcfrncmngTrublcfrncmngPagingList"); + + return JSPUtil.fixNull(bservice.list(params)); + } + + + + } \ No newline at end of file diff --git a/src/main/java/seed/com/gtm/base/BaseController.java b/src/main/java/seed/com/gtm/base/BaseController.java index 21e1ce5a..188f3f42 100644 --- a/src/main/java/seed/com/gtm/base/BaseController.java +++ b/src/main/java/seed/com/gtm/base/BaseController.java @@ -317,9 +317,10 @@ public class BaseController { } //사건 승인권한 조회 - /*20241210 주석 - 운영소스에 없음*/ - /*params.put("sql", pageFolder+".selectCaseAuth"); - params.put("selectCaseAuthData", JSPUtil.fixNull(bservice.list(params)));*/ + if("trublprocessmng".equals(pageFolder)) { + params.put("sql", pageFolder+".selectCaseAuth"); + params.put("selectCaseAuthData", JSPUtil.fixNull(bservice.list(params))); + } } diff --git a/src/main/java/seed/com/user/mediation/WebMediationController.java b/src/main/java/seed/com/user/mediation/WebMediationController.java index ca5544eb..ebaf9668 100644 --- a/src/main/java/seed/com/user/mediation/WebMediationController.java +++ b/src/main/java/seed/com/user/mediation/WebMediationController.java @@ -4338,6 +4338,7 @@ public class WebMediationController { caseAuthVO.setCaseAuthYn("N"); caseAuthService.insertCaseAuth(caseAuthVO); + }catch(Exception e) { status = false; } @@ -4350,6 +4351,7 @@ public class WebMediationController { map.put("self", ""); return new ModelAndView("/_common/jsp/umessage"); } + session.setAttribute("caseNo", SeedUtils.setReplaceNull(paramMap.get("caseNo"))); return new ModelAndView("redirect:/web/user/mediation/case/03/155/checkMediationStep03.do"); @@ -4359,7 +4361,8 @@ public class WebMediationController { @RequestMapping("/web/user/mediation/{siteIdx}/03/{siteMenuIdx}/checkMediationStep03.do") public ModelAndView checkMediationStep03(ModelMap map, HttpSession session, @RequestParam Map paramMap, @PathVariable(value="siteIdx") String siteIdx, - @PathVariable(value="siteMenuIdx") Integer siteMenuIdx){ + @PathVariable(value="siteMenuIdx") Integer siteMenuIdx + , HttpServletRequest request){ String isGubun = SeedUtils.setReplaceNull(session.getAttribute("isGubun")); @@ -4510,6 +4513,24 @@ public class WebMediationController { map.put("selectRceptsttus", service.selectCaseRceptsttus(paramMap));//사건현황 map.put("selectRceptsttus", service.selectCaseSubcntrsttusA(paramMap));//사건현황 */ + + // CI 체크 + if(!FairnetUtils.ciCheck(map, session)) { + return new ModelAndView("/_common/jsp/umessage"); + } + + try { + CaseAuthVO caseAuthVO = new CaseAuthVO(); + //rceptNo구하기 + caseAuthVO.setRceptNo(SeedUtils.setReplaceNull(masterData.get("RCEPT_NO"))); + //certId 구하기 + CertVO certVO = certService.selectCert(FairnetUtils.getCertSession(request)); + caseAuthVO.setCertId(certVO.getCertId()); + //사건권한 조회하기 + map.put("caseAuthVO", caseAuthService.selectCaseAuthExist(caseAuthVO)); + } catch (Exception e) { + map.put("caseAuthVO", null); + } return new ModelAndView("/_extra/web/user/mediation/checkMediationStep03"); } diff --git a/src/main/java/seed/com/user/mypage/WebMyPageController.java b/src/main/java/seed/com/user/mypage/WebMyPageController.java index a55cb9ed..57661921 100644 --- a/src/main/java/seed/com/user/mypage/WebMyPageController.java +++ b/src/main/java/seed/com/user/mypage/WebMyPageController.java @@ -1054,6 +1054,20 @@ private Logger log = Logger.getLogger(this.getClass()); req.getSession().setAttribute("certNm", dataObject.get("certNm")); req.getSession().setAttribute("certHpNo", dataObject.get("certHpNo")); + try { + CertVO certVO = new CertVO(); + + certVO.setPhone(dataObject.get("certHpNo")); + certVO.setName(dataObject.get("certNm")); + + //인증 사용자 insert + certService.insertCert(certVO); + //인증 로그 insert + certService.insertCertLog(certVO); + } catch (Exception e) { + System.out.println("인증 정보 등록 실패!!!!!!!!!"); + } + } catch (IOException e) { e.printStackTrace(); } diff --git a/src/main/webapp/WEB-INF/jsp/_extra/web/user/mediation/checkMediationStep03.jsp b/src/main/webapp/WEB-INF/jsp/_extra/web/user/mediation/checkMediationStep03.jsp index 0c0f5602..31bec23f 100644 --- a/src/main/webapp/WEB-INF/jsp/_extra/web/user/mediation/checkMediationStep03.jsp +++ b/src/main/webapp/WEB-INF/jsp/_extra/web/user/mediation/checkMediationStep03.jsp @@ -352,7 +352,7 @@ @@ -424,7 +424,7 @@ @@ -435,16 +435,20 @@
조사관 추가자료
+
조정안 수락 여부 제출
@@ -459,7 +463,7 @@ diff --git a/src/main/webapp/WEB-INF/jsp/main/inc/EgovIncLeftmenu.jsp b/src/main/webapp/WEB-INF/jsp/main/inc/EgovIncLeftmenu.jsp index ff2bf0d7..e52abdd4 100644 --- a/src/main/webapp/WEB-INF/jsp/main/inc/EgovIncLeftmenu.jsp +++ b/src/main/webapp/WEB-INF/jsp/main/inc/EgovIncLeftmenu.jsp @@ -19,13 +19,16 @@ $( document).ready(function() { leftMenu(); - var subMenuNo = $("#baseMenuNo").val(); -// alert("subMenuNo :: " + subMenuNo); -// $("#top_"+subMenuNo).parents("ul").addClass("active"); -// $("#top_"+subMenuNo).parents("ul").parents("li").addClass("active"); - $("#top_"+subMenuNo).addClass("active"); - $("#top_"+subMenuNo).parent("ul").addClass("active"); - $("#top_"+subMenuNo).parents("ul").parents("li").addClass("active"); + if('${requestURI}' != '/cmm/main/mainPage.do'){ + var subMenuNo = $("#baseMenuNo").val(); + // alert("subMenuNo :: " + subMenuNo); + // $("#top_"+subMenuNo).parents("ul").addClass("active"); + // $("#top_"+subMenuNo).parents("ul").parents("li").addClass("active"); + $("#top_"+subMenuNo).addClass("active"); + $("#top_"+subMenuNo).parent("ul").addClass("active"); + $("#top_"+subMenuNo).parents("ul").parents("li").addClass("active"); + } + });