From 7359e9ebe05377c055e647b270e0b87c1f344855 Mon Sep 17 00:00:00 2001 From: tolag3 Date: Wed, 17 Jan 2024 17:52:26 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A4=80=ED=98=B8=20=EB=B2=95?= =?UTF-8?q?=EC=9B=90=EC=97=B0=EA=B3=84=20=EA=B0=9C=EB=B0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/AdjCourtCnctnService.java | 4 + .../service/impl/AdjCourtCnctnDAO.java | 4 + .../impl/AdjCourtCnctnServiceImpl.java | 39 +++ .../web/AdjCourtCnctnController.java | 26 ++ .../impl/EgovUserManageServiceImpl.java | 4 +- .../adjCourtCnctn/AdjCourtCnctn_SQL_Mysql.xml | 42 +++ .../let/uss/umt/EgovUserManage_SQL_Mysql.xml | 8 +- .../jsp/cmm/uss/umt/EgovUserSelectUpdt.jsp | 2 +- .../adjCourtCnctn/adjCourtCnctnDetailTab1.jsp | 35 +- .../adjCourtCnctn/adjCourtCnctnList.jsp | 46 --- .../adjCourtCnctn/adjCourtCnctnModify.jsp | 304 ++++++++---------- .../adjCourtCnctn/adjCourtCnctnRegist.jsp | 2 +- .../pop/adjCourtCnctnFilePop.jsp | 176 ++++++++++ 13 files changed, 446 insertions(+), 246 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/pop/adjCourtCnctnFilePop.jsp diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnService.java b/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnService.java index 1fbc9b00..18149405 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnService.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnService.java @@ -9,6 +9,8 @@ import kcc.kccadr.cmm.RestResponse; public interface AdjCourtCnctnService { RestResponse insertCourtCnctn(AdjCourtCnctnVO adjCourtCnctnVO, final MultipartHttpServletRequest multiRequest) throws Exception; + + RestResponse insertCourtCnctnFile(AdjCourtCnctnVO adjCourtCnctnVO, final MultipartHttpServletRequest multiRequest) throws Exception; int adjCourtCnctnListCount(AdjCourtCnctnVO adjCourtCnctnVO) throws Exception; @@ -24,6 +26,8 @@ public interface AdjCourtCnctnService { public void insertCourtDept(AdjCourtDeptVO adjCourtDeptVO) throws Exception; + public void updateCourtDept(AdjCourtDeptVO adjCourtDeptVO) throws Exception; + public List selectAdjCourtCnctniDeptPop() throws Exception; RestResponse insertAdjCourtCnctnDeptPopAjax(AdjCourtDeptVO deptVO) throws Exception; 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 1b61fc69..1e181d32 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnDAO.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnDAO.java @@ -46,6 +46,10 @@ public class AdjCourtCnctnDAO extends EgovAbstractDAO { insert("adjCourtCnctnDAO.insertCourtDept", adjCourtDeptVO); } + public void updateCourtDept(AdjCourtDeptVO adjCourtDeptVO) { + update("adjCourtCnctnDAO.updateCourtDept", adjCourtDeptVO); + } + public List selectAdjCourtCnctniFileList(AdjCourtCnctnVO adjCourtCnctnVO) { return (List) list("adjCourtCnctnDAO.selectAdjCourtCnctniFileList", 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 c6521520..12c12057 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnServiceImpl.java @@ -117,6 +117,16 @@ public class AdjCourtCnctnServiceImpl extends EgovAbstractServiceImpl implements public RestResponse updateCourtCnctn(AdjCourtCnctnVO adjCourtCnctnVO) { try { adjCourtCnctnDAO.updateCourtCnctn(adjCourtCnctnVO); + + AdjCourtDeptVO adjCourtDeptVO = new AdjCourtDeptVO(); + + adjCourtDeptVO.setCrtSeq(adjCourtCnctnVO.getCrtSeq()); + adjCourtDeptVO.setLastUpdusrId(adjCourtCnctnVO.getLastUpdusrId()); + adjCourtDeptVO.setCrtLinkHouse(adjCourtCnctnVO.getCrtLinkHouse()); + adjCourtDeptVO.setCrtDeptTy("10"); + + adjCourtCnctnDAO.updateCourtDept(adjCourtDeptVO); + } catch (Exception e) { return new RestResponse(HttpStatus.BAD_REQUEST, "수정에 실패하였습니다.", LocalDateTime.now()); } @@ -137,6 +147,11 @@ public class AdjCourtCnctnServiceImpl extends EgovAbstractServiceImpl implements adjCourtCnctnDAO.insertCourtDept(adjCourtDeptVO); } + @Override + public void updateCourtDept(AdjCourtDeptVO adjCourtDeptVO) { + adjCourtCnctnDAO.updateCourtDept(adjCourtDeptVO); + } + @Override public List selectAdjCourtCnctniDeptPop() { return adjCourtCnctnDAO.selectAdjCourtCnctniDeptPop(); @@ -222,4 +237,28 @@ public class AdjCourtCnctnServiceImpl extends EgovAbstractServiceImpl implements adjCourtCnctnDAO.updateAdjCourtCnctnEnd(adjCourtCnctnVO); return new RestResponse(HttpStatus.OK, "등록 되었습니다.", LocalDateTime.now()); } + + @Override + public RestResponse insertCourtCnctnFile(AdjCourtCnctnVO adjCourtCnctnVO, final MultipartHttpServletRequest multiRequest) { + try { + + final Map files = multiRequest.getFileMap(); + List result = fileUtil.parseFileInf(files, "CRT_", 0, "", "", ""); + String atchFileId = fileMngService.insertFileInfs(result); + adjCourtCnctnVO.setCrtAtchFileId(atchFileId); + + AdrCourtFileVO adrCourtFileVO = new AdrCourtFileVO(); + + adrCourtFileVO.setCrtSeq(adjCourtCnctnVO.getCrtSeq()); + adrCourtFileVO.setCrtSn(adjCourtCnctnVO.getCrtSn()); + adrCourtFileVO.setCrtAtchFileId(atchFileId); + adrCourtFileVO.setCrtAtchFileTy(adjCourtCnctnVO.getCrtAtchFileTy()); + adrCourtFileVO.setFrstRegisterId(adjCourtCnctnVO.getFrstRegisterId()); + + adrCourtFileMngService.insertCourtFileInf(adrCourtFileVO); + } 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 cf1ab35d..1629d823 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java @@ -16,6 +16,9 @@ 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.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; @@ -107,11 +110,34 @@ public class AdjCourtCnctnController { @RequestMapping("/kccadr/adjCourtCnctn/adjCourtCnctnDetailTab1.do") public String adjCourtCnctnDetailTab1(@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/adjCourtCnctnDetailTab1"; } + @RequestMapping(value = "/kccadr/adjCourtCnctn/popup/adjCourtCnctnFilePop.do") + public String adjCourtCnctnFilePop(@ModelAttribute("adjCourtCnctnVO") AdjCourtCnctnVO adjCourtCnctnVO, ModelMap model) throws Exception { + + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated() ? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser() : null; + String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId()); + + model.addAttribute("userId", userId); + + return "kccadr/adjCourtCnctn/pop/adjCourtCnctnFilePop"; + } + + + @RequestMapping("/kccadr/adjCourtCnctn/popup/adjCourtCnctnFilePopAjax.do") + public ResponseEntity adjCourtCnctnFilePopAjax(final MultipartHttpServletRequest multiRequest, AdjCourtCnctnVO adjCourtCnctnVO) throws Exception { + + LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser(); + adjCourtCnctnVO.setFrstRegisterId(loginVO.getUniqId()); + return ResponseEntity.ok().body(adjCourtCnctnService.insertCourtCnctnFile(adjCourtCnctnVO, multiRequest)); + } + @RequestMapping("/kccadr/adjCourtCnctn/adjCourtCnctnModify.do") public String adjCourtCnctnModify(@ModelAttribute("adjCourtCnctnVO") AdjCourtCnctnVO CourtVO, ModelMap model) throws Exception { diff --git a/src/main/java/kcc/let/uss/umt/service/impl/EgovUserManageServiceImpl.java b/src/main/java/kcc/let/uss/umt/service/impl/EgovUserManageServiceImpl.java index d2474652..8d834bf2 100644 --- a/src/main/java/kcc/let/uss/umt/service/impl/EgovUserManageServiceImpl.java +++ b/src/main/java/kcc/let/uss/umt/service/impl/EgovUserManageServiceImpl.java @@ -204,7 +204,9 @@ public class EgovUserManageServiceImpl extends EgovAbstractServiceImpl implement userManageVO.setPassword(pass); int chkCourt_link_house_cnt = userManageDAO.selectUserCourtCnt(userManageVO); - + if(!"90".equals(userManageVO.getOfcpsNm())) { + userManageVO.setInsttCode("00"); + } if(chkCourt_link_house_cnt > 0) { return false; } 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 ed7f2371..ece6ebda 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 @@ -404,6 +404,17 @@ FROM lettnemplyrinfo a WHERE a.pstinst_code = #crtLinkHouse# + + + + UPDATE adr_court_dept_mgr a, lettnemplyrinfo b + SET a.esntl_id = b.esntl_id, + a.last_updusr_id = #lastUpdusrId#, + a.last_updt_pnttm = now() + WHERE a.crt_seq = #crtSeq# + AND a.crt_dept_ty = '10' + AND b.pstinst_code = #crtLinkHouse#; + @@ -435,7 +436,12 @@ ORGNZT_ID = #orgnztId# , - PSTINST_CODE = #insttCode# , + + PSTINST_CODE = null , + + + PSTINST_CODE = #insttCode# , + EMPLYR_STTUS_CODE = #emplyrSttusCode# , diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovUserSelectUpdt.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovUserSelectUpdt.jsp index bb21c28f..e2830d8e 100644 --- a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovUserSelectUpdt.jsp +++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovUserSelectUpdt.jsp @@ -504,7 +504,7 @@ function authorChangeCourt(){ 연계법원 - + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnDetailTab1.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnDetailTab1.jsp index be1c55c6..0a4e3bcd 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnDetailTab1.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnDetailTab1.jsp @@ -44,18 +44,15 @@ }); } - - function fncCheckAll(obj, name) { - - $("input[name=" + name + "]").each(function(index, item) { - item.checked = $(obj).is(":checked") - }) - } - function fncDocRegPopup(){ + function fncFileDown(atchFileId, fileSn){ + window.open("/cmm/fms/FileDown.do?atchFileId=" + atchFileId + "&fileSn=" + fileSn); + } + + function adjCourtCnctnFilePop(){ var pop = document.pop ; - commonPopWindowopenForm("/kccadr/adjPgrMgr/apm/popup/docRegPop.do" , "750", "550", "docRegPop", $("#pop")); + commonPopWindowopenForm("/kccadr/adjCourtCnctn/popup/adjCourtCnctnFilePop.do" , "750", "550", "docRegPop", $("#pop")); } @@ -83,7 +80,7 @@ 일자 - 일자 + 문서 구분 문서 명 @@ -91,19 +88,19 @@ + + +<%-- --%> + + -

- -

+

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

 -

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

+ - - - - + @@ -120,7 +117,7 @@
- +
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 e229af4b..ad88e2a3 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnList.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnList.jsp @@ -77,52 +77,6 @@ function fn_goDetail(crtSeq){ - <%--
  • -

    결정일자

    -
    - - - - - - - - - - - - - - - - - - - - -
    -
    - -
    - - -
    -
    - ~ -
    - -
    - - -
    -
    -
    -
    -
    • --%> diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnModify.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnModify.jsp index 9ec66f83..3dd3af67 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnModify.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnModify.jsp @@ -12,66 +12,65 @@ -법원연계조정관리 - 수정 +법원연계 조정 등록 + 사건문서 등록 + + + + + +
    + + + + +
    +
    + + + + + + + + + + + + + + + + +
    사건문서 등록 : 신청인, 피신청인, 관리자가 사건에 관련된 첨부파일을 등록한다.
    +

    문서 구분

    +     		+

    + +

    +
    +

    첨부서류

    +     		+ + +
    + + + + + + + + + + + + + + + + + + + +
    첨부파일 리스트 : 파일명, 종류, 크기, 삭제
    작업명종류크기삭제
    +

    첨부하실 파일을 마우스로 끌어서 넣어주세요.

    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + +
    첨부파일 리스트 : 파일명, 종류, 크기, 삭제
    파일 명종류크기삭제
    + + + "> + + "> + + +
    +
    +
    + +
    + + +
    + +
    +
    + +
    + +