diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnService.java b/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnService.java index 510ef7b2..137cee85 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnService.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnService.java @@ -1,8 +1,19 @@ package kcc.kccadr.adjCourtCnctn.service; +import java.util.List; + +import kcc.kccadr.adjReqMgrOff.service.AdjReqMgrOffLineVO; import kcc.kccadr.cmm.RestResponse; public interface AdjCourtCnctnService { RestResponse insertCourtCnctn(AdjCourtCnctnVO adjCourtCnctnVO); + + int adjCourtCnctnListCount(AdjCourtCnctnVO adjCourtCnctnVO); + + List adjCourtCnctnList(AdjCourtCnctnVO adjCourtCnctnVO); + + AdjCourtCnctnVO findByid(AdjCourtCnctnVO adjCourtCnctnVO); + + RestResponse updateCourtCnctn(AdjCourtCnctnVO adjCourtCnctnVO); } diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnVO.java b/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnVO.java index 7c3cad86..7b8022db 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnVO.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnVO.java @@ -49,6 +49,9 @@ public class AdjCourtCnctnVO extends ComDefaultVO implements Serializable { private String lastUpdusrId = ""; + private String searchCondition2 = ""; + + public String getCourtSeq() { return courtSeq; @@ -242,6 +245,12 @@ public class AdjCourtCnctnVO extends ComDefaultVO implements Serializable { public void setRmrks(String rmrks) { this.rmrks = rmrks; } + public String getSearchCondition2() { + return searchCondition2; + } + public void setSearchCondition2(String searchCondition2) { + this.searchCondition2 = searchCondition2; + } diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnDAO.java b/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnDAO.java index 798bb02b..6d2d750e 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnDAO.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnDAO.java @@ -7,6 +7,7 @@ import org.springframework.stereotype.Repository; import egovframework.rte.psl.dataaccess.EgovAbstractDAO; import kcc.kccadr.adjCourtCnctn.service.AdjCourtCnctnVO; import kcc.kccadr.adjReqMgrOff.service.AdjReqMgrOffLineVO; +import kcc.kccadr.adjReqMgrPast.service.AdjReqMgrPastVO; import kcc.kccadr.cmm.RestResponse; @Repository("AdjCourtCnctnDAO") @@ -16,4 +17,21 @@ public class AdjCourtCnctnDAO extends EgovAbstractDAO { insert("adjCourtCnctnDAO.insertCourtCnctn", adjCourtCnctnVO); } + public int selectAdjCourtCnctnListCount(AdjCourtCnctnVO adjCourtCnctnVO) { + return (int) select("adjCourtCnctnDAO.adjCourtCnctnListCount", adjCourtCnctnVO); + } + + public List selectAdjCourtCnctnList(AdjCourtCnctnVO adjCourtCnctnVO) { + return (List) list("adjCourtCnctnDAO.adjCourtCnctnList", adjCourtCnctnVO); + } + + public AdjCourtCnctnVO findByid(AdjCourtCnctnVO adjCourtCnctnVO) { + return (AdjCourtCnctnVO) select("adjCourtCnctnDAO.findByid", adjCourtCnctnVO); + } + + public void updateCourtCnctn(AdjCourtCnctnVO adjCourtCnctnVO) { + update("adjCourtCnctnDAO.updateCourtCnctn", adjCourtCnctnVO); + + } + } 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 eee3121f..47df7b65 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnServiceImpl.java @@ -48,6 +48,31 @@ public class AdjCourtCnctnServiceImpl extends EgovAbstractServiceImpl implements } return new RestResponse(HttpStatus.OK, "등록 되었습니다.", LocalDateTime.now()); } + + @Override + public int adjCourtCnctnListCount(AdjCourtCnctnVO adjCourtCnctnVO) { + return adjCourtCnctnDAO.selectAdjCourtCnctnListCount(adjCourtCnctnVO); + } + + @Override + public List adjCourtCnctnList(AdjCourtCnctnVO adjCourtCnctnVO) { + return adjCourtCnctnDAO.selectAdjCourtCnctnList(adjCourtCnctnVO); + } + + @Override + public AdjCourtCnctnVO findByid(AdjCourtCnctnVO adjCourtCnctnVO) { + return adjCourtCnctnDAO.findByid(adjCourtCnctnVO); + } + + @Override + public RestResponse updateCourtCnctn(AdjCourtCnctnVO adjCourtCnctnVO) { + try { + adjCourtCnctnDAO.updateCourtCnctn(adjCourtCnctnVO); + } catch (Exception e) { + return new RestResponse(HttpStatus.BAD_REQUEST, "수정에 실패하였습니다.", LocalDateTime.now()); + } + return new RestResponse(HttpStatus.OK, "수정 되었습니다.", LocalDateTime.now()); + } diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java b/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java index 59ff4008..94e4a39c 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java @@ -49,10 +49,10 @@ public class AdjCourtCnctnController { adjCourtCnctnVO.setPageUnit(adjCourtCnctnVO.getPageUnit()); } -// if("".equals(adjReqMgrOffLineVO.getSearchSortCnd())){ -// adjReqMgrOffLineVO.setSearchSortCnd("RS.ADR_SEQ"); -// adjReqMgrOffLineVO.setSearchSortOrd("desc"); -// } + if("".equals(adjCourtCnctnVO.getSearchSortCnd())){ + adjCourtCnctnVO.setSearchSortCnd("COURT_SEQ"); + adjCourtCnctnVO.setSearchSortOrd("desc"); + } // if(("3".equals(adjReqMgrOffLineVO.getSearchCondition()) || "4".equals(adjReqMgrOffLineVO.getSearchCondition())) && StringUtils.isNotBlank(adjReqMgrOffLineVO.getSearchKeyword())){ // adjReqMgrOffLineVO.setSearchKeyword(egovCryptoUtil.encrypt(adjReqMgrOffLineVO.getSearchKeyword())); // } @@ -66,31 +66,54 @@ public class AdjCourtCnctnController { adjCourtCnctnVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); adjCourtCnctnVO.setLastIndex(paginationInfo.getLastRecordIndex()); adjCourtCnctnVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); -// paginationInfo.setTotalRecordCount(adjReqMgrOffLineService.adjReqMgrOffListCount(adjReqMgrOffLineVO)); + paginationInfo.setTotalRecordCount(adjCourtCnctnService.adjCourtCnctnListCount(adjCourtCnctnVO)); model.addAttribute("paginationInfo", paginationInfo); -// List list = adjReqMgrOffLineService.adjReqMgrOffList(adjReqMgrOffLineVO); - List list = new ArrayList<>(); + List list = adjCourtCnctnService.adjCourtCnctnList(adjCourtCnctnVO); // 복호화 model.addAttribute("list", list); return "kccadr/adjCourtCnctn/adjCourtCnctnList"; } + + @RequestMapping("/kccadr/adjCourtCnctn/adjCourtCnctnDetail.do") + public String adjCourtCnctnDetail(@ModelAttribute("adjCourtCnctnVO") AdjCourtCnctnVO CourtVO, ModelMap model) throws Exception { + + AdjCourtCnctnVO adjCourtCnctnVO = adjCourtCnctnService.findByid(CourtVO); + model.addAttribute("courtVO", adjCourtCnctnVO); + return "kccadr/adjCourtCnctn/adjCourtCnctnDetail"; + } + + @RequestMapping("/kccadr/adjCourtCnctn/adjCourtCnctnModify.do") + public String adjCourtCnctnModify(@ModelAttribute("adjCourtCnctnVO") AdjCourtCnctnVO CourtVO, ModelMap model) throws Exception { + + AdjCourtCnctnVO adjCourtCnctnVO = adjCourtCnctnService.findByid(CourtVO); + model.addAttribute("courtVO", adjCourtCnctnVO); + return "kccadr/adjCourtCnctn/adjCourtCnctnModify"; + } @RequestMapping("/kccadr/adjCourtCnctn/adjCourtCnctnRegist.do") public String adjCourtCnctnRegist(@ModelAttribute("adjCourtCnctnVO") AdjCourtCnctnVO adjCourtCnctnVO, ModelMap model) throws Exception { AdjReqMgrPastVO adjReqMgrPastVO = new AdjReqMgrPastVO(); - model.addAttribute("mainVO", adjReqMgrPastVO); + model.addAttribute("courtVO", adjReqMgrPastVO); return "kccadr/adjCourtCnctn/adjCourtCnctnRegist"; } @RequestMapping("/kccadr/adjCourtCnctn/adjCourtCnctnRegistAjax.do") - public ResponseEntity insertExmpAppManager(@ModelAttribute("adjCourtCnctnVO") AdjCourtCnctnVO adjCourtCnctnVO) throws Exception { + public ResponseEntity adjCourtCnctnRegistAjax(@ModelAttribute("adjCourtCnctnVO") AdjCourtCnctnVO adjCourtCnctnVO) throws Exception { LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser(); adjCourtCnctnVO.setFrstRegisterId(loginVO.getUniqId()); return ResponseEntity.ok().body(adjCourtCnctnService.insertCourtCnctn(adjCourtCnctnVO)); } + @RequestMapping("/kccadr/adjCourtCnctn/adjCourtCnctnUpdateAjax.do") + public ResponseEntity adjCourtCnctnUpdateAjax(@ModelAttribute("adjCourtCnctnVO") AdjCourtCnctnVO adjCourtCnctnVO) throws Exception { + + LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser(); + adjCourtCnctnVO.setLastUpdusrId(loginVO.getUniqId()); + return ResponseEntity.ok().body(adjCourtCnctnService.updateCourtCnctn(adjCourtCnctnVO)); + } + } diff --git a/src/main/resources/egovframework/spring/com/context-idgen.xml b/src/main/resources/egovframework/spring/com/context-idgen.xml index 09d28f6a..f05e768d 100644 --- a/src/main/resources/egovframework/spring/com/context-idgen.xml +++ b/src/main/resources/egovframework/spring/com/context-idgen.xml @@ -2876,7 +2876,7 @@ - + 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 90ae1930..4ca41325 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 @@ -5,7 +5,219 @@ - + + + + + + + INSERT INTO ADJ_COURT_CNCTN_MGR ( COURT_SEQ @@ -69,6 +281,39 @@ ,#frstRegisterId# ) + + + UPDATE ADJ_COURT_CNCTN_MGR SET + COURT_NUM = #courtNum# + , COURT_ORG_NO = #courtOrgNo# + , COURT_NO = #courtNo# + , DCSN_DE = TO_DATETIME(TO_CHAR(#dcsnDe#,'YYYY-MM-DD')) + , RCV_DE = TO_DATETIME(TO_CHAR(#rcvDe#,'YYYY-MM-DD')) + , ALCTN_DE = TO_DATETIME(TO_CHAR(#alctnDe#,'YYYY-MM-DD')) + , ALCTN_MONTH = #alctnMonth# + , OFFICE_WORK_DE = TO_DATETIME(TO_CHAR(#officeWorkDe#,'YYYY-MM-DD')) + , RPRT_DE = TO_DATETIME(TO_CHAR(#rprtDe#,'YYYY-MM-DD')) + , RPRT_MONTH = #rprtMonth# + , PROCESS_DAY = #processDay# + , COURT_FLD = #courtFld# + , ACCDNT_CN = #accdntCn# + , APLCN_INFO = #aplcnInfo# + , RSPND_INFO = #rspndInfo# + , APLCN_DPTY = #aplcnDpty# + , RSPND_DPTY = #rspndDpty# + , COURT_RSLT = #courtRslt# + , COURT_DETAIL_RSLT = #courtDetailRslt# + , ADJ_CMSNR = #adjCmsnr# + , PAY = #pay# + , APP_DE = #appDe# + , PYMNT_DAY = #pymntDay# + , EXTNS = #extns# + , RMRKS = #rmrks# + , LAST_UPDT_PNTTM = NOW() + , LAST_UPDUSR_ID = #frstRegisterId# + where + COURT_SEQ = #courtSeq# + diff --git a/src/main/resources/rebel.xml b/src/main/resources/rebel.xml index c2e2c0bc..fd1249fe 100644 --- a/src/main/resources/rebel.xml +++ b/src/main/resources/rebel.xml @@ -7,20 +7,20 @@ - + - + - + - + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnDetail.jsp new file mode 100644 index 00000000..5dc53d07 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnDetail.jsp @@ -0,0 +1,242 @@ +<%@ 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"%> + + + + +법원연계조정관리 - 상세 + + + + + + + +
+ + + " /> + " /> + " /> +
+
+ " /> +
+ +
+
+ +
+

