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 @@
-