From d1a767ae6c5642946e2f1a1738914f5059c221c7 Mon Sep 17 00:00:00 2001 From: hylee Date: Wed, 21 Feb 2024 11:43:02 +0900 Subject: [PATCH] =?UTF-8?q?#3676=20[=EA=B0=9C=EB=B0=9C]=20=EB=B2=95?= =?UTF-8?q?=EC=9B=90=EC=97=B0=EA=B3=84=20=EC=88=98=EC=A0=95=EC=82=AC?= =?UTF-8?q?=ED=95=AD=20-=20240220=20=EC=99=84=EB=A3=8C=201.=EC=A0=91?= =?UTF-8?q?=EC=88=98=EA=B2=B0=EC=9E=AC=20=EC=82=AC=EA=B1=B4=EB=B0=B0?= =?UTF-8?q?=EB=8B=B9=20=EB=B2=A8=EB=A5=98=EC=B2=B4=ED=81=AC,=202.=EA=B2=B0?= =?UTF-8?q?=EC=9E=AC=EC=99=84=EB=A3=8C=EC=9D=BC=20=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=84=B0=20=EB=85=B8=EC=B6=9C,=20=EC=B5=9C=EC=8B=A0=EB=93=B1?= =?UTF-8?q?=EB=A1=9D=20=EC=9C=84=EB=A1=9C,=20=EC=A1=B0=EC=A0=95=EC=B4=9D?= =?UTF-8?q?=EA=B4=84=EC=9D=BC=20=EA=B2=BD=EC=9A=B0=20=ED=95=B4=EB=8B=B9=20?= =?UTF-8?q?=EC=A7=80=EC=97=AD=EB=A7=8C=20=EB=82=98=EC=98=A4=EA=B2=8C=20whe?= =?UTF-8?q?re=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adjCourtCnctn/web/AdjCourtCnctnController.java | 12 ++++++++++++ .../kccadr/adjCourtCnctn/AdjCourtCnctn_SQL_Mysql.xml | 9 +++++++-- .../jsp/kccadr/adjCourtCnctn/adjCourtAprvlList.jsp | 11 +++++++++++ .../kccadr/adjCourtCnctn/adjCourtCnctnDetailTab0.jsp | 5 +++++ .../jsp/kccadr/adjCourtCnctn/adjCourtCnctnList.jsp | 3 ++- 5 files changed, 37 insertions(+), 3 deletions(-) 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){ 조정위원 + "/>