법원연계조정상세

+
    +
    • +
  • +

    법원연계조정관리

    +
    • +
  • +

    법원연계조정목록

    +
    • +
  • 법원연계조정상세
    • +
+
+ + + +
+
+ +
+

조정 사건

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
번호 + +
결정일자 + + 수령일자 + +
배당일자 + + 배당월 + +
사무처리기한 + +
보고일자 + + 보고월 + +
소요일 + +
본 사건번호 + + 조정 사건번호 + +
분야 + +
신청인 정보 + +
피신청인 정보 + +
원고/
신청인(대리인)		 + +
피고/
피신청인(대리인)		 + +
사건내용 + +
결과 + +
세부결과 + +
조정위원 + + 수당금액 + +
대면기일 + +
지급일자 + + 1차연장 + +
비고 + +
+
+ +
+
+
+ + +
+
+
+
+
+
+ + + 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 9b043fbe..3f8535b8 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnList.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnList.jsp @@ -44,14 +44,14 @@ function linkPage(pageNo){ function fn_Create(){ var goForm = document.goForm; - goForm.adrSeq.value = ""; goForm.submit(); } -function fn_goDetail(adrSeq){ +function fn_goDetail(courtSeq){ var goForm = document.goForm; - goForm.adrSeq.value = adrSeq; + goForm.action = ""; + goForm.courtSeq.value = courtSeq; goForm.submit(); } @@ -59,8 +59,8 @@ function fn_goDetail(adrSeq){
- - "/> + + "/>
@@ -91,60 +91,35 @@ function fn_goDetail(adrSeq){

구분

- +
  • -

    조정상태

    -
    - - - - - - checked > - - - - checked > - - - - checked > - - - - checked > - - -
    -
    • -
  • -

    신청일자

    +

    결정일자

    - + - + - + - +
    - +
    ~
    - +
    @@ -189,66 +164,54 @@ function fn_goDetail(adrSeq){
    - - - + + + + - + + - - - - - - - - + + + + + + - ')"> + + + + + + + + + + ')"> - - - - - -<%-- --%> - - - + + + + + + - + @@ -271,7 +234,7 @@ function fn_goDetail(adrSeq){ " method="post"> - + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnModify.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnModify.jsp new file mode 100644 index 00000000..9ec66f83 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnModify.jsp @@ -0,0 +1,358 @@ +<%@ 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"%> + + + + +법원연계조정관리 - 수정 + + + + + + +
    + + + " /> + " /> + " /> + + +
    +
    + +
    +

    법원연계조정수정

    +
      +
      • +
    • +

      법원연계조정관리

      +
      • +
    • +

      법원연계조정목록

      +
      • +
    • 법원연계조정수정
      • +
    +
    + + + +
    + "> +
    + +
    +

    조정 사건

    +
    +
    번호조정번호신청인피신청인조사관조정부저작물종류조정결과작성여부조정 사건번호분야결과사건번호조정위원결정일자
    - - - - - - - ')" title="상세페이지로 이동"> - - - - - - - - - - - - - 작성중 - - - 작성완료 - - + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    번호 +

    + "/> +

    +
    결정일자 +
    + " data-datecontrol="true"> +
    + + +
    +
    +     		수령일자 +
    + " data-datecontrol="true"> +
    + + +
    +
    +
    배당일자 +
    + " data-datecontrol="true" onchange="test(this);"> +
    + + +
    +
    +     		배당월 + +
    사무처리기한 +
    + " data-datecontrol="true"> +
    + + +
    +
    +
    보고일자 +
    + " data-datecontrol="true"> +
    + + +
    +
    +     		보고월 + + +<%-- --%> +<%-- --%> +<%-- --%> + + " placeholder="보고일자 선택" /> +
    소요일 + " placeholder=""/> +
    본 사건번호 + " /> + 조정 사건번호 + " /> +
    분야 + " /> +
    신청인 정보 + +
    피신청인 정보 + +
    원고/
    신청인(대리인)    		 + +
    피고/
    피신청인(대리인)    		 + +
    사건내용 + +
    결과 + "/> +
    세부결과 + +
    조정위원 + " /> + 수당금액 + " /> +
    대면기일 + " size="98" /> +
    지급일자 + " /> + 1차연장 + " /> +
    비고 + +
    +
    + +
    +
    +
    + + +
    +
    +
    +
    + +
    + + + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnRegist.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnRegist.jsp index 26436f56..7a573213 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnRegist.jsp @@ -74,8 +74,7 @@ function fn_regist(){ alert(data.data); if(data.status == 'OK') { - $('#adrSeqHidden').val(data.dataSub); - $('#nextGoPageForm').submit(); + $('#goListForm').submit(); } else if(data.status == 'Unauthorized' || data.status == 'BAD_REQUEST') { @@ -102,7 +101,8 @@ function fn_GoList(){ -
    + + " />