diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnService.java b/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnService.java index 980ca0a3..cf1a0df3 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnService.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnService.java @@ -47,4 +47,6 @@ public interface AdjCourtCnctnService { public RestResponse updateAdjCourtCnctnEndAfterPopAjax(AdjCourtCnctnVO adjCourtCnctnVO, AdjCourtDeptVO adjCourtDeptVO) throws Exception; public AdjCourtDeptVO selectCourtDept(AdjCourtDeptVO adjCourtDeptVO) throws Exception; + + public RestResponse insertAdjCourtRprtDePopAjax(AdjCourtCnctnVO adjCourtCnctnVO) throws Exception; } diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnVO.java b/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnVO.java index 76844132..798883a5 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnVO.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnVO.java @@ -95,6 +95,10 @@ public class AdjCourtCnctnVO extends ComDefaultVO implements Serializable { private int pageSize = 50; private int recordCountPerPage = 50; + + private String deptOrdinaryYn; + + private String uniqId; public String getCrtSeq() { return crtSeq; @@ -450,6 +454,20 @@ public class AdjCourtCnctnVO extends ComDefaultVO implements Serializable { public void setRecordCountPerPage(int recordCountPerPage) { this.recordCountPerPage = recordCountPerPage; } + public String getDeptOrdinaryYn() { + return deptOrdinaryYn; + } + public void setDeptOrdinaryYn(String deptOrdinaryYn) { + this.deptOrdinaryYn = deptOrdinaryYn; + } + public String getUniqId() { + return uniqId; + } + public void setUniqId(String uniqId) { + this.uniqId = uniqId; + } + + } diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnDAO.java b/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnDAO.java index 784e0c2d..6a31310e 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnDAO.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnDAO.java @@ -99,6 +99,9 @@ public class AdjCourtCnctnDAO extends EgovAbstractDAO { return (AdjCourtDeptVO) select("adjCourtCnctnDAO.selectCourtDept", adjCourtDeptVO); } + public void insertAdjCourtRprtDePopAjax(AdjCourtCnctnVO adjCourtCnctnVO) throws Exception { + update("adjCourtCnctnDAO.insertAdjCourtRprtDePopAjax", adjCourtCnctnVO); + } } diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnServiceImpl.java b/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnServiceImpl.java index 2e2eaf73..02c51a42 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnServiceImpl.java @@ -279,4 +279,16 @@ public class AdjCourtCnctnServiceImpl extends EgovAbstractServiceImpl implements public AdjCourtDeptVO selectCourtDept(AdjCourtDeptVO adjCourtDeptVO) throws Exception { return adjCourtCnctnDAO.selectCourtDept(adjCourtDeptVO); } + + @Override + public RestResponse insertAdjCourtRprtDePopAjax(AdjCourtCnctnVO adjCourtCnctnVO) throws Exception { + try { + adjCourtCnctnDAO.insertAdjCourtRprtDePopAjax(adjCourtCnctnVO); + }catch (Exception e) { + return new RestResponse(HttpStatus.BAD_REQUEST, "등록에 실패하였습니다.", LocalDateTime.now()); + } + return new RestResponse(HttpStatus.OK, "등록 되었습니다.", LocalDateTime.now()); + } + + } diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java b/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java index 18093188..85dde2f1 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java @@ -93,7 +93,10 @@ public class AdjCourtCnctnController { LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated() ? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser() : null; - if(loginVO != null && (KccadrCourtConstants.CRT_DEPT_ORDINARY).equals(loginVO.getOfcpsNm())) + if(loginVO != null && (KccadrCourtConstants.CRT_DEPT_ORDINARY).equals(loginVO.getOfcpsNm())) { + adjCourtCnctnVO.setDeptOrdinaryYn("Y"); + adjCourtCnctnVO.setUniqId(loginVO.getUniqId()); + } adjCourtCnctnVO.setSearchStatCd("list"); @@ -155,20 +158,29 @@ public class AdjCourtCnctnController { @RequestMapping("/kccadr/adjCourtCnctn/adjCourtCnctnDetail.do") public String adjCourtCnctnDetail(@ModelAttribute("adjCourtCnctnVO") AdjCourtCnctnVO CourtVO, ModelMap model) throws Exception { + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated() ? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser() : null; + AdjCourtCnctnVO adjCourtCnctnVO = adjCourtCnctnService.findByid(CourtVO); if(StringUtil.isEmpty(adjCourtCnctnVO.getTabSeq())) { adjCourtCnctnVO.setTabSeq("0"); } model.addAttribute("courtVO", adjCourtCnctnVO); + model.addAttribute("loginVO", loginVO); + return "kccadr/adjCourtCnctn/adjCourtCnctnDetail"; } @RequestMapping("/kccadr/adjCourtCnctn/adjCourtCnctnDetailTab0.do") public String adjCourtCnctnDetailTab0(@ModelAttribute("adjCourtCnctnVO") AdjCourtCnctnVO CourtVO, ModelMap model) throws Exception { + + AdjCourtCnctnVO adjCourtCnctnVO = adjCourtCnctnService.findByid(CourtVO); model.addAttribute("courtVO", adjCourtCnctnVO); + + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated() ? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser() : null; + model.addAttribute("loginVO", loginVO); return "kccadr/adjCourtCnctn/adjCourtCnctnDetailTab0"; } @@ -180,6 +192,9 @@ public class AdjCourtCnctnController { List list = adjCourtCnctnService.selectAdjCourtCnctniFileList(CourtVO); model.addAttribute("list", list); + + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated() ? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser() : null; + model.addAttribute("loginVO", loginVO); return "kccadr/adjCourtCnctn/adjCourtCnctnDetailTab1"; } @@ -545,31 +560,26 @@ public class AdjCourtCnctnController { model.addAttribute("isMember", "Y"); } -// //selectbox 미리 만들기 -// LocVO locVO = new LocVO(); -// locVO.setTopLocNo(topLocNo); //최상위 매뉴번호 -// List orgHiddenList = orgChartManageService.selectOrgChartListAjax(locVO); -// String userOneDepth = ""; -// String userTwoDepth = ""; -// -// if(null != userManageVO.getPartIdx() && !"".equals(userManageVO.getPartIdx())) { -// for(LocVO tempLocVO : orgHiddenList) { -// if(userManageVO.getPartIdx().equals(tempLocVO.getId())){ -// if(1==tempLocVO.getDepths()) { //1뎁스면 조회 안함 -// userOneDepth = tempLocVO.getId(); -// }else { //2뎁스면 -// userTwoDepth = tempLocVO.getId() ; -// userOneDepth = tempLocVO.getParent() ; -// } -// } -// } -// } -// model.addAttribute("userOneDepth", userOneDepth); -// model.addAttribute("userTwoDepth", userTwoDepth); -// model.addAttribute("orgHiddenList", orgHiddenList); return "kccadr/adjCourtCnctn/adjCourtUserDetail"; } + @RequestMapping(value = "/kccadr/adjCourtCnctn/popup/adjCourtRprtDePop.do") + public String adjCourtRprtDePop(@ModelAttribute("AdjCourtCnctnVO") AdjCourtCnctnVO adjCourtCnctnVO, ModelMap model) throws Exception { + + return "kccadr/adjCourtCnctn/pop/adjCourtRprtDePop"; + } + + @RequestMapping(value = "/kccadr/adjCourtCnctn/insertAdjCourtRprtDePopAjax.do") + public ResponseEntity insertAdjCourtRprtDePopAjax(AdjCourtCnctnVO adjCourtCnctnVO) throws Exception { + + LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser(); + + adjCourtCnctnVO.setLastUpdusrId(loginVO.getUniqId()); + adjCourtCnctnVO.setFrstRegisterId(loginVO.getUniqId()); + + return ResponseEntity.ok().body(adjCourtCnctnService.insertAdjCourtRprtDePopAjax(adjCourtCnctnVO)); + } + private List> deptNmArr(List list){ List> tmp1 = new ArrayList>(); diff --git a/src/main/java/kcc/let/main/web/EgovMainController.java b/src/main/java/kcc/let/main/web/EgovMainController.java index a7233c2a..9b9bb995 100644 --- a/src/main/java/kcc/let/main/web/EgovMainController.java +++ b/src/main/java/kcc/let/main/web/EgovMainController.java @@ -393,7 +393,8 @@ public class EgovMainController { && (KccadrCourtConstants.CRT_DEPT_ORDINARY).equals(user.getOfcpsNm())) { list_menulist = list_menulist.stream() .filter( - t -> !"/kccadr/adjCourtAprvl/aprvlList.do".equals(t.get("chkURL")) + t -> (!"/kccadr/adjCourtAprvl/aprvlList.do".equals(t.get("chkURL")) + && !"/kccadr/adjCourtCnctn/adjCourtSelectUserList.do".equals(t.get("chkURL"))) ) .collect(Collectors.toList()); } 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 ef6f8325..715e4e63 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 @@ -91,8 +91,11 @@ b.esntl_id = #searchLoginId# - - + + + b.esntl_id = #uniqId# + + @@ -968,4 +971,14 @@ + + + UPDATE adr_court_mgr + SET crt_rprt_de = #crtRprtDe# + , last_updusr_id = #lastUpdusrId# + , last_updt_pnttm = now() + WHERE crt_seq = #crtSeq# + + + 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 9c9297c7..8d2ea186 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnDetailTab0.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnDetailTab0.jsp @@ -57,6 +57,10 @@ function DeptPop(){ commonPopWindowopenForm("/kccadr/adjCourtCnctn/popup/adjCourtCnctnDeptPop.do", "650", "400", "DeptPop", $("#popForm")); } +function RprtDePop(){ + commonPopWindowopenForm("/kccadr/adjCourtCnctn/popup/adjCourtRprtDePop.do", "650", "400", "RprtDePop", $("#popForm")); +} + function aprvlPop(pram){ document.popForm.crtStatCd.value = pram; @@ -107,6 +111,8 @@ function endAfterPop(){ " /> " /> + " /> + @@ -132,7 +138,7 @@ function endAfterPop(){ - 메일수신일(사건기록)(사건기록) + 메일수신일(사건기록) @@ -164,6 +170,11 @@ function endAfterPop(){ 사무수행보고일 + + + @@ -185,8 +196,17 @@ function endAfterPop(){ 조정위원 - - + + + + @@ -210,12 +230,12 @@ function endAfterPop(){ - - 원고 정보 - - - - + + + +<%-- --%> + + 피고 이름 @@ -236,12 +256,12 @@ function endAfterPop(){ - - 피고 정보 - - - - + + + +<%-- --%> + + 분야 @@ -262,21 +282,22 @@ function endAfterPop(){
- - - - - - - - - - - - - - + + + + + + + + + + + + + + +
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnDetailTab1.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnDetailTab1.jsp index 0a4e3bcd..42112781 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnDetailTab1.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnDetailTab1.jsp @@ -117,7 +117,9 @@
- + + +
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnModify.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnModify.jsp index 13647a4f..fcfdc62c 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnModify.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnModify.jsp @@ -229,7 +229,7 @@ function fn_GoList(){ 기한연장(1차)
- +