diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnVO.java b/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnVO.java index c6fe51fc..c74b66a3 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnVO.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnVO.java @@ -73,6 +73,8 @@ public class AdjCourtCnctnVO extends ComDefaultVO implements Serializable { private String deptNm; + private String searchStatCd; + public String getCrtSeq() { return crtSeq; } @@ -349,6 +351,14 @@ public class AdjCourtCnctnVO extends ComDefaultVO implements Serializable { public void setDeptNm(String deptNm) { this.deptNm = deptNm; } + public String getSearchStatCd() { + return searchStatCd; + } + public void setSearchStatCd(String searchStatCd) { + this.searchStatCd = searchStatCd; + } + + diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java b/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java index 83f3296b..c73d39b6 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; @@ -53,6 +54,8 @@ public class AdjCourtCnctnController { @RequestMapping("/kccadr/adjCourtCnctn/adjCourtCnctnList.do") public String adjCourtCnctnList(@ModelAttribute("adjCourtCnctnVO") AdjCourtCnctnVO adjCourtCnctnVO, ModelMap model) throws Exception { + + adjCourtCnctnVO.setSearchStatCd("list"); if(adjCourtCnctnVO.getPageUnit() != 10) { adjCourtCnctnVO.setPageUnit(adjCourtCnctnVO.getPageUnit()); @@ -74,16 +77,18 @@ public class AdjCourtCnctnController { adjCourtCnctnVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); paginationInfo.setTotalRecordCount(adjCourtCnctnService.adjCourtCnctnListCount(adjCourtCnctnVO)); model.addAttribute("paginationInfo", paginationInfo); + + List list = adjCourtCnctnService.adjCourtCnctnList(adjCourtCnctnVO); - try { - list = list.stream() - .filter(t -> t.getCrtStatCd() != null) - .filter(t -> Integer.parseInt(t.getCrtStatCd()) <= 201050) - .collect(Collectors.toList()); - } catch (Exception e) { - System.out.println(e.getMessage()); - } +// try { +// list = list.stream() +// .filter(t -> t.getCrtStatCd() != null) +// .filter(t -> Integer.parseInt(t.getCrtStatCd()) <= 201050) +// .collect(Collectors.toList()); +// } catch (Exception e) { +// System.out.println(e.getMessage()); +// } // 복호화 model.addAttribute("list", list); @@ -202,8 +207,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"; } @@ -291,6 +297,8 @@ public class AdjCourtCnctnController { @RequestMapping("/kccadr/adjCourtCnctn/adjCourtCnctnEndList.do") public String adjCourtCnctnEndList(@ModelAttribute("adjCourtCnctnVO") AdjCourtCnctnVO adjCourtCnctnVO, ModelMap model) throws Exception { + adjCourtCnctnVO.setSearchStatCd("endList"); + if(adjCourtCnctnVO.getPageUnit() != 10) { adjCourtCnctnVO.setPageUnit(adjCourtCnctnVO.getPageUnit()); } @@ -313,14 +321,14 @@ public class AdjCourtCnctnController { model.addAttribute("paginationInfo", paginationInfo); List list = adjCourtCnctnService.adjCourtCnctnList(adjCourtCnctnVO); - try { - list = list.stream() - .filter(t -> t.getCrtStatCd() != null) - .filter(t -> Integer.parseInt(t.getCrtStatCd()) > 201050) - .collect(Collectors.toList()); - } catch (Exception e) { - System.out.println(e.getMessage()); - } +// try { +// list = list.stream() +// .filter(t -> t.getCrtStatCd() != null) +// .filter(t -> Integer.parseInt(t.getCrtStatCd()) > 201050) +// .collect(Collectors.toList()); +// } catch (Exception e) { +// System.out.println(e.getMessage()); +// } // 복호화 model.addAttribute("list", list); model.addAttribute("endFlag", "end"); 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 c9173ce5..50496548 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 @@ -97,6 +97,16 @@ TO_CHAR(DCSN_DE,'YYYYMMDD') = ]]> REPLACE(#diffMonth#, '-' , '') --> + + crt_stat_cd + + 201050 + + + ]]> 201050 + + + AND crt_stat_cd IS NOT NULL LIMIT #recordCountPerPage# OFFSET #firstIndex# @@ -155,8 +165,18 @@ TO_CHAR(DCSN_DE,'YYYYMMDD') = ]]> REPLACE(#diffMonth#, '-' , '') --> + + + crt_stat_cd + + 201050 + + + ]]> 201050 + + + AND crt_stat_cd IS NOT NULL - LIMIT #recordCountPerPage# OFFSET #firstIndex# 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(){ - +
@@ -107,6 +107,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 @@
    - + + +