From e2e2b0d01e975c73805f905b13550648a22ad112 Mon Sep 17 00:00:00 2001 From: hylee Date: Mon, 26 Sep 2022 11:45:24 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20=EA=B3=BC=EA=B1=B0=EC=82=AC?= =?UTF-8?q?=EA=B1=B4=EC=9D=B4=EB=A0=A5=20=EC=A7=84=ED=96=89=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/AdjReqMgrPastServiceImpl.java | 42 +- .../web/AdjReqMgrPastController.java | 8 +- .../adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml | 8 +- src/main/resources/rebel.xml | 6 +- .../adjReqMgrPastBasicRegist.jsp | 2 +- .../adjReqMgrPastFileRegist_backup.jsp | 530 ++++++++++++++++++ .../adjReqMgrPast/adjReqMgrPastProgRegist.jsp | 27 +- .../jsp/kccadr/adjReqMgrPast/drtRegPop.jsp | 57 +- .../jsp/kccadr/adjReqMgrPast/drtUpdtPop.jsp | 22 +- 9 files changed, 613 insertions(+), 89 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastFileRegist_backup.jsp diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java index 5e097bc4..478752c6 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java @@ -553,15 +553,15 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements @Override public ResponseEntity checkNUpdateAprvlPastAjax(AdjReqMgrPastVO adjPastVO) throws Exception { - System.out.println(" 조정기일일 :: "+adjPastVO.getAppDeDay()); - System.out.println(" 조정기일시 :: "+adjPastVO.getAppDeTime()); - System.out.println(" 다음조정기일일 :: "+adjPastVO.getNextAppDeDay()); - System.out.println(" 다음조정기일시 :: "+adjPastVO.getNextAppDeTime()); - System.out.println(" 조정기일장소 :: "+adjPastVO.getAppPlaceTx()); - System.out.println(" 기일조서내용 :: "+adjPastVO.getPrtclCn()); - System.out.println(" 장소 Type :: "+adjPastVO.getAppPlaceTy()); - System.out.println(" 장소 :: "+adjPastVO.getAppPlaceTx()); - System.out.println(" 공개여부 :: "+adjPastVO.getOpenYn()); +// System.out.println(" 조정기일일 :: "+adjPastVO.getAppDeDay()); +// System.out.println(" 조정기일시 :: "+adjPastVO.getAppDeTime()); +// System.out.println(" 다음조정기일일 :: "+adjPastVO.getNextAppDeDay()); +// System.out.println(" 다음조정기일시 :: "+adjPastVO.getNextAppDeTime()); +// System.out.println(" 조정기일장소 :: "+adjPastVO.getAppPlaceTx()); +// System.out.println(" 기일조서내용 :: "+adjPastVO.getPrtclCn()); +// System.out.println(" 장소 Type :: "+adjPastVO.getAppPlaceTy()); +// System.out.println(" 장소 :: "+adjPastVO.getAppPlaceTx()); +// System.out.println(" 공개여부 :: "+adjPastVO.getOpenYn()); try { this.updateAdjAssAndDataCleansing(adjPastVO); @@ -570,8 +570,8 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements e.printStackTrace(); } -// this.updateAdrPrtclMgrAndDataCleansing(adjPastVO); - return ResponseEntity.ok(new RestResponse(HttpStatus.OK, "기일조서 등록이 완료되었습니다.", LocalDateTime.now())); + this.updateAdrPrtclMgrAndDataCleansing(adjPastVO); + return ResponseEntity.ok(new RestResponse(HttpStatus.OK, "기일조서 수정이 완료되었습니다.", LocalDateTime.now())); } @@ -686,6 +686,7 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements adjAssMgrPastVO = new AdjAssMgrPastVO(adjPastVO); adjAssMgrPastVO.setAssPstSeq(addusrList.split("\\|")[0]); adjAssMgrPastVO.setAddYn(addusrList.split("\\|")[1]); + adjReqMgrPastDAO.updateAdjAss(adjAssMgrPastVO); } @@ -723,13 +724,20 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements public AdjReqMgrPastVO findByIdPrtclMgr(AdjReqMgrPastVO adjReqMgrPastVO) { AdjReqMgrPastVO adjPastVO = adjReqMgrPastDAO.findByIdPrtclMgr(adjReqMgrPastVO); - adjPastVO.setAppDeDay(adjPastVO.getAppDe().split(" ")[0]); - String appTime = adjPastVO.getAppDe().split(" ")[1]; - adjPastVO.setAppDeTime(appTime.substring(0, appTime.lastIndexOf(":"))); + if(StringUtils.isNotEmpty(adjPastVO.getAppDe())) + { + adjPastVO.setAppDeDay(adjPastVO.getAppDe().split(" ")[0]); + String appTime = adjPastVO.getAppDe().split(" ")[1]; + adjPastVO.setAppDeTime(appTime.substring(0, appTime.lastIndexOf(":"))); + } + + if(StringUtils.isNotEmpty(adjPastVO.getNextAppDe())) + { + adjPastVO.setNextAppDeDay(adjPastVO.getNextAppDe().split(" ")[0]); + String appNextTime = adjPastVO.getNextAppDe().split(" ")[1]; + adjPastVO.setNextAppDeTime(appNextTime.substring(0, appNextTime.lastIndexOf(":"))); + } - adjPastVO.setNextAppDeDay(adjPastVO.getNextAppDe().split(" ")[0]); - String appNextTime = adjPastVO.getNextAppDe().split(" ")[1]; - adjPastVO.setNextAppDeTime(appNextTime.substring(0, appTime.lastIndexOf(":"))); return adjPastVO; } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java index 62af11eb..6e0e8e4d 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java @@ -190,8 +190,8 @@ public class AdjReqMgrPastController { public String adjReqMgrPastFileRegist(@ModelAttribute("adjReqMgrPastVO") AdjReqMgrPastVO adjReqMgrPastVO, ModelMap model) throws Exception { //TODO 테스트로 인한 seq 코딩 - adjReqMgrPastVO.setAdrSeq("ADR_0000000000002920"); - System.out.println("adjReqMgrPastVO.getAdrSeq() !!! : "+ adjReqMgrPastVO.getAdrSeq()); +// adjReqMgrPastVO.setAdrSeq("ADR_0000000000002920"); +// System.out.println("adjReqMgrPastVO.getAdrSeq() !!! : "+ adjReqMgrPastVO.getAdrSeq()); model.addAttribute("adjReqMgrPastVO", adjReqMgrPastVO); // PgrCmmVO cmmVO = new PgrCmmVO(); @@ -262,7 +262,9 @@ public class AdjReqMgrPastController { @RequestMapping("/kccadr/adjReqMgOff/popup/drtUpdtPop.do") public String drtUpdtPop(AdjReqMgrPastVO adjReqMgrPastVO, ModelMap model) throws Exception { - AdjReqMgrPastVO adjPastVO = adjReqMgrPastService.findByIdPrtclMgr(adjReqMgrPastVO); + AdjReqMgrPastVO adjPastVO = new AdjReqMgrPastVO(); + + adjPastVO = adjReqMgrPastService.findByIdPrtclMgr(adjReqMgrPastVO); System.out.println(" adjPastVO.getPrtclCn() :: " + adjPastVO.getPrtclCn()); diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml index 1d578185..db3abb9d 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml @@ -418,12 +418,14 @@ - + UPDATE ADR_ASS_MGR_PST SET ADD_YN = #addYn# + , ASS_PST_USR_NM = #assPstUsrNm# + , LAST_UPDUSR_ID = #lastUpdusrId# , LAST_UPDT_PNTTM = NOW() WHERE @@ -440,7 +442,9 @@ , app_place_ty = #appPlaceTy# , app_place = #appPlace# , next_app_de_yn = #nextAppDeYn# - , next_app_de = TO_DATETIME(TO_CHAR(#nextAppDe#,'YYYY-MM-DD HH24:MI')) + + , next_app_de = TO_DATETIME(TO_CHAR(#nextAppDe#,'YYYY-MM-DD HH24:MI')) + , prtcl_cn = #prtclCn# , sbmt_yn = #sbmtYn# , appr_yn = #apprYn# diff --git a/src/main/resources/rebel.xml b/src/main/resources/rebel.xml index 0e85c739..c2e2c0bc 100644 --- a/src/main/resources/rebel.xml +++ b/src/main/resources/rebel.xml @@ -7,18 +7,18 @@ - + - + - + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist.jsp index 4c3e3672..72ea1192 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist.jsp @@ -1395,7 +1395,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastFileRegist_backup.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastFileRegist_backup.jsp new file mode 100644 index 00000000..e87e4237 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastFileRegist_backup.jsp @@ -0,0 +1,530 @@ + +<%@ page language="java" contentType="text/html; charset=utf-8" + pageEncoding="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="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt_rt" %> +<% + /** + * @Class Name : AdjustDeptManagerList.jsp + * @Description : 조정부관리 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2021.08.09 김봉호 최초 생성 + * @author 김봉호 + * @since 2021.08.21 + * @version 1.0 + * @see + * + */ +%> + + + + +사건관련문서 등록 + + + +
+ + " /> +<%-- " /> --%> +<%-- " /> --%> + +<%-- " /> --%> +<%-- " /> --%> + +<%-- " /> --%> +<%-- " /> --%> + <%-- " /> --%> + +
+ +
+
+ + +
+

사건관련문서 등록

+
    +
    • +
  • +

    오프라인 조정관리

    +
    • +
  • +

    과거사건등록

    +
    • +
  • 사건관련문서 등록
    • +
+
+ + +
+ +
+ <%--

총 진행 회차 : 건

--%> + +
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
사건문서 등록 : 신청인, 피신청인, 관리자가 사건에 관련된 첨부파일을 등록한다.
+

문서 구분

+ 		+

+ +

+
+

사건문서 등록인 구분

+ 		+

+ +

+
+

내용

+ 		+ + +
+

첨부서류

+ 		+ + + +

* 첨부파일을 등록해 주세요. (최대3개)

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

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

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

상대방공개여부

+ 		+
+ + + + + + + + +
+
+ +
+ + +
+ +
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%--
+
+ + +
+

사건관련문서 등록

+
    +
    • +
  • +

    오프라인 조정관리

    +
    • +
  • +

    과거사건등록

    +
    • +
  • 사건관련문서 등록
    • +
+
+ + +
+ +
+

총 진행 회차 : 건

+
+ + +
+ + + + + + + + + + + + + + + + + + + + +
회차결과등록/수정
+ 1 + + 해당 차수의 정보를 등록해 주세요 + + +
+
+ +
+
+
+ + --%> \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastProgRegist.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastProgRegist.jsp index 873ce1c9..7f3f8d83 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastProgRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastProgRegist.jsp @@ -96,6 +96,14 @@ $(document).ready(function(){ }); +function fn_nextGoPageForm(){ + + if (confirm('다음 단계로 이동하시겠습니까?')) { + $('#nextGoPageForm').submit(); + } + +} + 사건진행정보 @@ -190,19 +198,20 @@ $(document).ready(function(){ - - - - - - - -<%-- --%> - +
+
+
+
+ +
+
+
+ +
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/drtRegPop.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/drtRegPop.jsp index 4e735cb3..cc8bcd2f 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/drtRegPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/drtRegPop.jsp @@ -116,19 +116,15 @@ processData : false, contentType : false, cache : false, - success : function(returnData, status) { - if (returnData.result == 'success') { - if(isEmpty(p_param)){ - alert("기일조서이 등록 되었습니다."); - fncGoList(); //상세 - }else{ - fnc_aprvl_step_1(p_param); - } - } else { - alert(returnData.message); + success : function(returnData) { + console.log('returnData : ', returnData); + + alert(returnData.data); + if(returnData.status == 'OK') + { + opener.location.reload(); + fncClose(); } - - }, error : function(e) { alert("기일조서에 실패하였습니다."); @@ -208,37 +204,6 @@ return true; } - //결재 처리 1단계 - function fnc_aprvl_step_1(p_param){ - - //adr_seq, adr_sn + 하기 sbmtTy, sbmtTyCd 값 4개 필수입니다. - var data = new FormData(document.getElementById("approval")); - data.append("sbmtTy" ,p_param); - data.append("sbmtTyCd" ,p_param); - - - $.ajax({ - type: "POST", - url: "/kccadr/adjReqMgOff/checkNInsertAprvlPastAjax.do", - data: data, - dataType:'json', - async: false, - processData: false, - contentType: false, - cache: false, - success: function (returnData, status) { - console.log(returnData.result); - //alert(returnData.result); - if(returnData.result == 'SUCCESS'){ - alert('성공적으로 승인요청하였습니다.'); - fncGoList(); //상세 - }else{ - alert(returnData.message); - } - }, - error: function (e) { alert("요청에 실패하였습니다."); console.log("ERROR : ", e); } - }); - } function srcAss(idx) { $('#assIdx').val(idx); @@ -257,6 +222,10 @@ $('#addChgYn' + assIdx).val('Y'); } + function fncClose(){ + window.close(); + } + @@ -538,7 +507,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/drtUpdtPop.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/drtUpdtPop.jsp index b8203ea2..666b7f8e 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/drtUpdtPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/drtUpdtPop.jsp @@ -119,13 +119,12 @@ contentType : false, cache : false, success : function(returnData) { - if (returnData.result == 'success') { - alert(returnData); - } else { - alert(returnData.message); + alert(returnData.data); + + if(returnData.status == 'OK') + { + fncClose(); } - - }, error : function(e) { alert("기일조서에 실패하였습니다."); @@ -204,7 +203,10 @@ return true; } - + + function fncClose(){ + window.close(); + } @@ -468,8 +470,8 @@ - - + + @@ -491,7 +493,7 @@
- +