From e2e2b0d01e975c73805f905b13550648a22ad112 Mon Sep 17 00:00:00 2001 From: hylee Date: Mon, 26 Sep 2022 11:45:24 +0900 Subject: [PATCH 1/9] =?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 @@
- +
From 837f235efbc38d432d8bf2230c62dbe30f667b83 Mon Sep 17 00:00:00 2001 From: hylee Date: Mon, 26 Sep 2022 11:46:39 +0900 Subject: [PATCH 2/9] =?UTF-8?q?refactor:=EC=B2=B4=ED=97=98=ED=95=98?= =?UTF-8?q?=EA=B8=B0=20=EC=8B=A0=EC=B2=AD=20=EB=A7=88=EC=A7=80=EB=A7=89?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=EC=97=90=EC=84=9C=20=EB=AA=A9?= =?UTF-8?q?=EB=A1=9D=EC=9C=BC=EB=A1=9C=20=EC=9D=B4=EB=8F=99=20URL=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/kccadr/adjstExp/adjstReqRegistStep3.jsp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep3.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep3.jsp index c0ebb730..c939bc27 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep3.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep3.jsp @@ -125,7 +125,9 @@ $( document ).ready(function(){ - + @@ -136,7 +138,9 @@ $( document ).ready(function(){ - + @@ -216,9 +220,9 @@ $( document ).ready(function(){ -
- - + +<%-- --%> +<%-- --%>
From 1f69c001c1eec63717aca04eb1227255a0720353 Mon Sep 17 00:00:00 2001 From: hylee Date: Mon, 26 Sep 2022 11:48:14 +0900 Subject: [PATCH 3/9] =?UTF-8?q?refactor:dir=20=EA=B2=BD=EB=A1=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/rebel.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/rebel.xml b/src/main/resources/rebel.xml index c2e2c0bc..0e85c739 100644 --- a/src/main/resources/rebel.xml +++ b/src/main/resources/rebel.xml @@ -7,18 +7,18 @@ - + - + - + From ee375cd616fe40708abf965ac1a2f5ba4e29fe24 Mon Sep 17 00:00:00 2001 From: HappyITN Date: Mon, 26 Sep 2022 14:38:02 +0900 Subject: [PATCH 4/9] =?UTF-8?q?220926=20#2747=20=EA=B3=BC=EA=B1=B0?= =?UTF-8?q?=EC=82=AC=EA=B1=B4=EB=93=B1=EB=A1=9D=20-=20=EC=82=AC=EA=B1=B4?= =?UTF-8?q?=EA=B4=80=EB=A0=A8=EB=AC=B8=EC=84=9C=20=EB=93=B1=EB=A1=9D=20?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=9E=91=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adjReqMgrPast/adjReqMgrPastFileRegist.jsp | 312 ++++++++---------- 1 file changed, 138 insertions(+), 174 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastFileRegist.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastFileRegist.jsp index e87e4237..76152ab6 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastFileRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastFileRegist.jsp @@ -233,6 +233,16 @@ function fn_testPageAlert(){ } + 사건관련문서 등록 @@ -280,157 +290,138 @@ function fn_testPageAlert(){
- - - - - - - - - - - - - - - - - - - - - - - + + +
사건문서 등록 : 신청인, 피신청인, 관리자가 사건에 관련된 첨부파일을 등록한다.
-

문서 구분

- 		-

- -

-
-

사건문서 등록인 구분

- 		-

- -

-
-

내용

- 		- - -
-

첨부서류

- 		- - - -

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

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

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

-
-
-
- - - - - - - - - - - - - - - - - - - - - - - +
첨부파일 추가 리스트 : 파일명, 종류, 크기, 삭제
파일 명종류크기삭제
- - - "> - - - - "> - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - -
일자유형문서삭제
+
+ +
+ + +
+
+ 		+ + + +
+ + +
+ + + + + + + + + + + + + + + + + - - -
첨부파일 추가 리스트 : 파일명, 종류, 크기, 삭제
파일 명종류크기삭제
+

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

-
-
-

상대방공개여부

- 		-
- - - - - - - - -
-
- -
- - -
- +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
첨부파일 추가 리스트 : 파일명, 종류, 크기, 삭제
파일 명종류크기삭제
+ + + "> + + + + "> + + + + +
+
+
+ +
+
+ +
+
+ +
+
+ @@ -440,33 +431,6 @@ function fn_testPageAlert(){ - - - - - - - - - - - - - - - - - - - - - - - - - - - <%--
From 1c48a1540a84a039aabf2d21ec773b02479c10ac Mon Sep 17 00:00:00 2001 From: hylee Date: Mon, 26 Sep 2022 14:50:26 +0900 Subject: [PATCH 5/9] =?UTF-8?q?refacotr:=20=EA=B3=BC=EA=B1=B0=EC=82=AC?= =?UTF-8?q?=EA=B1=B4=EB=93=B1=EB=A1=9D=20=EC=9D=B4=EB=A0=A5=20=EB=93=B1?= =?UTF-8?q?=EB=A1=9D=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=A7=84=ED=96=89?= =?UTF-8?q?=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/AdjReqMgrPastVO.java | 11 +- .../web/AdjReqMgrPastController.java | 24 +- .../adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml | 12 +- .../adjReqMgrPast/adjReqMgrPastProgRegist.jsp | 4 +- .../adjReqMgrPastRecordRegist.jsp | 291 ++++++++++++++++++ 5 files changed, 336 insertions(+), 6 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastRecordRegist.jsp diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastVO.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastVO.java index 093fe457..9b9c885f 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastVO.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastVO.java @@ -172,7 +172,8 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable { private String appPlace; //조정기일장소명 private String nextAppDeYn; //다음기일차후지정여부 - private String appResultTy; //기일결과 구분 + private String appResultTy; //기일결과 구분 code + private String appResultTx; //기일결과 구분 text private String memDeptNm; //조정부명 @@ -1229,6 +1230,14 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable { public void setAddUsrNmList(String[] addUsrNmList) { this.addUsrNmList = addUsrNmList; } + + public String getAppResultTx() { + return appResultTx; + } + + public void setAppResultTx(String appResultTx) { + this.appResultTx = appResultTx; + } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java index 6e0e8e4d..905d3a12 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java @@ -289,7 +289,29 @@ public class AdjReqMgrPastController { return "/kccadr/adjReqMgrPast/drtUpdtPop"; } - + + /** + * @methodName : adjReqMgrPastProgRegist + * @author : 이호영 + * @date : 2022.09.15 + * @description : 사건진행정보 목록 + * @param adjReqMgrPastVO + * @param model + * @return + * @throws Exception + */ + @RequestMapping("/kccadr/adjReqMgOff/adjReqMgrPastRecordRegist.do") + public String adjReqMgrPastRecordRegist(@ModelAttribute("adjReqMgrPastVO") AdjReqMgrPastVO adjReqMgrPastVO, ModelMap model) throws Exception { + + //TODO 테스트로 인한 seq 코딩 + adjReqMgrPastVO.setAdrSeq("ADR_0000000000002920"); + System.out.println("adjReqMgrPastVO.getAdrSeq() !!! : "+ adjReqMgrPastVO.getAdrSeq()); + + model.addAttribute("adjReqMgrPastVO", adjReqMgrPastVO); + + + return "kccadr/adjReqMgrPast/adjReqMgrPastRecordRegist"; + } 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 db3abb9d..44fbac9f 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 @@ -27,6 +27,7 @@ + @@ -334,8 +335,15 @@ , frst_register_id , last_updt_pnttm , last_updusr_id - , app_result_ty - FROM adr_prtcl_mgr + , app_result_ty + , ( + SELECT + CODE_NM + FROM + LETTCCMMNDETAILCODE + WHERE CODE_ID = 'CC023' AND CODE = apm.app_result_ty + ) as app_result_tx + FROM adr_prtcl_mgr apm where adr_seq = #adrSeq# 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 7f3f8d83..fd71d0ed 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastProgRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastProgRegist.jsp @@ -178,7 +178,7 @@ function fn_nextGoPageForm(){ 해당 차수의 정보를 등록해 주세요 - + @@ -210,7 +210,7 @@ function fn_nextGoPageForm(){
- +
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastRecordRegist.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastRecordRegist.jsp new file mode 100644 index 00000000..9229beb1 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastRecordRegist.jsp @@ -0,0 +1,291 @@ + +<%@ 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 + * + */ +%> + + + + + + +사건진행정보 + + + +
+ + +<%-- " /> --%> +<%-- " /> --%> +<%-- " /> --%> + +<%-- " /> --%> +<%-- " /> --%> + +<%-- " /> --%> +<%-- " /> --%> + <%-- " /> --%> + +
+ +
+
+ + +
+

사건진행정보

+
    +
    • +
  • +

    오프라인 조정관리

    +
    • +
  • +

    과거사건등록

    +
    • +
  • 사건진행정보
    • +
+
+ + +
+ +
+

총 진행 회차 : 건

+
+ +
+
+ + +
+ + + + + + + + + + + + + + + + +<%-- --%> + + +<%-- --%> + + +<%-- --%> +<%-- --%> + +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> + + +<%-- --%> +<%-- --%> + +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> + + +<%-- --%> + + + + + + + +
내용비고일자삭제
+ + + + + + +<%-- " data-datecontrol="true" onkeyup="setFormat('day',this)" maxlength="10" readonly> --%> + + + + + + + + + +
+
+ + +
+
+
+
+ +
+
+
+
+
+
+ +
+ + + + + + From 0b4db77b201d9e42c045dd29202c601a6bcf71cc Mon Sep 17 00:00:00 2001 From: hylee Date: Mon, 26 Sep 2022 14:58:19 +0900 Subject: [PATCH 6/9] =?UTF-8?q?refactor:=EC=82=AC=EA=B1=B4=EC=A7=84?= =?UTF-8?q?=ED=96=89=EC=A0=95=EB=B3=B4=20=EC=BA=98=EB=A6=B0=EB=8D=94=20?= =?UTF-8?q?=ED=99=94=EB=A9=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adjReqMgrPastRecordRegist.jsp | 37 ++++++++++--------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastRecordRegist.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastRecordRegist.jsp index 9229beb1..b8d838ad 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastRecordRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastRecordRegist.jsp @@ -98,10 +98,7 @@ $(document).ready(function(){ $('#btnAdd').on('click', function(){ var len = $('#rowTbody').children('tr').length; - if(len === 1) - { - - }else{ $('#rowTbody').append(fn_addRow(len));} + $('#rowTbody').append(fn_addRow(len)); }); }); @@ -124,8 +121,6 @@ $(document).on('click','.removeBtn', function(){ function fn_addRow(len){ - - return addRow= '' +' ' @@ -135,7 +130,15 @@ function fn_addRow(len){ +' ' +' ' +' ' - +' ' + +'
' + +' " data-datecontrol="true" onkeyup="setFormat(\'day\',this)" maxlength="10" readonly>' + +'
' + +' ' + +' ' + +'
' + +'
' +' ' +' ' +' ' @@ -250,16 +253,16 @@ function fn_addRow(len){ - - -<%-- " data-datecontrol="true" onkeyup="setFormat('day',this)" maxlength="10" readonly> --%> - - - - - - - + +
+ " data-datecontrol="true" onkeyup="setFormat('day',this)" maxlength="10" readonly> +
+ + +
+
From 08e803a7785c0726b9700e3faad70bb23fbcf815 Mon Sep 17 00:00:00 2001 From: HappyITN Date: Mon, 26 Sep 2022 16:20:08 +0900 Subject: [PATCH 7/9] =?UTF-8?q?=EC=82=AC=EA=B1=B4=EC=A7=84=ED=96=89?= =?UTF-8?q?=EC=A0=95=EB=B3=B4,=20=EC=82=AC=EA=B1=B4=EA=B4=80=EB=A0=A8?= =?UTF-8?q?=EB=AC=B8=EC=84=9C=20=EB=93=B1=EB=A1=9D=20=EC=A1=B0=EC=A0=95?= =?UTF-8?q?=EC=A7=84=ED=96=89=EC=83=81=EC=84=B8=20-=20=EC=9B=8C=ED=81=AC?= =?UTF-8?q?=ED=94=8C=EB=A1=9C=EC=9A=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp | 61 +++++++++++++++++- .../adjReqMgrPast/adjReqMgrPastFileRegist.jsp | 2 +- .../adjReqMgrPastRecordRegist.jsp | 62 +++++++++++-------- src/main/webapp/kccadrPb/adm/css/content.css | 29 ++++++++- 4 files changed, 124 insertions(+), 30 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp index e8803421..a77c0b91 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp @@ -294,7 +294,19 @@ $(document).ready(function(){ function fnc_aprvl_pop(param){ commonPopWindowopenForm("/kccadr/adjReqMgOff/popup/adjReqMgrOffAppReqPop.do", '1000', '700', "entInfoPop", $('#pop')); } - + /* 워크플로우 */ + $(function(){ + $(".work_flow_wrap .btn_open").click(function(){ + if($(".work_flow_wrap").is(".off") == true){ + $(".work_flow_wrap").removeClass("off"); + $(this).addClass("btn_close").removeClass("btn_open").attr('title','닫힘'); + }else{ + $(".work_flow_wrap").addClass("off"); + $(this).removeClass("btn_close").addClass("btn_open").attr('title','열림'); + } + }); + }); + /*//워크플로우 */ @@ -314,6 +326,53 @@ $(document).ready(function(){ " />
+ +
+
+

조정진행 워크플로우

+ +
+
+
    +

  • 조정신청 제출

    다음
    • +

  • 신청서 보완

    다음
    • +

  • 조정비용납부

    다음
    • +

  • 사건접수

    다음
    • +

  • 조정부배정

    다음
    • +
+
    +

  • 기일확정

    다음
    • +
  • +

    기일통지

    다음다음 +
      +

    • 1차 기일 개최

      다음
      • +
    • +

      2차 기일 개최다음

      다음 +
        +

      • 조정성립

        • +

      • 직권조정다음

        +
          +

        • 이의신청

          • +
        +
        • +

      • 조정권고

        • +

      • 쌍방수락여부 확인

        • +

      • 불성립종결

        • +
      +
      • +

    • 3차 기일 개최

      다음
      • +

    • 4차 기일 개최

      • +
    +
    • +

  • 기일변경

    • +

  • 변론서 및 답변서

    • +

  • 취하신청

    다음

    취하종결

    • +
+
+
+ + +

조정 사건 일반

diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastFileRegist.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastFileRegist.jsp index 76152ab6..f1efe9cd 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastFileRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastFileRegist.jsp @@ -235,7 +235,7 @@ function fn_testPageAlert(){ 사건진행정보 @@ -204,16 +212,16 @@ function fn_addRow(len){
- - - - + + + + + - @@ -247,15 +255,9 @@ function fn_addRow(len){ <%-- --%> - - + + diff --git a/src/main/webapp/kccadrPb/adm/css/content.css b/src/main/webapp/kccadrPb/adm/css/content.css index 0bcf1a41..0bbe0727 100644 --- a/src/main/webapp/kccadrPb/adm/css/content.css +++ b/src/main/webapp/kccadrPb/adm/css/content.css @@ -410,4 +410,31 @@ table select+button{vertical-align: middle;} /* 21/11/24 */ .showMask{display: inline-block} .cfText{font-size: 16px; color: #666} -#pageUnit{width: 100px} \ No newline at end of file +#pageUnit{width: 100px} + +/* 워크플로우 */ +.work_flow_wrap{background-color: #f1f2f4; border: 1px solid #d5d5d5; border-radius: 5px; padding: 0 20px; margin: 0 0 30px 0;transition: all 0.5s ease; height: auto;} +.work_flow_wrap .work_tit{display: flex; justify-content: space-between; align-items: center; font-size: 20px; padding: 20px 0 20px 6px;} +.btn_open, .work_flow_wrap .btn_close{width: 30px; height: 30px; border-radius: 5px; background-color: #fff;} +.btn_open i{display: inline-block; width: 100%; height: 100%; background-image: url(/kccadrPb/usr/image/common/btn_plus.png); background-repeat: no-repeat; background-position: center;} +.work_flow_wrap .btn_close i{display: inline-block; width: 100%; height: 100%; background-image: url(/kccadrPb/usr/image/common/btn_minus.png); background-repeat: no-repeat; background-position: center;} +.work_cont{background-color: #fff; border-radius: 5px; padding: 20px 25px; margin: 0 0 25px 0;transition: all 0.5s ease;height:714px;overflow:hidden;} +.work_flow_wrap .top_work{display: flex; justify-content: space-between; align-items: center;} + +.work_flow_wrap .work_cont .top_work li{overflow: visible;} +.work_flow_wrap .work_cont li{position: relative; width: 100%; overflow: hidden;} +.work_flow_wrap .work_cont p{display: inline-flex; width: 210px; text-align: center; border: 1px solid #d5d5d5; height: 45px; border-radius: 5px; align-items: center; justify-content: center; font-size: 16px; color: #666; margin-bottom: 26px;background-color: transparent; position: relative;} +.work_flow_wrap .work_cont p+img{position: absolute; right: -10px; top: 8px; z-index: 1;} +.work_2{margin-top: 55px; position: relative;} +.work_3,.work_5{float: right;} +.work_5{margin-left: 10px; margin-top: 73px;} +.work_flow_wrap .work_cont .work_3 li{overflow: visible;} +.work_4{float: right; margin-left: 240px; margin-top: -73px; position: relative;} +.work_flow_wrap .work_cont p+.nexticon_3{position: absolute; top: 100%; left: 98px; top: 54px;} +.nexticon_4{position: absolute; top: -58px; left: 235px;} +.nexticon_5{position: absolute; top: 22px; left: 215px;} + +.work_flow_wrap.off .work_cont{height: 0; padding: 0 25px; margin: 0; transition: all 0.5s ease;} +.work_cont .status01 p{border: 1px solid #ea5404; color: #ea5404;} +.work_cont .status02 p{border: 2px solid #1b6fcd; color: #1b6fcd; font-weight: 500;} +/* //워크플로우 */ \ No newline at end of file From 51092eda49e6726d7bfd4b24cbd50f4203531850 Mon Sep 17 00:00:00 2001 From: hylee Date: Mon, 26 Sep 2022 16:49:51 +0900 Subject: [PATCH 8/9] =?UTF-8?q?refactor:=20=EA=B3=BC=EA=B1=B0=EC=82=AC?= =?UTF-8?q?=EA=B1=B4=EB=93=B1=EB=A1=9D=20=EC=9D=B4=EB=A0=A5=20=EC=A7=84?= =?UTF-8?q?=ED=96=89=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/AdjReqMgrPastService.java | 4 + .../service/AdjReqMgrPastVO.java | 97 +++++++++++++++++++ .../service/impl/AdjReqMgrPastDAO.java | 10 ++ .../impl/AdjReqMgrPastServiceImpl.java | 93 ++++++------------ .../web/AdjReqMgrPastController.java | 73 ++++++++++++-- .../adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml | 59 +++++++++++ 6 files changed, 265 insertions(+), 71 deletions(-) diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java index 58f2140d..63238907 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java @@ -30,5 +30,9 @@ public interface AdjReqMgrPastService { List selectAdrRpplPastList(AdjReqMgrPastVO adjReqMgrPastVO); AdjReqMgrPastVO findByIdAdrMgrMaster(AdjReqMgrPastVO adjPastVO); + + List findByAdrHstryId(AdjReqMgrPastVO adjReqMgrPastVO); + + ResponseEntity insertAdjReqRecordAjax(AdjReqMgrPastVO adjReqMgrPastVO); } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastVO.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastVO.java index 9b9c885f..f5cfbd44 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastVO.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastVO.java @@ -112,6 +112,7 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable { private String addUsrId; /* ass.addUsrId | ass.assUsrTy | add_yn " */ private String addAgntList[]; /* ass.agntSeq | ass.assUsrTy | add_yn " */ + // 조정기일대리인 private String addUsrNmList[]; /* ass.agntSeq | ass.assUsrTy | add_yn " */ private String adrSn = ""; // 조정회차 @@ -190,6 +191,22 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable { private String ccTyTx; private String appPlaceDetailTx; + + + /* 조정사건 이력 */ + private String adrHstrySeq; // 조정이력일련번호 + private String hstryDe; // 이력일시 + private String hstryCn; // 이력내용 + private String dlvrySeq; // 송달일련번호 + private String hstryDetailCn; // 이력비고내용 + private String refAdrSeq; // 참고용 조정 일련번호 + private String refAdrSn; // 참고용 조정회차 + private String refSeq1; // 참고용 일련번호 1 + private String refSeq2; // 참고용 일련번호 2 + + private String adrHstryList[]; + + public AdjReqMgrVO getAdrVO() { return adrVO; @@ -1238,6 +1255,86 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable { public void setAppResultTx(String appResultTx) { this.appResultTx = appResultTx; } + + public String getAdrHstrySeq() { + return adrHstrySeq; + } + + public void setAdrHstrySeq(String adrHstrySeq) { + this.adrHstrySeq = adrHstrySeq; + } + + public String getHstryDe() { + return hstryDe; + } + + public void setHstryDe(String hstryDe) { + this.hstryDe = hstryDe; + } + + public String getHstryCn() { + return hstryCn; + } + + public void setHstryCn(String hstryCn) { + this.hstryCn = hstryCn; + } + + public String getDlvrySeq() { + return dlvrySeq; + } + + public void setDlvrySeq(String dlvrySeq) { + this.dlvrySeq = dlvrySeq; + } + + public String getHstryDetailCn() { + return hstryDetailCn; + } + + public void setHstryDetailCn(String hstryDetailCn) { + this.hstryDetailCn = hstryDetailCn; + } + + public String getRefAdrSeq() { + return refAdrSeq; + } + + public void setRefAdrSeq(String refAdrSeq) { + this.refAdrSeq = refAdrSeq; + } + + public String getRefAdrSn() { + return refAdrSn; + } + + public void setRefAdrSn(String refAdrSn) { + this.refAdrSn = refAdrSn; + } + + public String getRefSeq1() { + return refSeq1; + } + + public void setRefSeq1(String refSeq1) { + this.refSeq1 = refSeq1; + } + + public String getRefSeq2() { + return refSeq2; + } + + public void setRefSeq2(String refSeq2) { + this.refSeq2 = refSeq2; + } + + public String[] getAdrHstryList() { + return adrHstryList; + } + + public void setAdrHstryList(String[] adrHstryList) { + this.adrHstryList = adrHstryList; + } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java index aafb8487..b361db7c 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java @@ -2,6 +2,7 @@ package kcc.kccadr.adjReqMgrPast.service.impl; import java.util.List; +import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Repository; import egovframework.rte.psl.dataaccess.EgovAbstractDAO; @@ -9,6 +10,7 @@ import kcc.kccadr.adjPgrMgr.drt.service.AssVO; import kcc.kccadr.adjReqMgrPast.service.AdjAssMgrPastVO; import kcc.kccadr.adjReqMgrPast.service.AdjReqMgrPastVO; import kcc.kccadr.adjReqMgrPast.service.AdrMemDeptMgrPstVO; +import kcc.kccadr.cmm.RestResponse; @Repository("AdjReqMgrPastDAO") public class AdjReqMgrPastDAO extends EgovAbstractDAO { @@ -85,5 +87,13 @@ public class AdjReqMgrPastDAO extends EgovAbstractDAO { public AdjReqMgrPastVO findByIdAdrMgrMaster(AdjReqMgrPastVO adjPastVO) { return (AdjReqMgrPastVO) select("adjReqMgrPastDAO.findByIdAdrMgrMaster", adjPastVO); } + + public List findByAdrHstryId(AdjReqMgrPastVO adjPastVO) { + return (List) list("adjReqMgrPastDAO.findByAdrHstryId", adjPastVO); + } + + public void insertAdjReqRecordAjax(AdjReqMgrPastVO adjPastVO) { + insert("adjReqMgrPastDAO.insertAdjReqRecordAjax", adjPastVO ); + } } 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 478752c6..f57f7169 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java @@ -54,6 +54,10 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements @Resource(name = "egovPrtclManageGnrService") private EgovIdGnrService idgenPrtclSeqService; + // adr_hstry pk + @Resource(name="adrHstrySeqGnrService") + private EgovIdGnrService adrHstrySeqGnrService; + //암복호화 유틸 @Resource(name = "egovCryptoUtil") EgovCryptoUtil egovCryptoUtil; @@ -501,49 +505,6 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements @Override public ResponseEntity checkNInsertAprvlPastAjax(AdjReqMgrPastVO adjPastVO) throws Exception { - - // 공통 -// System.out.println(" 조정번호 :: "+adjPastVO.getAdrSeq()); -// System.out.println(" 조정차수 :: "+adjPastVO.getAdrSn()); -// -// // 기일정보 -// 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()); - /* - * TO_DATETIME('2015-08-10 16:04:56','YYYY-MM-DD HH24:MI:SS') - * 조정번호 :: ADR_0000000000002920 - * 조정차수 :: 1 - * 신청인 피신청인 정보 :: [신청|10|Y, 피신청|20|Y] - * 참관 대리인 정보 :: [35|참관대, 45|피찬관대] - * 조정기일일 :: 2022-09-01 - * 조정기일시 :: 14:00 - * 다음조정기일일 :: 2022-09-08 - * 다음조정기일시 :: 03:00 - * 조정기일장소 :: - * 조정부장 :: 222 - * 조정위원1 :: - * 조정위원2 :: - * 조서내용 :: 123123 - * */ - // add 정보 - - 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()); - this.insertAdjAssAndDataCleansing(adjPastVO); this.updateAdrPrtclMgrAndDataCleansing(adjPastVO); @@ -553,23 +514,7 @@ 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()); - - try { - this.updateAdjAssAndDataCleansing(adjPastVO); - - } catch (Exception e) { - e.printStackTrace(); - } - + this.updateAdjAssAndDataCleansing(adjPastVO); this.updateAdrPrtclMgrAndDataCleansing(adjPastVO); return ResponseEntity.ok(new RestResponse(HttpStatus.OK, "기일조서 수정이 완료되었습니다.", LocalDateTime.now())); } @@ -690,7 +635,6 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements adjReqMgrPastDAO.updateAdjAss(adjAssMgrPastVO); } - for(String addusrList : adjPastVO.getAddAgntList()) { if(StringUtils.isNotEmpty(addusrList)) @@ -751,10 +695,6 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements @Override public List findAllAssPstInfo(AdjReqMgrPastVO adjReqMgrPastVO) { - -// List adjReqMgrPastListVO = adjReqMgrPastDAO.findAllAssPstInfo(adjReqMgrPastVO); -// List usrTyList = adjReqMgrPastListVO.stream().map(AdjReqMgrPastVO::getAssPstUsrTy).collect(Collectors.toList()); - return adjReqMgrPastDAO.findAllAssPstInfo(adjReqMgrPastVO); } @@ -764,6 +704,29 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements return adjReqMgrPastDAO.findByIdAdrMgrMaster(adjPastVO); } + + @Override + public List findByAdrHstryId(AdjReqMgrPastVO adjPastVO) { + return adjReqMgrPastDAO.findByAdrHstryId(adjPastVO); + } + + + @Override + public ResponseEntity insertAdjReqRecordAjax(AdjReqMgrPastVO adjPastVO) { + + + for(String adjHstry : adjPastVO.getAdrHstryList()) + { + //TODO 사건진행정보 반복문 + } + + + + + adjReqMgrPastDAO.insertAdjReqRecordAjax(adjPastVO); + return ResponseEntity.ok(new RestResponse(HttpStatus.OK, "사건진행정보 등록이 완료되었습니다.", LocalDateTime.now())); + } + } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java index 905d3a12..7675e854 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java @@ -305,8 +305,10 @@ public class AdjReqMgrPastController { //TODO 테스트로 인한 seq 코딩 adjReqMgrPastVO.setAdrSeq("ADR_0000000000002920"); - System.out.println("adjReqMgrPastVO.getAdrSeq() !!! : "+ adjReqMgrPastVO.getAdrSeq()); + List adrHstryList = adjReqMgrPastService.findByAdrHstryId(adjReqMgrPastVO); + + model.addAttribute("adrHstryList", adrHstryList); model.addAttribute("adjReqMgrPastVO", adjReqMgrPastVO); @@ -327,8 +329,9 @@ public class AdjReqMgrPastController { * @return * @throws Exception */ - @RequestMapping(value = {"/kccadr/adjReqMgOff/insertAdjReqMgrPastAjax.do"}) - public ResponseEntity insertAdjReqMgrOffAjax(@ModelAttribute("adrVO") AdjReqMgrPastVO adjReqMgrPastVO + @RequestMapping(value = {"/kccadr/adjReqMgOff/insertAdjReqRecordAjax.do"}) +// public ResponseEntity insertAdjReqRecordAjax(@ModelAttribute("adrVO") AdjReqMgrPastVO adjReqMgrPastVO + public ResponseEntity insertAdjReqRecordAjax(AdjReqMgrPastVO adjReqMgrPastVO , RedirectAttributes redirectAttributes , HttpServletRequest request) throws Exception { @@ -341,6 +344,45 @@ public class AdjReqMgrPastController { return ResponseEntity.ok(new RestResponse(HttpStatus.UNAUTHORIZED, "로그인이 필요합니다.", LocalDateTime.now())); } + //사용자 유니크 아이디 받아오기 + adjReqMgrPastVO.setFrstRegisterId(userId); + + //조정신청, 대리인, 신청인 등록 처리 + return adjReqMgrPastService.insertAdjReqRecordAjax(adjReqMgrPastVO); + } + /* + * + */ + + /** + * @methodName : insertAdjReqMgrOffAjax + * @author : 이호영 + * @date : 2022.08.24 + * @description : 과거사건 기본정보등록 메서드 + * @param multiRequest + * @param adjReqMgrPastVO + * @param redirectAttributes + * @param request + * @return + * @throws Exception + */ + @RequestMapping(value = {"/kccadr/adjReqMgOff/insertAdjReqMgrPastAjax.do"}) + public ResponseEntity insertAdjReqMgrOffAjax(@ModelAttribute("adrVO") AdjReqMgrPastVO adjReqMgrPastVO + , RedirectAttributes redirectAttributes + , HttpServletRequest request) throws Exception { + + //로그인 권한정보 불러오기 + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; + String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId()); + + if(userId.equals("")) { + // Unauthorized : 401, 권한 없음, 예를 들면, 로그인 페이지가 필요한 페이지를 로그인 없이 접속하려는 경우 반환되는 코드 (인증 실패) (Unauthorized) + return ResponseEntity.ok(new RestResponse(HttpStatus.UNAUTHORIZED, "로그인이 필요합니다.", LocalDateTime.now())); + } + //사용자 유니크 아이디 받아오기 adjReqMgrPastVO.setFrstRegisterId(userId); adjReqMgrPastVO.setLastUpdusrId(userId); @@ -350,6 +392,17 @@ public class AdjReqMgrPastController { } + /** + * @methodName : checkNInsertAprvlPastAjax + * @author : 이호영 + * @date : 2022.09.26 + * @description : 기일조서 insert + * @param adjReqMgrPastVO + * @param redirectAttributes + * @param request + * @return + * @throws Exception + */ @RequestMapping(value = {"/kccadr/adjReqMgOff/checkNInsertAprvlPastAjax.do"}) public ResponseEntity checkNInsertAprvlPastAjax(@ModelAttribute("adrVO") AdjReqMgrPastVO adjReqMgrPastVO , RedirectAttributes redirectAttributes @@ -372,9 +425,17 @@ public class AdjReqMgrPastController { return adjReqMgrPastService.checkNInsertAprvlPastAjax(adjReqMgrPastVO); } - - - + /** + * @methodName : checkNUpdateAprvlPastAjax + * @author : 이호영 + * @date : 2022.09.26 + * @description : 기일조서 update + * @param adjReqMgrPastVO + * @param redirectAttributes + * @param request + * @return + * @throws Exception + */ @RequestMapping(value = {"/kccadr/adjReqMgOff/checkNUpdateAprvlPastAjax.do"}) public ResponseEntity checkNUpdateAprvlPastAjax(@ModelAttribute("adrVO") AdjReqMgrPastVO adjReqMgrPastVO , RedirectAttributes redirectAttributes 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 44fbac9f..e5dd8258 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 @@ -557,4 +557,63 @@ + + + + + + + INSERT INTO ADR_ASS_MGR_PST ( + ADR_SEQ + , ADR_SN + , ASS_PST_SEQ + , ASS_PST_USR_TY + , ASS_PST_USR_NM + , ADD_YN + , ADD_CHG_YN + , FRST_REGIST_PNTTM + , FRST_REGISTER_ID + , LAST_UPDT_PNTTM + , LAST_UPDUSR_ID + ) VALUES + + ( + #[].adrSeq# + , #[].adrSn# + , #[].assPstSeq# + , #[].assPstUsrTy# + , #[].assPstUsrNm# + , #[].addYn# + , 'N' + , NOW() + , #[].frstRegisterId# + , NOW() + , #[].lastUpdusrId# + ) + + + \ No newline at end of file From 2b5fabea938332e600da6b9ac85eb7684c505285 Mon Sep 17 00:00:00 2001 From: LJH Date: Mon, 26 Sep 2022 17:36:50 +0900 Subject: [PATCH 9/9] =?UTF-8?q?=EC=9D=B4=EC=A4=80=ED=98=B8=20=EC=A0=84?= =?UTF-8?q?=EC=9E=90=EC=A1=B0=EC=A0=95=EC=8B=9C=EC=8A=A4=ED=85=9C=20?= =?UTF-8?q?=EA=B3=A0=EB=8F=84=ED=99=94=20=EC=BB=A4=EB=B0=8B=20=20-=20(?= =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90)=20=EA=B2=B0=EC=9E=AC=EC=84=A0=20?= =?UTF-8?q?=ED=8D=BC=EB=B8=94=EB=A6=AC=EC=8B=B1=20=EC=A0=81=EC=9A=A9=20=20?= =?UTF-8?q?=09=09=EA=B2=B0=EC=9E=AC=EC=9E=90=20=EC=84=A0=ED=83=9D=ED=9B=84?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80=20=EB=B2=84=ED=8A=BC=20=EC=8B=9C=20?= =?UTF-8?q?=ED=85=8D=EC=8A=A4=ED=8A=B8=20=EB=B3=80=EA=B2=BD=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/AdjReqMgrOffLineController.java | 26 +++++-- .../popup/adjReqMgrOffAppReqPop.jsp | 72 +++++++++++-------- 2 files changed, 64 insertions(+), 34 deletions(-) diff --git a/src/main/java/kcc/kccadr/adjReqMgrOff/web/AdjReqMgrOffLineController.java b/src/main/java/kcc/kccadr/adjReqMgrOff/web/AdjReqMgrOffLineController.java index 749ffeaf..68d2a300 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrOff/web/AdjReqMgrOffLineController.java +++ b/src/main/java/kcc/kccadr/adjReqMgrOff/web/AdjReqMgrOffLineController.java @@ -608,14 +608,28 @@ public class AdjReqMgrOffLineController { PrintWriter out = new PrintWriter(new OutputStreamWriter(response.getOutputStream(), "UTF-8")); - List resultList = null ; + List resultList = new ArrayList(); - MenuManageJTreeVO menuManageTopVO = new MenuManageJTreeVO(); - menuManageTopVO.setUpperMenuId("#"); - menuManageTopVO.setMenuNo("0"); - menuManageTopVO.setMenuNm("관련인"); + MenuManageJTreeVO menuManageTopVO2 = new MenuManageJTreeVO(); + menuManageTopVO2.setUpperMenuId("#"); + menuManageTopVO2.setMenuNo("0"); + menuManageTopVO2.setMenuNm("관련인"); + resultList.add(0, menuManageTopVO2); + + for(int i = 1 ; i < 6 ; i ++ ){ + MenuManageJTreeVO menuManageTopVO = new MenuManageJTreeVO(); + + menuManageTopVO.setUpperMenuId("0"); + menuManageTopVO.setMenuNo(String.valueOf(i)); + menuManageTopVO.setMenuNm("홍길동" + String.valueOf(i)); + menuManageTopVO.setMenuOrdr(i); + menuManageTopVO.setProgrmFileNm("dir"); + menuManageTopVO.setUseYn("Y"); + menuManageTopVO.setRelateImagePath("/"); + menuManageTopVO.setRelateImageNm("/"); + resultList.add(i, menuManageTopVO); + } - resultList.add(0, menuManageTopVO); System.out.println("resultList :: "+resultList); mapper.writeValue(out, resultList); out.flush(); diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/popup/adjReqMgrOffAppReqPop.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/popup/adjReqMgrOffAppReqPop.jsp index 61396f90..088880e1 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/popup/adjReqMgrOffAppReqPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/popup/adjReqMgrOffAppReqPop.jsp @@ -29,7 +29,7 @@ */ var newNodeId = ""; function jstreeInit() { - $('#kopost_organization').jstree({ + $('#kccadr_sbmt').jstree({ "core" : { "animation" : 0, "multiple" : false, @@ -39,6 +39,8 @@ function jstreeInit() { "url" : "", "dataType" : "json", "data" : function (node) { + console.log("node.id :: " + node.id); + console.log("authorCode :: " + $('#authorCode').val()); return {'id' : node.id, 'authorCode' : $('#authorCode').val() }; } } @@ -60,14 +62,14 @@ function jstreeInit() { "icon" : "jstree-file", "valid_children" : [] } - }, + }/* , "plugins" : [ "contextmenu", "dnd", "search", "types" - ] + ] */ }) .bind('loaded.jstree', function(e, data) { - $('#kopost_organization').jstree('open_node' , $('#0') ) + $('#kccadr_sbmt').jstree('open_node' , $('#0') ) }) .on('select_node.jstree', function (e, data) { if(!$('.organ_rightbox').is(":visible")){ @@ -367,7 +369,7 @@ function fn_delete_menuInfo(menuNo , progrmFileNm ) { return ; } - var instance = $('#kopost_organization').jstree(true); + var instance = $('#kccadr_sbmt').jstree(true); if(instance.get_node(menuNo).children.length != 0){ alert("하위 메뉴를 먼저 삭제 후 메뉴를 삭제해 주세요."); return; @@ -383,10 +385,10 @@ function fn_delete_menuInfo(menuNo , progrmFileNm ) { success : function(returnData, status) { if (returnData.status == "success") { // 직원 목록 갱신 - var instance = $('#kopost_organization').jstree(true); + var instance = $('#kccadr_sbmt').jstree(true); //$("#" + instance.get_node(partIdx).a_attr.id).trigger("click"); alert("메뉴 정보가 삭제 되었습니다."); - $("#kopost_organization").jstree("refresh"); + $("#kccadr_sbmt").jstree("refresh"); fn_init_menuInfo(); } else if(returnData.status == "duplPk"){ alert("삭제하려는 메뉴를 참조하고 있는 메뉴가 있습니다.\n 참조하는 메뉴를 삭제후 다시 시도해 주세요\n"+ "("+returnData.menuManageResultVO.menuCours+")"); @@ -474,7 +476,7 @@ function fn_save_menuInfo(menuNo) { success : function(returnData, status) { if (returnData.status == "success") { alert("메뉴 정보가 저장 되었습니다."); - var instance = $('#kopost_organization').jstree(true); + var instance = $('#kccadr_sbmt').jstree(true); $('#'+instance.get_node($('#tmp_Id').val()).a_attr.id).trigger("click");//이전 메뉴id선택되게 $('#tmp_Id').val($('#menuNo').val()); } else if(returnData.status == "upperDupl"){ @@ -494,7 +496,7 @@ function fn_save_menuInfo(menuNo) { alert("메뉴 정보 저장이 실패되었습니다."); }, complete : function () { - $("#kopost_organization").jstree("refresh"); + $("#kccadr_sbmt").jstree("refresh"); deleteLodingBar(); } }); @@ -532,9 +534,9 @@ function initShowUrl(init){ $("#url").attr("readonly", false); } if(init=='N'){ - var instance = $('#kopost_organization').jstree(true); - if($('#kopost_organization').jstree('get_selected')[0] != null){ - if(instance.get_node($('#kopost_organization').jstree('get_selected')[0]).children.length != 0){ + var instance = $('#kccadr_sbmt').jstree(true); + if($('#kccadr_sbmt').jstree('get_selected')[0] != null){ + if(instance.get_node($('#kccadr_sbmt').jstree('get_selected')[0]).children.length != 0){ alert("하위 메뉴가 있을경우는 다른타입으로 변경할수 없습니다."); return; } @@ -788,15 +790,15 @@ function btnReset(obj){ $(obj).closest('dd').find('span').html(''); } -function proxyPay(obj){ +function proxyPay(obj, pram){ var proxyPayList = ''; proxyPayList += '
'; - proxyPayList += '
'; + proxyPayList += '
'; proxyPayList += '
'; proxyPayList += '
'; proxyPayList += '
대결자
'; proxyPayList += '
'; - proxyPayList += ''; + proxyPayList += ''; proxyPayList += '
'; proxyPayList += '
'; proxyPayList += '
'; @@ -810,14 +812,28 @@ function proxyPay(obj){ $(obj).closest('li').append(proxyPayList); } } + +function addSbmtPerson(pram, type){ + var selectedNm = $('#kccadr_sbmt').jstree('get_selected',true)[0].text; + + if(type == 'sbmt'){ + $('#sbmtPerson'+pram).text(selectedNm); + }else{ + $('#confront'+pram).text(selectedNm); + } +} ○○○ 결재 요청 + +
+ +
-
@@ -825,10 +841,10 @@ function proxyPay(obj){
- - + +
- +
    @@ -836,16 +852,16 @@ function proxyPay(obj){
    팀장
    - +
    결재자
    - 홍길동 + 결재자1
    - +
    @@ -856,16 +872,16 @@ function proxyPay(obj){
    부서장
    - +
    결재자
    - 홍길동 + 결재자2
    - +
    @@ -876,16 +892,16 @@ function proxyPay(obj){
    위원장
    - +
    결재자
    - 홍길동 + 결재자3
    - +
일자 내용 비고일자 삭제
- - - -
- " data-datecontrol="true" onkeyup="setFormat('day',this)" maxlength="10" readonly> + " data-datecontrol="true" onkeyup="setFormat('day',this)" maxlength="10" readonly>
- + + + + +