diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnService.java b/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnService.java index 18149405..980ca0a3 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnService.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnService.java @@ -43,4 +43,8 @@ public interface AdjCourtCnctnService { public AdjCourtAppVO selectAdjCourtCnctnAppDetail(AdjCourtAppVO adjCourtAppVO) throws Exception; public RestResponse updateAdjCourtCnctnEnd(AdjCourtCnctnVO adjCourtCnctnVO, final MultipartHttpServletRequest multiRequest) throws Exception; + + public RestResponse updateAdjCourtCnctnEndAfterPopAjax(AdjCourtCnctnVO adjCourtCnctnVO, AdjCourtDeptVO adjCourtDeptVO) throws Exception; + + public AdjCourtDeptVO selectCourtDept(AdjCourtDeptVO adjCourtDeptVO) 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 3288ba5b..c6fe51fc 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnVO.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnVO.java @@ -69,6 +69,9 @@ public class AdjCourtCnctnVO extends ComDefaultVO implements Serializable { private String esntlId; + private String crtEndDe; + + private String deptNm; public String getCrtSeq() { return crtSeq; @@ -334,10 +337,18 @@ public class AdjCourtCnctnVO extends ComDefaultVO implements Serializable { public void setCrtAtchFileIdEnd(String crtAtchFileIdEnd) { this.crtAtchFileIdEnd = crtAtchFileIdEnd; } - - - - + public String getCrtEndDe() { + return crtEndDe; + } + public void setCrtEndDe(String crtEndDe) { + this.crtEndDe = crtEndDe; + } + public String getDeptNm() { + return deptNm; + } + public void setDeptNm(String deptNm) { + this.deptNm = deptNm; + } 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 1e181d32..784e0c2d 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnDAO.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnDAO.java @@ -87,4 +87,18 @@ public class AdjCourtCnctnDAO extends EgovAbstractDAO { update("adjCourtCnctnDAO.updateAdjCourtCnctnEnd", adjCourtCnctnVO); } + public void updateCourtCnctnEndAfter(AdjCourtCnctnVO adjCourtCnctnVO){ + update("adjCourtCnctnDAO.updateCourtCnctnEndAfter", adjCourtCnctnVO); + } + + public void updateCourtDeptEndAfterDept(AdjCourtDeptVO adjCourtDeptVO){ + update("adjCourtCnctnDAO.updateCourtDeptEndAfterDept", adjCourtDeptVO); + } + + public AdjCourtDeptVO selectCourtDept(AdjCourtDeptVO adjCourtDeptVO) throws Exception { + return (AdjCourtDeptVO) select("adjCourtCnctnDAO.selectCourtDept", adjCourtDeptVO); + } + + + } 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 12c12057..ae13ec51 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnServiceImpl.java @@ -261,4 +261,22 @@ public class AdjCourtCnctnServiceImpl extends EgovAbstractServiceImpl implements } return new RestResponse(HttpStatus.OK, "등록 되었습니다.", LocalDateTime.now()); } + + @Override + public RestResponse updateAdjCourtCnctnEndAfterPopAjax(AdjCourtCnctnVO adjCourtCnctnVO, AdjCourtDeptVO adjCourtDeptVO) + throws Exception { + + try { + adjCourtCnctnDAO.updateCourtCnctnEndAfter(adjCourtCnctnVO); + adjCourtCnctnDAO.updateCourtDeptEndAfterDept(adjCourtDeptVO); + }catch (Exception e) { + return new RestResponse(HttpStatus.BAD_REQUEST, "등록에 실패하였습니다.", LocalDateTime.now()); + } + return new RestResponse(HttpStatus.OK, "등록 되었습니다.", LocalDateTime.now()); + } + + @Override + public AdjCourtDeptVO selectCourtDept(AdjCourtDeptVO adjCourtDeptVO) throws Exception { + return adjCourtCnctnDAO.selectCourtDept(adjCourtDeptVO); + } } diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtAprvlController.java b/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtAprvlController.java index fe82bdfb..69c47987 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtAprvlController.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtAprvlController.java @@ -215,12 +215,13 @@ public class AdjCourtAprvlController { //결재 처리 adjCourtAprvlService.adjCourtAprvlLineUpdate(adjCourtaprvlVO); + statInfo = new AdjCourtaprvlVO(); statInfo = adjCourtAprvlService.adjCourtAprvlLineChk(adjCourtaprvlVO); // 모든 결재가 끝났다면... if("Y".equals(statInfo.getAllYn())){ //adr_court_mgr - > statCd 변경 - if("2".equals(statInfo.getStep())) { + if("2".equals(statInfo.getCrtAprvlCnt())) { adjCourtaprvlVO.setCrtStatCd(KccadrCourtConstants.CRT_APRVL_END); } else { diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java b/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java index 1629d823..0ae5345b 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java @@ -72,7 +72,6 @@ public class AdjCourtCnctnController { List list = adjCourtCnctnService.adjCourtCnctnList(adjCourtCnctnVO); // 복호화 model.addAttribute("list", list); - return "kccadr/adjCourtCnctn/adjCourtCnctnList"; } @@ -242,5 +241,28 @@ public class AdjCourtCnctnController { return ResponseEntity.ok().body(adjCourtCnctnService.updateAdjCourtCnctnEnd(adjCourtCnctnVO, multiRequest)); } + @RequestMapping(value = "/kccadr/adjCourtCnctn/popup/adjCourtCnctnEndAfterPop.do") + public String adjCourtCnctnEndAfterPop(@ModelAttribute("searchVO") AdjCourtCnctnVO adjCourtCnctnVO, ModelMap model) throws Exception { + AdjCourtDeptVO adjCourtDeptVO = new AdjCourtDeptVO(); + adjCourtDeptVO.setCrtSeq(adjCourtCnctnVO.getCrtSeq()); + model.addAttribute("adjCourtDeptVO", adjCourtCnctnService.selectCourtDept(adjCourtDeptVO)); + model.addAttribute("adjCourtCnctnVO", adjCourtCnctnService.findByid(adjCourtCnctnVO)); + + return "kccadr/adjCourtCnctn/pop/adjCourtCnctnEndAfterPop"; + } + + @RequestMapping(value = "/kccadr/adjCourtCnctn/popup/adjCourtCnctnEndAfterPopAjax.do") + public ResponseEntity adjCourtCnctnEndAfterPopAjax(AdjCourtCnctnVO adjCourtCnctnVO, AdjCourtDeptVO deptVO) throws Exception { + + LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser(); + + deptVO.setLastUpdusrId(loginVO.getUniqId()); + deptVO.setFrstRegisterId(loginVO.getUniqId()); + + adjCourtCnctnVO.setLastUpdusrId(loginVO.getUniqId()); + adjCourtCnctnVO.setFrstRegisterId(loginVO.getUniqId()); + + return ResponseEntity.ok().body(adjCourtCnctnService.updateAdjCourtCnctnEndAfterPopAjax(adjCourtCnctnVO, deptVO)); + } } 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 ece6ebda..c9173ce5 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 @@ -42,8 +42,22 @@ a.last_updt_pnttm as lastUpdtPnttm, a.last_updusr_id as lastUpdusrId, a.crt_end_rslt as crtEndRslt, - a.crt_end_rslt_detail as crtEndRsltDetail + a.crt_end_rslt_detail as crtEndRsltDetail, + a.crt_end_de as crtEndDe, + b.user_nm AS deptNm FROM adr_court_mgr a + LEFT JOIN + (SELECT t1.crt_seq, + t1.esntl_id, + t1.crt_dept_ty, + t2.user_nm + FROM adr_court_dept_mgr t1 + LEFT JOIN lettnemplyrinfo t2 + ON t1.esntl_id = t2.esntl_id + WHERE t1.crt_dept_ty = '20' + ) + b + ON a.crt_seq = b.crt_seq WHERE 1=1 /*조정 사건번호*/ @@ -90,6 +104,18 @@ SELECT COUNT(1) AS TOT FROM adr_court_mgr a + LEFT JOIN + (SELECT t1.crt_seq, + t1.esntl_id, + t1.crt_dept_ty, + t2.user_nm + FROM adr_court_dept_mgr t1 + LEFT JOIN lettnemplyrinfo t2 + ON t1.esntl_id = t2.esntl_id + WHERE t1.crt_dept_ty = '20' + ) + b + ON a.crt_seq = b.crt_seq WHERE 1=1 /*조정 사건번호*/ @@ -235,7 +261,8 @@ a.crt_end_rslt_detail as crtEndRsltDetail, b.user_nm AS crtDeptKng, b.esntl_id AS esntlId, - c.user_nm AS crtDeptOrdi + c.user_nm AS crtDeptOrdi, + a.crt_end_de as crtEndDe FROM adr_court_mgr a LEFT JOIN (SELECT t1.crt_seq, @@ -413,7 +440,7 @@ a.last_updt_pnttm = now() WHERE a.crt_seq = #crtSeq# AND a.crt_dept_ty = '10' - AND b.pstinst_code = #crtLinkHouse#; + AND b.pstinst_code = #crtLinkHouse# @@ -608,6 +635,7 @@ b.crt_link_house AS crtLinkHouse, b.crt_stat_cd AS crtStatCd, b.crt_agrment AS crtAgrment, + b.crt_end_de as crtEndDe, CASE WHEN a.crt_aprvl_yn1 = 'N' THEN 1 @@ -726,8 +754,8 @@ + + SELECT + a.crt_seq AS crtSeq, + a.esntl_id AS esntlId, + a.crt_dept_ty AS crtDeptTy, + a.crt_atch_file_id AS crtAtchFileId, + a.crt_allwanc AS crtAllwanc, + a.crt_pay_de AS crtPayDe, + a.crt_reciv_accnt AS crtRecivAccnt, + a.frst_regist_pnttm AS frstRegistPnttm, + a.frst_register_id AS frstRegisterId, + a.last_updt_pnttm AS lastUpdtPnttm, + a.last_updusr_id AS lastUpdusrId + FROM adr_court_dept_mgr a + WHERE crt_seq = #crtSeq# + and crt_dept_ty = '10' + + + 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 3dc5ee19..369515f4 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnDetailTab0.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnDetailTab0.jsp @@ -76,7 +76,11 @@ function appPop(){ } function endPop(){ - commonPopWindowopenForm("/kccadr/adjCourtCnctn/popup/adjCourtCnctnEndPop.do", "1000", "700", "appPop", $("#popForm")); + commonPopWindowopenForm("/kccadr/adjCourtCnctn/popup/adjCourtCnctnEndPop.do", "1000", "700", "endPop", $("#popForm")); +} + +function endAfterPop(){ + commonPopWindowopenForm("/kccadr/adjCourtCnctn/popup/adjCourtCnctnEndAfterPop.do", "1000", "700", "endAfterPop", $("#popForm")); } @@ -246,18 +250,20 @@ function endPop(){ - + + && courtVO.crtStatCd*1 < 201010}"> - + + + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnList.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnList.jsp index ad88e2a3..220c03fe 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnList.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnList.jsp @@ -132,7 +132,7 @@ function fn_goDetail(crtSeq){ - 조정위원 처리해야함 + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/pop/adjCourtCnctnEndAfterPop.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/pop/adjCourtCnctnEndAfterPop.jsp new file mode 100644 index 00000000..8acf625d --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/pop/adjCourtCnctnEndAfterPop.jsp @@ -0,0 +1,136 @@ + +<%@ page language="java" contentType="text/html; charset=utf-8" + pageEncoding="utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> +<%@ taglib prefix="validator" + uri="http://www.springmodules.org/tags/commons-validator"%> + + +조정위원검색 + + + + + +
+ + + + + + + +
+
+

사건메모

+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
종결일자 +
+ +
+ + +
+
+
합의금 + +
수당금액 + +
지급일자 +
+ +
+ + +
+
+
수령계좌 + +
+
+ + + +
+
+
+
+ +