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 ae13ec51..2e2eaf73 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnServiceImpl.java @@ -189,7 +189,7 @@ public class AdjCourtCnctnServiceImpl extends EgovAbstractServiceImpl implements final Map files = multiRequest.getFileMap(); if (!files.isEmpty()){ - List result = fileUtil.parseFileInf(files, "CRT_", 0, "", "", ""); + List result = fileUtil.parseFileInf(files, "CRT_", 0, adjCourtAppVO.getCrtAtchFileId(), "", ""); String atchFileId = fileMngService.insertFileInfs(result); adjCourtAppVO.setCrtAtchFileId(atchFileId); @@ -219,7 +219,7 @@ public class AdjCourtCnctnServiceImpl extends EgovAbstractServiceImpl implements final Map files = multiRequest.getFileMap(); if (!files.isEmpty()){ - List result = fileUtil.parseFileInf(files, "CRT_", 0, "", "", ""); + List result = fileUtil.parseFileInf(files, "CRT_", 0, adjCourtCnctnVO.getCrtAtchFileIdEnd(), "", ""); String atchFileId = fileMngService.insertFileInfs(result); adjCourtCnctnVO.setCrtAtchFileIdEnd(atchFileId); @@ -243,7 +243,7 @@ public class AdjCourtCnctnServiceImpl extends EgovAbstractServiceImpl implements try { final Map files = multiRequest.getFileMap(); - List result = fileUtil.parseFileInf(files, "CRT_", 0, "", "", ""); + List result = fileUtil.parseFileInf(files, "CRT_", 0, adjCourtCnctnVO.getAtchFileId(), "", ""); String atchFileId = fileMngService.insertFileInfs(result); adjCourtCnctnVO.setCrtAtchFileId(atchFileId); diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java b/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java index 0ae5345b..83f3296b 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java @@ -1,6 +1,7 @@ package kcc.kccadr.adjCourtCnctn.web; import java.util.List; +import java.util.stream.Collectors; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; @@ -15,10 +16,10 @@ import org.springframework.web.multipart.MultipartHttpServletRequest; import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; import kcc.com.cmm.LoginVO; +import kcc.com.cmm.service.EgovFileMngService; +import kcc.com.cmm.service.FileVO; import kcc.com.cmm.util.StringUtil; import kcc.com.utl.fcc.service.EgovStringUtil; -import kcc.kccadr.accdnt.ans.service.AnsVO; -import kcc.kccadr.accdnt.ars.service.AdjstReqStatusVO; import kcc.kccadr.adjCourtCnctn.service.AdjCourtAppVO; import kcc.kccadr.adjCourtCnctn.service.AdjCourtCnctnService; import kcc.kccadr.adjCourtCnctn.service.AdjCourtCnctnVO; @@ -46,6 +47,10 @@ public class AdjCourtCnctnController { @Resource(name = "AdjCourtCnctnService") private AdjCourtCnctnService adjCourtCnctnService; + //파일정보의 관리 + @Resource(name = "EgovFileMngService") + private EgovFileMngService fileService; + @RequestMapping("/kccadr/adjCourtCnctn/adjCourtCnctnList.do") public String adjCourtCnctnList(@ModelAttribute("adjCourtCnctnVO") AdjCourtCnctnVO adjCourtCnctnVO, ModelMap model) throws Exception { @@ -70,6 +75,15 @@ public class AdjCourtCnctnController { 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()); + } // 복호화 model.addAttribute("list", list); @@ -197,7 +211,16 @@ public class AdjCourtCnctnController { @RequestMapping(value = "/kccadr/adjCourtCnctn/popup/adjCourtCnctnAppDetailPop.do") public String adjCourtCnctnAppDetailPop(@ModelAttribute("adjCourtAppVO") AdjCourtAppVO adjCourtAppVO, ModelMap model) throws Exception { - model.addAttribute("detailVO", adjCourtCnctnService.selectAdjCourtCnctnAppDetail(adjCourtAppVO)); + AdjCourtAppVO detailVO = adjCourtCnctnService.selectAdjCourtCnctnAppDetail(adjCourtAppVO); + + model.addAttribute("detailVO", detailVO); + + //파일 정보 가져오기 + FileVO fileVO = new FileVO(); + fileVO.setAtchFileId(detailVO.getCrtAtchFileId()); + List result = fileService.selectFileInfs(fileVO); + model.addAttribute("fileList", result); + model.addAttribute("fileListCnt", result.size()); return "kccadr/adjCourtCnctn/pop/adjCourtCnctnAppDetailPop"; } @@ -265,4 +288,80 @@ public class AdjCourtCnctnController { return ResponseEntity.ok().body(adjCourtCnctnService.updateAdjCourtCnctnEndAfterPopAjax(adjCourtCnctnVO, deptVO)); } + @RequestMapping("/kccadr/adjCourtCnctn/adjCourtCnctnEndList.do") + public String adjCourtCnctnEndList(@ModelAttribute("adjCourtCnctnVO") AdjCourtCnctnVO adjCourtCnctnVO, ModelMap model) throws Exception { + + if(adjCourtCnctnVO.getPageUnit() != 10) { + adjCourtCnctnVO.setPageUnit(adjCourtCnctnVO.getPageUnit()); + } + + if("".equals(adjCourtCnctnVO.getSearchSortCnd())){ + adjCourtCnctnVO.setSearchSortCnd("CRT_SEQ"); + adjCourtCnctnVO.setSearchSortOrd("desc"); + } + + /** paging */ + PaginationInfo paginationInfo = new PaginationInfo(); + paginationInfo.setCurrentPageNo(adjCourtCnctnVO.getPageIndex()); + paginationInfo.setRecordCountPerPage(adjCourtCnctnVO.getPageUnit()); + paginationInfo.setPageSize(adjCourtCnctnVO.getPageSize()); + + adjCourtCnctnVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); + adjCourtCnctnVO.setLastIndex(paginationInfo.getLastRecordIndex()); + 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()); + } + // 복호화 + model.addAttribute("list", list); + model.addAttribute("endFlag", "end"); + + return "kccadr/adjCourtCnctn/adjCourtCnctnList"; + } + + + @RequestMapping("/kccadr/adjCourtCnctn/adjCourtCnctnEndDetail.do") + public String adjCourtCnctnEndDetail(@ModelAttribute("adjCourtCnctnVO") AdjCourtCnctnVO CourtVO, ModelMap model) throws Exception { + + AdjCourtCnctnVO adjCourtCnctnVO = adjCourtCnctnService.findByid(CourtVO); + + if(StringUtil.isEmpty(adjCourtCnctnVO.getTabSeq())) { + adjCourtCnctnVO.setTabSeq("0"); + } + model.addAttribute("courtVO", adjCourtCnctnVO); + return "kccadr/adjCourtCnctn/adjCourtCnctnEndDetail"; + } + + @RequestMapping("/kccadr/adjCourtCnctn/adjCourtCnctnEndDetailTab0.do") + public String adjCourtCnctnEndDetailTab0(@ModelAttribute("adjCourtCnctnVO") AdjCourtCnctnVO CourtVO, ModelMap model) throws Exception { + + AdjCourtCnctnVO adjCourtCnctnVO = adjCourtCnctnService.findByid(CourtVO); + model.addAttribute("courtVO", adjCourtCnctnVO); + + AdjCourtDeptVO adjCourtDeptVO = new AdjCourtDeptVO(); + adjCourtDeptVO.setCrtSeq(adjCourtCnctnVO.getCrtSeq()); + model.addAttribute("adjCourtDeptVO", adjCourtCnctnService.selectCourtDept(adjCourtDeptVO)); + + return "kccadr/adjCourtCnctn/adjCourtCnctnEndDetailTab0"; + } + + @RequestMapping("/kccadr/adjCourtCnctn/adjCourtCnctnEndDetailTab1.do") + public String adjCourtCnctnEndDetailTab1(@ModelAttribute("adjCourtCnctnVO") AdjCourtCnctnVO CourtVO, ModelMap model) throws Exception { + + AdjCourtCnctnVO adjCourtCnctnVO = adjCourtCnctnService.findByid(CourtVO); + model.addAttribute("courtVO", adjCourtCnctnVO); + + List list = adjCourtCnctnService.selectAdjCourtCnctniFileList(CourtVO); + model.addAttribute("list", list); + return "kccadr/adjCourtCnctn/adjCourtCnctnEndDetailTab1"; + } } diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnEndDetail.jsp new file mode 100644 index 00000000..928a4c83 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnEndDetail.jsp @@ -0,0 +1,102 @@ +<%@ page contentType="text/html; charset=utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ 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"%> + + + +조정진행 상세 + + + + + + + + " /> + " /> + +
+
+ +
+

법원연계조정 상세

+
    +
  • + +
  • +
  • + <>법원연계조정 관리

    +
  • +
  • +

    법원연계조정 목록

    +
  • +
  • + 법원연계조정 상세 +
  • +
+
+ +
+
+ + +
+
+
+
+
+ + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnEndDetailTab0.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnEndDetailTab0.jsp new file mode 100644 index 00000000..eb5b9f55 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnEndDetailTab0.jsp @@ -0,0 +1,298 @@ +<%@ page contentType="text/html; charset=utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ 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" %> +<%@ taglib prefix="double-submit" uri="http://www.egovframe.go.kr/tags/double-submit/jsp" %> +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> + + + + +법원연계조정관리 - 상세 + + + + + + + +
+ + + " /> + " /> + " /> +
+
+ " /> +
+
+ " /> + " /> + + " /> +
+ + +
+ + + +
+

조정 사건

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
결정일자 + + 수령일자 + +
배당일자 + + 사무처리기한 + +
보고일자 + +
본 사건번호 + + [] + 조정 사건번호 + + +
총괄조정위원 + + 조정위원 + + + + +
원고 이름 + + 원고 (대리인) 이름 + +
원고 연락처 + + 원고 (대리인) 연락처 + +
원고 정보 + +
피고 이름 + + 피고 (대리인) 이름 + +
피고 연락처 + + 피고 (대리인) 연락처 + +
피고 정보 + +
분야 + +
사건내용 + +
합의금 + +
종결일자 + +
수당금액 + +
지급일자 + +
+
+ +
+
+
+ + + + + + + + + + + + + + + + + +
+
+
+
+ + + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnEndDetailTab1.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnEndDetailTab1.jsp new file mode 100644 index 00000000..0a4e3bcd --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnEndDetailTab1.jsp @@ -0,0 +1,133 @@ +<%@ page contentType="text/html; charset=utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ 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="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> + + + +조정진행 상세 + + + + + + + +
+ " /> + " /> +
+ + + +
+ + +

신청 정보

+
+ + + + + + + + + + + + + + + + + + + +<%-- --%> + + + + + + + + + + + + + +
일자문서 구분문서 명
+

${fn:substring(list.frstRegistPnttm, 0, 10)}

+
+ + + +
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+
+
+
+
+ + 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 220c03fe..ec55a75b 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnList.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnList.jsp @@ -47,6 +47,13 @@ function fn_goDetail(crtSeq){ goForm.submit(); } +function fn_goEndDetail(crtSeq){ + var goForm = document.goForm; + goForm.action = ""; + goForm.crtSeq.value = crtSeq; + goForm.submit(); +} + @@ -126,15 +133,28 @@ function fn_goDetail(crtSeq){ - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/pop/adjCourtCnctnAppDetailPop.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/pop/adjCourtCnctnAppDetailPop.jsp index 57a5417c..53701f24 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/pop/adjCourtCnctnAppDetailPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/pop/adjCourtCnctnAppDetailPop.jsp @@ -83,7 +83,7 @@ $(document).ready(function(){
-

사건메모

+

기일상세