diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java b/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java
index 83f3296b..598dc76f 100644
--- a/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java
+++ b/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java
@@ -11,6 +11,7 @@ import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper;
@@ -202,8 +203,9 @@ public class AdjCourtCnctnController {
}
@RequestMapping(value = "/kccadr/adjCourtCnctn/popup/adjCourtCnctnAppPop.do")
- public String adjCourtCnctnAppPop(@ModelAttribute("adjCourtAppVO") AdjCourtAppVO adjCourtAppVO, ModelMap model) throws Exception {
+ public String adjCourtCnctnAppPop(@RequestParam(value = "endFlag" , required = false) String endFlag, @ModelAttribute("adjCourtAppVO") AdjCourtAppVO adjCourtAppVO, ModelMap model) throws Exception {
+ model.addAttribute("endFlag", endFlag);
model.addAttribute("list", adjCourtCnctnService.selectAdjCourtCnctnAppList(adjCourtAppVO));
return "kccadr/adjCourtCnctn/pop/adjCourtCnctnAppPop";
}
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnEndDetailTab0.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnEndDetailTab0.jsp
index eb5b9f55..9ef2cf37 100644
--- a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnEndDetailTab0.jsp
+++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnEndDetailTab0.jsp
@@ -90,7 +90,7 @@ function endAfterPop(){
-
+
@@ -242,26 +243,32 @@ function endAfterPop(){
| 합의금 |
-
+ |
|
-
-
| 종결일자 |
-
+ |
|
| 수당금액 |
-
+ |
|
+ 지급일자 |
+
+
+ |
- | 지급일자 |
-
-
+ | 결과 |
+
+
+ |
+ 세부결과 |
+
+
|
@@ -272,18 +279,8 @@ function endAfterPop(){
-
-
-
-
-
-
-
-
-
+
-
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 ec55a75b..67f9889b 100644
--- a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnList.jsp
@@ -63,7 +63,12 @@ function fn_goEndDetail(crtSeq){
-
법원연계조정목록
+
+ 법원연계조정목록
+
+
+ 법원연계조정종결목록
+
- 법원연계조정 목록
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/pop/adjCourtCnctnAppPop.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/pop/adjCourtCnctnAppPop.jsp
index 5fed7412..d3903ffe 100644
--- a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/pop/adjCourtCnctnAppPop.jsp
+++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/pop/adjCourtCnctnAppPop.jsp
@@ -89,7 +89,9 @@
-
+
+
+