diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java b/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java index f7cda944..1cffe227 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java @@ -98,6 +98,14 @@ public class AdjCourtCnctnController { adjCourtCnctnVO.setDeptOrdinaryYn("Y"); adjCourtCnctnVO.setUniqId(loginVO.getUniqId()); + }else if(loginVO != null && (KccadrCourtConstants.CRT_DEPT_GENERAL).equals(loginVO.getOfcpsNm())) { + //총괄조정일경우 + //insttCode 해당 법원 구하는 로직 + UserManageVO userManageVO = new UserManageVO(); + userManageVO = userManageService.selectUser(loginVO.getUniqId()); + System.out.println("userManageVO.getInsttCode() :: "+userManageVO.getInsttCode()); + adjCourtCnctnVO.setCrtLinkHouse(userManageVO.getInsttCode().trim()); + } model.addAttribute("ofcpsNm",loginVO.getOfcpsNm()); @@ -139,6 +147,10 @@ public class AdjCourtCnctnController { } + + + + List list = adjCourtCnctnService.adjCourtCnctnList(adjCourtCnctnVO); model.addAttribute("deptNmArr", deptNmArr(list)); diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjCourtCnctn/AdjCourtCnctn_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjCourtCnctn/AdjCourtCnctn_SQL_Mysql.xml index 7ef54e28..d1dc1dcb 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjCourtCnctn/AdjCourtCnctn_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjCourtCnctn/AdjCourtCnctn_SQL_Mysql.xml @@ -36,6 +36,11 @@ ) c WHERE 1=1 + /*조정위원일 경우 해당 법원만 조회*/ + + a.crt_link_house = #crtLinkHouse# + + @@ -619,13 +624,13 @@ FROM lettnemplyrinfo t1 WHERE t1.esntl_id = a.crt_aprvl_id3 ) - ELSE NULL + ELSE '완료' END AS stepMem FROM adr_court_aprvl_mgr a LEFT JOIN adr_court_mgr b ON a.crt_seq = b.crt_seq WHERE 1=1 - + ORDER BY a.frst_regist_pnttm desc LIMIT #recordCountPerPage# OFFSET #firstIndex# diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtAprvlList.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtAprvlList.jsp index 75971731..9259a8af 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtAprvlList.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtAprvlList.jsp @@ -274,6 +274,17 @@

+ + + + + + + + + + +

diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnDetailTab0.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnDetailTab0.jsp index 7873c789..cc90cad5 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnDetailTab0.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnDetailTab0.jsp @@ -68,6 +68,10 @@ function aprvlPop(pram){ var url = ""; if(pram == '101010'){ + if(!$('#crtDeptOrdiValChk').val()){ + alert('사건배당 진행 후 다시 시도해주세요.'); + return false; + } url = "/kccadr/adjCourtAprvl/popup/aprvlReqPop.do"; }else{ url = "/kccadr/adjCourtAprvl/popup/aprvlReqEndPop.do"; @@ -299,6 +303,7 @@ function fn_updateCrtStatCd(val){ 조정위원 + "/>