From a19cbaa1178401d7185bcb909b9eb0304fe9c4a5 Mon Sep 17 00:00:00 2001 From: tolag3 Date: Wed, 17 Jan 2024 11:41:03 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A4=80=ED=98=B8=20=EC=A0=84?= =?UTF-8?q?=EC=9E=90=EC=A1=B0=EC=A0=95=EC=8B=9C=EC=8A=A4=ED=85=9C=20?= =?UTF-8?q?=EC=BB=A4=EB=B0=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 법원연계 커밋 --- .../web/AdjCourtAprvlController.java | 20 +- .../kcc/kccadr/cmm/KccadrCourtConstants.java | 9 +- .../adjCourtCnctn/AdjCourtCnctn_SQL_Mysql.xml | 19 +- .../adjCourtCnctn/adjCourtCnctnDetailTab0.jsp | 2 +- .../pop/adjCourtaprvlReqEndPop.jsp | 878 ++++++++++++++++++ .../adjCourtCnctn/pop/adjCourtaprvlReqPop.jsp | 1 + 6 files changed, 915 insertions(+), 14 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/pop/adjCourtaprvlReqEndPop.jsp diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtAprvlController.java b/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtAprvlController.java index f7324333..fe82bdfb 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtAprvlController.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtAprvlController.java @@ -134,14 +134,13 @@ public class AdjCourtAprvlController { int i = 0; adjCourtaprvlVO.setFrstRegisterId(loginVO.getUniqId()); - adjCourtaprvlVO.setCrtStatCd(KccadrCourtConstants.CRT_APRVL); adjCourtAprvlService.insertAprvlReg(adjCourtaprvlVO); AdjCourtCnctnVO adjCourtCnctnVO = new AdjCourtCnctnVO(); adjCourtCnctnVO.setCrtSeq(adjCourtaprvlVO.getCrtSeq()); adjCourtCnctnVO.setLastUpdusrId(loginVO.getUniqId()); - adjCourtCnctnVO.setCrtStatCd(KccadrCourtConstants.CRT_APRVL); + adjCourtCnctnVO.setCrtStatCd(adjCourtaprvlVO.getCrtStatCd()); adjCourtCnctnService.updateAdjCourtCnctnStatCd(adjCourtCnctnVO); @@ -221,11 +220,26 @@ public class AdjCourtAprvlController { // 모든 결재가 끝났다면... if("Y".equals(statInfo.getAllYn())){ //adr_court_mgr - > statCd 변경 - adjCourtaprvlVO.setCrtStatCd(KccadrCourtConstants.CRT_APRVL_OK); + if("2".equals(statInfo.getStep())) { + adjCourtaprvlVO.setCrtStatCd(KccadrCourtConstants.CRT_APRVL_END); + } + else { + adjCourtaprvlVO.setCrtStatCd(KccadrCourtConstants.CRT_APRVL_OK); + } adjCourtaprvlVO.setLastUpdusrId(loginVO.getUniqId()); adjCourtCnctnService.updateAdjCourtCnctnStatCd(adjCourtaprvlVO); } modelAndView.addObject("result", KccadrConstants.SUCCESS); return modelAndView; } + + + @RequestMapping("/kccadr/adjCourtAprvl/popup/aprvlReqEndPop.do") + public String aprvlReqEndPop( + @ModelAttribute("adjCourtaprvlVO") AdjCourtaprvlVO adjCourtaprvlVO + , ModelMap model + ) throws Exception { + + return "kccadr/adjCourtCnctn/pop/adjCourtaprvlReqEndPop"; + } } diff --git a/src/main/java/kcc/kccadr/cmm/KccadrCourtConstants.java b/src/main/java/kcc/kccadr/cmm/KccadrCourtConstants.java index d506c7e7..da501e6f 100644 --- a/src/main/java/kcc/kccadr/cmm/KccadrCourtConstants.java +++ b/src/main/java/kcc/kccadr/cmm/KccadrCourtConstants.java @@ -3,9 +3,12 @@ package kcc.kccadr.cmm; public class KccadrCourtConstants { //법원연계 진행 상태 - public static final String CRT_REG = "101000"; // 사건접수 - public static final String CRT_APRVL = "101010"; // 결재요청 - public static final String CRT_APRVL_OK = "101050"; // 결재승인 + public static final String CRT_REG = "101000"; // 사건접수 + public static final String CRT_APRVL = "101010"; // 결재요청 + public static final String CRT_APRVL_OK = "101050"; // 결재승인 + public static final String CRT_APRVL_END_REQ = "201010"; // 종결결재요청 + public static final String CRT_APRVL_END = "300000"; // 사건종결 + //법원연계 사건문서 종류 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 862ba447..ed7f2371 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 @@ -428,9 +428,11 @@ crt_aprvl_id2, crt_aprvl_yn2, crt_aprvl_de2, - crt_aprvl_id3, - crt_aprvl_yn3, - crt_aprvl_de3, + + crt_aprvl_id3, + crt_aprvl_yn3, + crt_aprvl_de3, + frst_regist_pnttm, frst_register_id ) @@ -446,9 +448,11 @@ #crtAprvlId2#, 'N', #crtAprvlDe2#, - #crtAprvlId3#, - 'N', - #crtAprvlDe3#, + + #crtAprvlId3#, + 'N', + #crtAprvlDe3#, + NOW(), #frstRegisterId# ) @@ -627,6 +631,7 @@ LEFT JOIN adr_court_mgr b ON a.crt_seq = b.crt_seq WHERE a.crt_seq = #crtSeq# + AND a.crt_aprvl_seq = #crtAprvlSeq# @@ -708,7 +713,7 @@ - SELECT crt_seq , crt_aprvl_seq , 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 a4d4dba0..3dc5ee19 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnDetailTab0.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnDetailTab0.jsp @@ -255,7 +255,7 @@ function endPop(){ && courtVO.crtStatCd*1 < 200000}"> - + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/pop/adjCourtaprvlReqEndPop.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/pop/adjCourtaprvlReqEndPop.jsp new file mode 100644 index 00000000..2a8a518d --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/pop/adjCourtaprvlReqEndPop.jsp @@ -0,0 +1,878 @@ + +<%@ 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="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> + + + + + + + + + +법원연계 접수 결재 요청 + + + +
+ + + + + + + + + + "/> + "/> + + + + +
+
+
+ + + +
+ + +
+
+
+ + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/pop/adjCourtaprvlReqPop.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/pop/adjCourtaprvlReqPop.jsp index 441e09d2..74071369 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/pop/adjCourtaprvlReqPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/pop/adjCourtaprvlReqPop.jsp @@ -765,6 +765,7 @@ function fn_save_aprvl() { success : function(returnData, status) { if (returnData.status == "success") { alert("결재요청 완료되었습니다."); + window.opener.parent.location.reload(); fncGoClose(); }else{ alert("ERROR");