From 467f8b31156efb31b8cc85ebae9bea13a394b1f6 Mon Sep 17 00:00:00 2001 From: HappyITN Date: Wed, 28 Sep 2022 19:34:10 +0900 Subject: [PATCH 1/9] =?UTF-8?q?20220928=20=EB=A0=88=EB=93=9C=EB=A7=88?= =?UTF-8?q?=EC=9D=B8=20#2750=20#2751=20#2752=20#2753=20=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=20=ED=8D=BC=EB=B8=94=20=EC=9E=91=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kcc/kccadr/xxx/web/XxxController.java | 36 +++ .../jsp/kccadr/xxx/xxxIntegratedSrch.jsp | 51 ++++ .../kccadr/xxx/xxxIntegratedSrchDetail.jsp | 120 ++++++++ .../jsp/kccadr/xxx/xxxLeaderMainPage.jsp | 149 +++++++++ .../WEB-INF/jsp/kccadr/xxx/xxxStatusStat.jsp | 288 ++++++++++++++++++ .../WEB-INF/jsp/uat/uia/EgovLoginUsr.jsp | 26 ++ src/main/webapp/kccadrPb/adm/css/content.css | 30 +- 7 files changed, 699 insertions(+), 1 deletion(-) create mode 100644 src/main/webapp/WEB-INF/jsp/kccadr/xxx/xxxIntegratedSrch.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/kccadr/xxx/xxxIntegratedSrchDetail.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/kccadr/xxx/xxxLeaderMainPage.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/kccadr/xxx/xxxStatusStat.jsp diff --git a/src/main/java/kcc/kccadr/xxx/web/XxxController.java b/src/main/java/kcc/kccadr/xxx/web/XxxController.java index cddad236..bc1ae673 100644 --- a/src/main/java/kcc/kccadr/xxx/web/XxxController.java +++ b/src/main/java/kcc/kccadr/xxx/web/XxxController.java @@ -320,5 +320,41 @@ public class XxxController { modelAndView.addObject("result", result); return modelAndView; } + + /** + * XXX 과거사건 기록 통합 검색 + */ + @RequestMapping("/kccadr/xxx/XxxIntegratedSrch.do") + public String XxxIntegratedSrch() throws Exception { + + return "/kccadr/xxx/xxxIntegratedSrch"; + } + + /** + * XXX 과거사건 기록 조회 결과 + */ + @RequestMapping("/kccadr/xxx/XxxIntegratedSrchDetail.do") + public String XxxIntegratedSrchDetail() throws Exception { + + return "/kccadr/xxx/xxxIntegratedSrchDetail"; + } + + /** + * XXX 조정위원별 사건 관리 통계 + */ + @RequestMapping("/kccadr/xxx/XxxStatusStat.do") + public String XxxStatusStat() throws Exception { + + return "/kccadr/xxx/xxxStatusStat"; + } + + /** + * XXX 대시보드(위원장,부서장) + */ + @RequestMapping("/kccadr/xxx/XxxLeaderMainPage.do") + public String XxxLeaderMainPage() throws Exception { + + return "/kccadr/xxx/xxxLeaderMainPage"; + } } diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/xxx/xxxIntegratedSrch.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/xxx/xxxIntegratedSrch.jsp new file mode 100644 index 00000000..9f347bdd --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/kccadr/xxx/xxxIntegratedSrch.jsp @@ -0,0 +1,51 @@ +<%@ page contentType="text/html; charset=utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> + + + + +의견정보 + + + + +
+
+
+
+

과거사건 기록 통합 검색

+
    +
    • +
  • +

    xxx

    +
    • +
  • 과거사건 기록 조회
    • +
+
+
+
+
+
+
    +
  • +

    검색

    + + +
    • +
+
+
+
+
+
+
+
+ + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/xxx/xxxIntegratedSrchDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/xxx/xxxIntegratedSrchDetail.jsp new file mode 100644 index 00000000..ecd40e62 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/kccadr/xxx/xxxIntegratedSrchDetail.jsp @@ -0,0 +1,120 @@ +<%@ page contentType="text/html; charset=utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> + + + + +의견정보 + + + + +
+
+
+
+

과거사건 기록 조회 결과

+
    +
    • +
  • +

    xxx

    +
    • +
  • 과거사건 기록 조회
    • +
+
+
+
+

'어문저작물'에 대한 통합검색 결과 총 12건 입니다.

+
+ + + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
번호신청인피신청인저작물종류조정결과
5홍길동 (대리인)고길동 외 2명음악저작물성립
4홍길동 (대리인)이길동어문저작물성립
3홍길동김길동어문저작물불성립
2홍길동고길동음악저작물조정권고안
1홍길동고길동음악저작물직권조정
+
+ + +
+ <%-- --%> +
+ +
+
+
+
+ + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/xxx/xxxLeaderMainPage.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/xxx/xxxLeaderMainPage.jsp new file mode 100644 index 00000000..899895a5 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/kccadr/xxx/xxxLeaderMainPage.jsp @@ -0,0 +1,149 @@ +<%@ page contentType="text/html; charset=utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> + + + + +의견정보 + + + + + +
+
+
+
+

대시보드(위원장, 부서장)

+
    +
    • +
  • +

    xxx

    +
    • +
  • 대시보드
    • +
+
+
+
+

나의 결재 요청

+
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
결재구분조정번호신청내용결재요청일결재완료일결재이동
접수결재2022조정075컴퓨터프로그램2022-09-01 18:002022-09-01 18:00
접수결재2022조정074편집저작물2022-09-01 18:002022-09-01 18:00결재진행(위원장)
접수결재2022조정073편집저작물2022-09-01 18:002022-09-01 18:00결재완료
+
+
+

사건 진행 현황

+
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
신청일자조정번호신청인신청내용조정부조정상태
2022-09-012022조정075홍길동컴퓨터프로그램합의5부기일통지서승인
2022-09-012022조정074홍길동편집저작물합의5부접수결재요청
2022-09-012022조정073홍길동편집저작물합의5부배당결재요청
+
+
+
+
+
+ + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/xxx/xxxStatusStat.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/xxx/xxxStatusStat.jsp new file mode 100644 index 00000000..2e37763a --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/kccadr/xxx/xxxStatusStat.jsp @@ -0,0 +1,288 @@ +<%@ page contentType="text/html; charset=utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> + + + + +의견정보 + + + + +
+
+
+
+

조정위원별 사건 관리 현황 통계

+
    +
    • +
  • +

    xxx

    +
    • +
  • 조정 진행 관리
    • +
+
+
+
+
+
+
    +
  • +

    기간

    + + + + +
    • +
+
+
+
+
+

조정위원

+
+ +
+
+
+
    +
  • +
    +
    김길동
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    사용상태별
    (건수)    		전체성립불성립취하종결직권조정조정권고반려
    272120400
    분야별
    (건수)    		전체어문저작물음악저작물연극저작물미술저작물건축저작물사진저작물
    272120400
    영상저작물도형저작물컴퓨터프로그램편집저작물데이터베이스저작인격권저작인접권
    272120400
    +
    +
    +
    • +
  • +
    +
    김길동
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    사용상태별
    (건수)    		전체성립불성립취하종결직권조정조정권고반려
    272120400
    분야별
    (건수)    		전체어문저작물음악저작물연극저작물미술저작물건축저작물사진저작물
    272120400
    영상저작물도형저작물컴퓨터프로그램편집저작물데이터베이스저작인격권저작인접권
    272120400
    +
    +
    +
    • +
  • +
    +
    김길동
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    사용상태별
    (건수)    		전체성립불성립취하종결직권조정조정권고반려
    272120400
    분야별
    (건수)    		전체어문저작물음악저작물연극저작물미술저작물건축저작물사진저작물
    272120400
    영상저작물도형저작물컴퓨터프로그램편집저작물데이터베이스저작인격권저작인접권
    272120400
    +
    +
    +
    • +
+
+
+
+
+
+ + diff --git a/src/main/webapp/WEB-INF/jsp/uat/uia/EgovLoginUsr.jsp b/src/main/webapp/WEB-INF/jsp/uat/uia/EgovLoginUsr.jsp index cd75834e..60684b00 100644 --- a/src/main/webapp/WEB-INF/jsp/uat/uia/EgovLoginUsr.jsp +++ b/src/main/webapp/WEB-INF/jsp/uat/uia/EgovLoginUsr.jsp @@ -128,6 +128,15 @@ function saveid(form) { function getid(form){ form.checkId.checked = ((form.id_text.value = getCookie("ncms_saveid")) != ""); } + +function otpPhoneView(obj){ + var target=$(obj).closest('.login_right_box'); + if(target.hasClass('login_right_otp_box')){ + target.removeClass('login_right_otp_box'); + }else{ + target.addClass('login_right_otp_box'); + } +} @@ -151,8 +160,13 @@ function getid(form){
한국저작권위원회 KOREA COPYRIGHT COMMISSION
+
+ 아이디 선택 :
+
+

휴대폰번호

+ + + +
+
+

인증번호 입력

+ + +
+
Copyright ⓒ한국저작권위원회 All Rights Reserved. diff --git a/src/main/webapp/kccadrPb/adm/css/content.css b/src/main/webapp/kccadrPb/adm/css/content.css index 68096b84..4ac99972 100644 --- a/src/main/webapp/kccadrPb/adm/css/content.css +++ b/src/main/webapp/kccadrPb/adm/css/content.css @@ -20,6 +20,16 @@ .login_wrap .submit_box input[type="submit"]{width: 180px; height: 50px; background-color: #ea5404; border-radius: 5px; color: #fff; font-size: 20px; font-weight: 500; border: 0; transition: background-color 0.2s ease-in-out;} .login_wrap .submit_box input[type="submit"]:hover{background-color: #de3900; transition: background-color 0.2s ease-in-out;} .login_wrap .copyright{font-size: 14px; position: absolute; bottom: 40px; color: #333;} +.login_wrap .login_right_box .otp_phone_box {display:none;} + +.login_wrap .login_right_box.login_right_otp_box {padding-top:70px;} +.login_wrap .login_right_box.login_right_otp_box .login_tit {margin-bottom:29px;} +.login_wrap .login_right_box.login_right_otp_box .id_box, +.login_wrap .login_right_box.login_right_otp_box .pw_box {margin-bottom:15px;} +.login_wrap .login_right_box.login_right_otp_box .otp_phone_box {display:block;} +.login_wrap .login_right_box.login_right_otp_box .otp_phone_box input[type=text] {width:calc(100% - 145px);border:1px solid #e5e5e5;background:#f4f4f4;border-radius:5px;} +.login_wrap .login_right_box.login_right_otp_box .otp_phone_box .otp_phone_btn {width:100px;height:38px;font-size:14px;text-align:center;vertical-align:top;border:1px solid #e5e5e5;border-radius:5px;} +.login_wrap .login_right_box.login_right_otp_box .submit_box {margin-top:26px;} /* //로그인 */ /* cont_tit */ @@ -439,4 +449,22 @@ table select+button{vertical-align: middle;} .work_cont p.status01{border: 1px solid #ea5404; color: #ea5404;} .work_cont .status02 p{border: 2px solid #1b6fcd; color: #1b6fcd; font-weight: 500;} .work_cont p.status02{border: 2px solid #1b6fcd; color: #1b6fcd; font-weight: 500;} -/* //워크플로우 */ \ No newline at end of file +/* //워크플로우 */ + +/* 과거사건 기록 통합 검색 */ +.inte_cont .list_util input[type=text] {width:calc(100% - 180px);} +/* //과거사건 기록 통합 검색 */ + +/* 조정위원별 사건 관리 현황 통계 */ +.stat_cont .tb_tit .btn_down_excel {display:inline-block;width:170px;height:40px;padding:0 10px 0 45px;font-size:18px;font-weight:400;text-align:left;color:#0e8040;border:1px solid #0e8040;background:url(/kccadrPb/adm/image/btn_down_excel.png) #fff no-repeat left 18px center;} +.stat_cont .stat_list {overflow:hidden;overflow-y:auto;max-height:566px;/*max-height:847px;*/border-top:2px solid #ea5404;} +.stat_cont .stat_list li {padding:15px 0;border-bottom:1px solid #d5d5d5;} +.stat_cont .stat_list li dl {display:flex;justify-content:space-between;} +.stat_cont .stat_list li dl dt {display:flex;width:100px;align-items:center;justify-content:center;} +.stat_cont .stat_list li dl dd {width:calc(100% - 120px);} +.stat_cont .stat_list li dl dd table tbody tr th {padding:10px;font-size:16px;text-align:center;} +.stat_cont .stat_list li dl dd table tbody tr th:nth-child(2) {border-right:1px solid #e5e5e5;} +.stat_cont .stat_list li dl dd table tbody tr .title {font-size:18px;line-height:1.2;} +.stat_cont .stat_list li dl dd table tbody tr td {text-align:center;} +.stat_cont .stat_list li dl dd table tbody tr td.all {font-weight:500;color:#ea5404;} +/* //조정위원별 사건 관리 현황 통계 */ \ No newline at end of file From 83ef7af4e7ff34917300dce3316fe9e159836d03 Mon Sep 17 00:00:00 2001 From: hylee Date: Thu, 29 Sep 2022 11:00:51 +0900 Subject: [PATCH 2/9] =?UTF-8?q?refacotr:=EA=B3=BC=EA=B1=B0=EC=82=AC?= =?UTF-8?q?=EA=B1=B4=EB=93=B1=EB=A1=9D=20=EC=88=98=EC=A0=95=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=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 --- .../service/AdjReqMgrOffLineVO.java | 43 ++++++ .../service/AdjReqMgrPastService.java | 4 +- .../service/AdjReqMgrPastVO.java | 59 ++++---- .../service/impl/AdjReqMgrPastDAO.java | 41 +++++- .../impl/AdjReqMgrPastServiceImpl.java | 113 +++++++++++++-- .../web/AdjReqMgrPastController.java | 137 +++++++++++++----- .../adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml | 122 +++++++++++++++- .../adjReqMgrOff/adjReqMgrOffUpdtView.jsp | 1 + .../adjReqMgrPastBasicRegist.jsp | 95 ++++++------ .../webapp/js/kccadr/adjReqMgrPast/value.js | 27 ++-- 10 files changed, 493 insertions(+), 149 deletions(-) diff --git a/src/main/java/kcc/kccadr/adjReqMgrOff/service/AdjReqMgrOffLineVO.java b/src/main/java/kcc/kccadr/adjReqMgrOff/service/AdjReqMgrOffLineVO.java index afcbb2d8..4bcab201 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrOff/service/AdjReqMgrOffLineVO.java +++ b/src/main/java/kcc/kccadr/adjReqMgrOff/service/AdjReqMgrOffLineVO.java @@ -158,6 +158,13 @@ public class AdjReqMgrOffLineVO extends ComDefaultVO implements Serializable { private String rpplConnNo; private String resPonDentNms = ""; //피신청인 총 갯수 + private String assPstSeq; + private String memPstSeq; + private String memDeptNm; + private String assPstUsrNm; + private String adrHstrySeq; + private String pstCn; + public AdjReqMgrVO getAdrVO() { return adrVO; } @@ -781,6 +788,42 @@ public class AdjReqMgrOffLineVO extends ComDefaultVO implements Serializable { public void setResPonDentNms(String resPonDentNms) { this.resPonDentNms = resPonDentNms; } + public String getAssPstSeq() { + return assPstSeq; + } + public void setAssPstSeq(String assPstSeq) { + this.assPstSeq = assPstSeq; + } + public String getMemPstSeq() { + return memPstSeq; + } + public void setMemPstSeq(String memPstSeq) { + this.memPstSeq = memPstSeq; + } + public String getMemDeptNm() { + return memDeptNm; + } + public void setMemDeptNm(String memDeptNm) { + this.memDeptNm = memDeptNm; + } + public String getAssPstUsrNm() { + return assPstUsrNm; + } + public void setAssPstUsrNm(String assPstUsrNm) { + this.assPstUsrNm = assPstUsrNm; + } + public String getAdrHstrySeq() { + return adrHstrySeq; + } + public void setAdrHstrySeq(String adrHstrySeq) { + this.adrHstrySeq = adrHstrySeq; + } + public String getPstCn() { + return pstCn; + } + public void setPstCn(String pstCn) { + this.pstCn = pstCn; + } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java index d153df77..81bdf59d 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java @@ -38,6 +38,8 @@ public interface AdjReqMgrPastService { ResponseEntity deleteAdjReqRecordAjax(AdjReqMgrPastVO adjReqMgrPastVO); - String findByAdrHstryWhereStatCd(AdjReqMgrPastVO adjReqMgrPastVO); + AdjReqMgrPastVO findByAdrHstryWhereStatCd(AdjReqMgrPastVO adjReqMgrPastVO); + + void updateAdjReqMgrEtc(AdjReqMgrPastVO adjReqMgrPastVO) throws FdlException; } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastVO.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastVO.java index 025afcfa..c7302728 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastVO.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastVO.java @@ -44,6 +44,8 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable { private String pstCn; /* 조정결과 */ + private String memPstSeq; /* 조정부 PK */ + // 조정사건 @@ -206,10 +208,9 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable { private String refAdrSn; // 참고용 조정회차 private String refSeq1; // 참고용 일련번호 1 private String refSeq2; // 참고용 일련번호 2 + - private String adrHstryList[]; - - + private String adrHstryList[]; public AdjReqMgrVO getAdrVO() { return adrVO; @@ -371,6 +372,14 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable { this.addDe = addDe; } + public String getPstCn() { + return pstCn; + } + + public void setPstCn(String pstCn) { + this.pstCn = pstCn; + } + public String getAdrSeq() { return adrSeq; } @@ -867,6 +876,14 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable { this.addAgntList = addAgntList; } + public String[] getAddUsrNmList() { + return addUsrNmList; + } + + public void setAddUsrNmList(String[] addUsrNmList) { + this.addUsrNmList = addUsrNmList; + } + public String getAdrSn() { return adrSn; } @@ -1163,6 +1180,14 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable { this.appResultTy = appResultTy; } + public String getAppResultTx() { + return appResultTx; + } + + public void setAppResultTx(String appResultTx) { + this.appResultTx = appResultTx; + } + public String getMemDeptNm() { return memDeptNm; } @@ -1243,22 +1268,6 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable { this.appPlaceDetailTx = appPlaceDetailTx; } - public String[] getAddUsrNmList() { - return addUsrNmList; - } - - public void setAddUsrNmList(String[] addUsrNmList) { - this.addUsrNmList = addUsrNmList; - } - - public String getAppResultTx() { - return appResultTx; - } - - public void setAppResultTx(String appResultTx) { - this.appResultTx = appResultTx; - } - public String getAdrHstrySeq() { return adrHstrySeq; } @@ -1339,15 +1348,13 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable { this.adrHstryList = adrHstryList; } - public String getPstCn() { - return pstCn; + public String getMemPstSeq() { + return memPstSeq; } - public void setPstCn(String pstCn) { - this.pstCn = pstCn; - } - - + public void setMemPstSeq(String memPstSeq) { + this.memPstSeq = memPstSeq; + } // ============================================= 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 6c79e1fd..1ce3f0cc 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java @@ -7,6 +7,7 @@ import org.springframework.stereotype.Repository; import egovframework.rte.psl.dataaccess.EgovAbstractDAO; import kcc.kccadr.adjPgrMgr.drt.service.AssVO; +import kcc.kccadr.adjReqMgrOff.service.AdjReqMgrOffLineVO; import kcc.kccadr.adjReqMgrPast.service.AdjAssMgrPastVO; import kcc.kccadr.adjReqMgrPast.service.AdjReqMgrPastVO; import kcc.kccadr.adjReqMgrPast.service.AdrMemDeptMgrPstVO; @@ -107,8 +108,44 @@ public class AdjReqMgrPastDAO extends EgovAbstractDAO { } - public String findByAdrHstryWhereStatCd(AdjReqMgrPastVO adjReqMgrPastVO) { - return (String) select("adjReqMgrPastDAO.findByAdrHstryWhereStatCd", adjReqMgrPastVO); + public AdjReqMgrPastVO findByAdrHstryWhereStatCd(AdjReqMgrPastVO adjReqMgrPastVO) { + return (AdjReqMgrPastVO) select("adjReqMgrPastDAO.findByAdrHstryWhereStatCd", adjReqMgrPastVO); } + + public int updateAdjReqMgrOffMaster(AdjReqMgrPastVO adjReqMgrPastVO) { + return update("adjReqMgrPastDAO.updateAdjReqMgrPastMaster", adjReqMgrPastVO ); + } + + + public int updateAdjReqMgrPastRppl(AdjReqMgrPastVO adjReqMgrPastVO) { + return update("adjReqMgrPastDAO.updateAdjReqMgrPastRppl", adjReqMgrPastVO); + } + + public void updateMemDeptNm(AdjReqMgrPastVO adjReqMgrPastVO) { + update("adjReqMgrPastDAO.updateMemDeptNm", adjReqMgrPastVO); + } + + public void updateAssPstUsrNm(AdjReqMgrPastVO adjReqMgrPastVO) { + update("adjReqMgrPastDAO.updateAssPstUsrNm", adjReqMgrPastVO); + } + + public void updateAdrHstry(AdjReqMgrPastVO adjReqMgrPastVO) { + update("adjReqMgrPastDAO.updateAdrHstry", adjReqMgrPastVO); + } + + + public List selectAdrPrtclMgrRow(AdjReqMgrPastVO adjReqMgrPastVO) { + return (List) list("adjReqMgrPastDAO.selectAdrPrtclMgrRow", adjReqMgrPastVO); + } + + public void updateAdrMgrDetailPstCn(AdjReqMgrPastVO adjReqMgrPastVO) { + update("adjReqMgrPastDAO.updateAdrMgrDetailPstCn", adjReqMgrPastVO); + + } + + public void deleteAdrPrtclMgrRow(AdjReqMgrPastVO adjReqMgrPastVO) { + delete("adjReqMgrPastDAO.deleteAdrPrtclMgrRow", adjReqMgrPastVO ); + } + } 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 a52721db..b84017a1 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java @@ -2,9 +2,7 @@ package kcc.kccadr.adjReqMgrPast.service.impl; import java.time.LocalDateTime; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; -import java.util.stream.Collectors; import javax.annotation.Resource; @@ -15,8 +13,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; -import com.mchange.v2.sql.filter.SynchronizedFilterCallableStatement; - import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl; import egovframework.rte.fdl.cmmn.exception.FdlException; import egovframework.rte.fdl.idgnr.EgovIdGnrService; @@ -103,7 +99,6 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements String rpplTy = resultAdjReqMgrList.get(0).getRpplTy(); int listCnt = resultAdjReqMgrList.size(); - logger.info(" + listCnt :: [{}]", listCnt); //신청 대리인 여부 확인 int rpplTy_30_exist = 0; @@ -113,7 +108,7 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements rpplTy = resultAdjReqMgrList.get(i).getRpplTy(); AdjReqMgrPastVO temp = new AdjReqMgrPastVO(); - + if(rpplTy.equals(KccadrConstants.ADR_RPPL_TY_REQ_DEPUTY)) { //신청 대리인 정보 추가해주기 @@ -143,7 +138,6 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements //신청인 정보 추가해주기 temp = resultAdjReqMgrList.get(i); - logger.info(""); resultAdjReqMgrOffLine.getAdjReqMgrVoList().add(decryptAdjReqMgrReturn(temp)); } @@ -169,7 +163,9 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements } // 피신청인 총 갯수 저장해주기 - resultAdjReqMgrOffLine.setReqPerTotCnt(Integer.toString(totCnt)); + resultAdjReqMgrOffLine.setReqPerTotCnt(Integer.toString(totCnt)); + resultAdjReqMgrOffLine.setRpplTy(resultAdjReqMgrOffLine.getAdjReqMgrVoList().get(1).getRpplTy()); + } return resultAdjReqMgrOffLine; @@ -189,7 +185,6 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements String rpplRealAddr = egovCryptoUtil.decrypt(adjReqMgrPastVO.getRpplRealAddr()); //우편물 수령지 주소 String rpplRealAddrDtl = egovCryptoUtil.decrypt(adjReqMgrPastVO.getRpplRealAddrDtl()); //우편물 수령지 상세주소 - logger.info("resultAdjReqMgrOffLine.getRp11plTy() :: [{}]", adjReqMgrPastVO.getRpplTy()); adjReqMgrPastVO.setRpplNm(rpplNm); adjReqMgrPastVO.setRpplEmail(rpplEmail); adjReqMgrPastVO.setRpplPhone(rpplPhone); @@ -433,11 +428,7 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements //rpplCnt = adjReqMgrPastDAO.insertAdrRppl(adjReqMgrOffLineVO.getAdjReqMgrVoList().get(num)); } - } - - - } int adrSn = Integer.parseInt(adjReqMgrPastVO.getAdrSn()); @@ -772,8 +763,102 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements @Override - public String findByAdrHstryWhereStatCd(AdjReqMgrPastVO adjReqMgrPastVO) { + public AdjReqMgrPastVO findByAdrHstryWhereStatCd(AdjReqMgrPastVO adjReqMgrPastVO) { return adjReqMgrPastDAO.findByAdrHstryWhereStatCd(adjReqMgrPastVO); } + + + // 오프라인 조정신청 이름, 이메일, 연락처, 주소정보 암호화 후 데이터베이스에 수정해주기 + public int cryptAdjReqMgrSendUpdate(AdjReqMgrPastVO adjReqMgrPastVO) throws Exception{ + + String rpplNm = egovCryptoUtil.encrypt(adjReqMgrPastVO.getRpplNm()); //신청인이름 + String rpplEmail = egovCryptoUtil.encrypt(adjReqMgrPastVO.getRpplEmail()); //이메일주소 + String rpplPhone = egovCryptoUtil.encrypt(adjReqMgrPastVO.getRpplPhone()); //연락처 + String rpplPost = egovCryptoUtil.encrypt(adjReqMgrPastVO.getRpplPost()); //우편번호 + String rpplAddr = egovCryptoUtil.encrypt(adjReqMgrPastVO.getRpplAddr()); //주소 + String rpplAddrDtl = egovCryptoUtil.encrypt(adjReqMgrPastVO.getRpplAddrDtl()); //상세주소 + String rpplRealPost = egovCryptoUtil.encrypt(adjReqMgrPastVO.getRpplRealPost()); //우편물 수령지 우편번호 + String rpplRealAddr = egovCryptoUtil.encrypt(adjReqMgrPastVO.getRpplRealAddr()); //우편물 수령지 주소 + String rpplRealAddrDtl = egovCryptoUtil.encrypt(adjReqMgrPastVO.getRpplRealAddrDtl()); //우편물 수령지 상세주소 + + adjReqMgrPastVO.setRpplNm(rpplNm); + adjReqMgrPastVO.setRpplEmail(rpplEmail); + adjReqMgrPastVO.setRpplPhone(rpplPhone); + adjReqMgrPastVO.setRpplPost(rpplPost); + adjReqMgrPastVO.setRpplAddr(rpplAddr); + adjReqMgrPastVO.setRpplAddrDtl(rpplAddrDtl); + adjReqMgrPastVO.setRpplRealPost(rpplRealPost); + adjReqMgrPastVO.setRpplRealAddr(rpplRealAddr); + adjReqMgrPastVO.setRpplRealAddrDtl(rpplRealAddrDtl); + + //디비에 수정해 주기 + int resultCnt = adjReqMgrPastDAO.updateAdjReqMgrPastRppl(adjReqMgrPastVO); + + return resultCnt; + } + + + @Override + public void updateAdjReqMgrEtc(AdjReqMgrPastVO adjReqMgrPastVO) throws FdlException { + + logger.info(" ++ updateAdjReqMgrEtc ++ "); + // 조정부 수정 + adjReqMgrPastDAO.updateMemDeptNm(adjReqMgrPastVO); + + // 조사관 수정 + adjReqMgrPastDAO.updateAssPstUsrNm(adjReqMgrPastVO); + + // 최종결과 CODE 수정 + adjReqMgrPastDAO.updateAdrHstry(adjReqMgrPastVO); + + // 조정결과 수정 + adjReqMgrPastDAO.updateAdrMgrDetailPstCn(adjReqMgrPastVO); + + + /* + * TODO 차수 수정 + * TB adr_prtcl_mgr + * 기존 차수와 현재 차수 갯수가 다르면 삭제 및 추가 해야함 + * */ + List prtclRowList = adjReqMgrPastDAO.selectAdrPrtclMgrRow(adjReqMgrPastVO); +// System.out.println("prtclRowList.get(0).getPrtclSeq() : "+ prtclRowList.get(0).getPrtclSeq()); + prtclRowList.forEach(t->{ + logger.info(" + t.getAdrSeq() [{}], [{}], [{}]", t.getAdrSeq(), t.getAdrSn(), t.getPrtclSeq()); + }); + logger.info(" exist row size :: [{}]", prtclRowList.size()); + logger.info(" modify row size :: [{}]", adjReqMgrPastVO.getAdrSn()); + int existAdrSnSize = prtclRowList.size(); + int changeAdrSnSize = Integer.parseInt(adjReqMgrPastVO.getAdrSn()); + + // 기존에 있는 row보다 수정된 차수가 더 낮은 경우 + // 기존row > 수정row + int gap = 0; + if(existAdrSnSize > changeAdrSnSize) + { + gap = existAdrSnSize - changeAdrSnSize; + for(int i=existAdrSnSize; i > gap; i--) + { + adjReqMgrPastDAO.deleteAdrPrtclMgrRow(prtclRowList.get(i-1)); + } + } + // 기존에 있는 row보다 수정된 차수가 더 높은 경우 + // 기존row < 수정row + else if(existAdrSnSize < changeAdrSnSize) + { + gap = changeAdrSnSize - existAdrSnSize; + + +// int adrSn = Integer.parseInt(adjReqMgrPastVO.getAdrSn()); + int cnt = existAdrSnSize; // 기존 row size + while(cnt <= changeAdrSnSize) // 수정할 row size + { + System.out.println("cnt : "+cnt); +// adjReqMgrPastVO.setPrtclSeq(idgenPrtclSeqService.getNextStringId()); // idgenPrtclSeqService +// adjReqMgrPastVO.setAdrSn(Integer.toString(cnt)); +// adjReqMgrPastDAO.insertAdrSnInit(adjReqMgrPastVO); + cnt++; + } + } + } } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java index 16bd034e..8d2a1deb 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java @@ -24,7 +24,6 @@ import kcc.com.cmm.LoginVO; import kcc.com.cmm.service.EgovCmmUseService; import kcc.com.cmm.service.EgovFileMngService; import kcc.com.cmm.service.EgovFileMngUtil; -import kcc.com.cmm.service.impl.SequenceUtilServiceImpl; import kcc.com.cmm.util.StringUtil; import kcc.com.utl.fcc.service.EgovStringUtil; import kcc.kccadr.adjPgrMgr.apm.service.ApmService; @@ -33,6 +32,8 @@ import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmVO; import kcc.kccadr.adjPgrMgr.drt.service.AssVO; import kcc.kccadr.adjPgrMgr.drt.service.DrtService; import kcc.kccadr.adjPgrMgr.drt.service.DrtVO; +import kcc.kccadr.adjReqMgrOff.service.AdjReqMgrOffLineService; +import kcc.kccadr.adjReqMgrOff.service.AdjReqMgrOffLineVO; import kcc.kccadr.adjReqMgrPast.service.AdjReqMgrPastService; import kcc.kccadr.adjReqMgrPast.service.AdjReqMgrPastVO; import kcc.kccadr.cmm.RestResponse; @@ -76,7 +77,11 @@ public class AdjReqMgrPastController { @Resource(name = "apmService") private ApmService apmService; - + + // 조정신청 서비스단 + @Resource(name = "AdjReqMgrOffLineService") + private AdjReqMgrOffLineService adjReqMgrOffLineService; + // global 프로퍼티 @Resource(name="globalSettings") protected Properties propertiesService; @@ -125,9 +130,8 @@ public class AdjReqMgrPastController { //오프라인 조정 신청 정보 불러오기. AdjReqMgrPastVO resultAdjReqMgrPast = adjReqMgrPastService.selectAdjReqMgrOffLineInfo(adjReqMgrPastVO); - String statCd = adjReqMgrPastService.findByAdrHstryWhereStatCd(adjReqMgrPastVO); - resultAdjReqMgrPast.setStatCd(statCd); - + AdjReqMgrPastVO statCdInfo = adjReqMgrPastService.findByAdrHstryWhereStatCd(adjReqMgrPastVO); + model.addAttribute("statCdInfo", statCdInfo); model.addAttribute("adrVO", resultAdjReqMgrPast); }else { //기본 값 셋팅 - 대리인 여부, 신청자 분류 @@ -383,39 +387,6 @@ public class AdjReqMgrPastController { return adjReqMgrPastService.deleteAdjReqRecordAjax(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); - - //조정신청, 대리인, 신청인 등록 처리 - return adjReqMgrPastService.insertAdjReqMgrRpplReq(adjReqMgrPastVO); - } /** * @methodName : checkNInsertAprvlPastAjax @@ -518,9 +489,95 @@ public class AdjReqMgrPastController { } + + /** + * @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) 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); + + //조정신청, 대리인, 신청인 등록 처리 + return adjReqMgrPastService.insertAdjReqMgrRpplReq(adjReqMgrPastVO); + } - - + + /** + * @methodName : updateAdrMgrMasterAjax + * @author : 이호영 + * @date : 2022.09.28 + * @description : 과거사건 수정 + * @param multiRequest + * @param adjReqMgrPastVO + * @param redirectAttributes + * @param request + * @return + * @throws Exception + */ + @RequestMapping(value = {"/kccadr/adjReqMgOff/updateAdjReqMgrPastAjax.do"}) + public ResponseEntity updateAdrMgrMasterAjax(@ModelAttribute("adrVO") AdjReqMgrOffLineVO adjReqMgrOffLineVO) throws Exception { + + //로그인 권한정보 불러오기 + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; + String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId()); + + if(userId.equals("")) { + return ResponseEntity.ok(new RestResponse(HttpStatus.UNAUTHORIZED, "로그인이 필요합니다.", LocalDateTime.now())); + } + + //사용자 유니크 아이디 받아오기 + adjReqMgrOffLineVO.setLastUpdusrId(userId); + + /* + * 오프라인 수정 로직 + * 수정 X + * */ + String resultSts = adjReqMgrOffLineService.updateAdjReqMgrRpplReq(adjReqMgrOffLineVO); + + AdjReqMgrPastVO adjReqMgrPastVO = new AdjReqMgrPastVO(); + + adjReqMgrPastVO.setAdrSeq(adjReqMgrOffLineVO.getAdrSeq()); + adjReqMgrPastVO.setMemDeptNm(adjReqMgrOffLineVO.getMemDeptNm()); // 조정부 PK + adjReqMgrPastVO.setMemPstSeq(adjReqMgrOffLineVO.getMemPstSeq()); // 조정부 명 + adjReqMgrPastVO.setAssPstSeq(adjReqMgrOffLineVO.getAssPstSeq()); // 조사관 PK + adjReqMgrPastVO.setAssPstUsrNm(adjReqMgrOffLineVO.getAssPstUsrNm()); // 조사관 명 + adjReqMgrPastVO.setStatCd(adjReqMgrOffLineVO.getStatCd()); // 최종 결과 코드 + adjReqMgrPastVO.setAdrHstrySeq(adjReqMgrOffLineVO.getAdrHstrySeq()); // 히스토리 PK + adjReqMgrPastVO.setAdrSn(adjReqMgrOffLineVO.getAdrSn()); // 차수 + adjReqMgrPastVO.setPstCn(adjReqMgrOffLineVO.getPstCn()); // 조정결과 + + /* + * 기존 수정로직 후 기타사항 수정 + * 조정부, 조정조사관, 진행된 차수, 최종결과, 조정결과 + * */ + adjReqMgrPastService.updateAdjReqMgrEtc(adjReqMgrPastVO); + + if(resultSts.equals("updateSucc")) { + return ResponseEntity.ok(new RestResponse(HttpStatus.OK, "정상적으로 수정하였습니다.", adjReqMgrOffLineVO.getAdrSeq(), LocalDateTime.now())); + } + return ResponseEntity.ok(new RestResponse(HttpStatus.BAD_REQUEST, "수정 중 오류가 발생하였습니다.", LocalDateTime.now())); + } 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 a4cfe669..bb6a8790 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 @@ -386,8 +386,10 @@ + + + UPDATE ADR_MGR_MASTER SET + REQ_CN1 = #reqCn1# + ,REQ_CN2 = #reqCn2# + ,REQ_TY = #reqTy# + ,CC_TY = #ccTy# + ,ATCH_FILE_ID = #atchFileId# + ,LAST_UPDT_PNTTM = NOW() + ,LAST_UPDUSR_ID = #lastUpdusrId# + WHERE 1=1 + AND ADR_SEQ = #adrSeq# + + + + + + + + UPDATE ADR_RPPL SET + RPPL_TY = #rpplTy# + ,AGNT_YN = #agntYn# + ,RPPL_USR_TY = #rpplUsrTy# + ,RPPL_NM = #rpplNm# + ,RPPL_BIZ_NO = #rpplBizNo# + ,RPPL_BIZ_ID = #rpplBizId# + ,RPPL_BIZ_NM = #rpplBizNm# + ,RPPL_POST = #rpplPost# + ,RPPL_ADDR = #rpplAddr# + ,RPPL_ADDR_DTL = #rpplAddrDtl# + ,RPPL_REAL_POST = #rpplRealPost# + ,RPPL_REAL_ADDR = #rpplRealAddr# + ,RPPL_REAL_ADDR_DTL = #rpplRealAddrDtl# + ,RPPL_PHONE = #rpplPhone# + ,RPPL_EMAIL = #rpplEmail# + ,RPPL_EMAIL_YN = #rpplEmailYn# + ,RPPL_SMS_YN = #rpplSmsYn# + ,RPPL_CLASS = #rpplClass# + ,RPPL_GRADE = #rpplGrade# + ,ATCH_FILE_ID = #atchFileId# + ,RPPL_RELATION = #rpplRelation# + ,RPPL_RELATION_ETC = #rpplRelationEtc# + ,LAST_UPDT_PNTTM = NOW() + ,LAST_UPDUSR_ID = #lastUpdusrId# + WHERE 1=1 + AND ADR_SEQ = #adrSeq# + AND RPPL_SEQ = #rpplSeq# + + + + + UPDATE ADR_MEM_DEPT_MGR_PST SET + MEM_DEPT_NM = #memDeptNm# + WHERE + MEM_PST_SEQ = #memPstSeq# + + + + + UPDATE ADR_ASS_MGR_PST SET + ASS_PST_USR_NM = #assPstUsrNm# + WHERE + ASS_PST_SEQ = #assPstSeq# + + + + UPDATE ADR_HSTRY SET + STAT_CD = #statCd# + WHERE + ADR_HSTRY_SEQ = #adrHstrySeq# + + + + + UPDATE ADR_MGR_DETAIL SET + PST_CN = #pstCn# + WHERE + ADR_SEQ = #adrSeq# + + + + + + DELETE FROM ADR_PRTCL_MGR + WHERE ADR_SEQ = #adrSeq# + AND PRTCL_SEQ = #prtclSeq# + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/adjReqMgrOffUpdtView.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/adjReqMgrOffUpdtView.jsp index 75897029..0393c30e 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/adjReqMgrOffUpdtView.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/adjReqMgrOffUpdtView.jsp @@ -1553,6 +1553,7 @@ if (obj) data.append("fileFr"+idx, obj.fileObj); }); + console.log('data :', data); $.ajax({ type: "POST", 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 366b848f..43bfa86b 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist.jsp @@ -36,41 +36,39 @@ + + + + + + + + + + + + + + + +<%--
+ + +
--%> diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstIncidentList.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstIncidentList.jsp index 45e13a58..5d952cc3 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstIncidentList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstIncidentList.jsp @@ -43,7 +43,8 @@ function linkPage(pageNo){ var listForm = document.listForm ; listForm.pageIndex.value = pageNo ; - listForm.action = ""; +// listForm.action = ""; + listForm.action = ""; listForm.submit(); } @@ -103,6 +104,8 @@ " /> " /> " /> + + @@ -123,53 +126,7 @@
-
- <%-- - - -
-
- - -
- ~ -
- - -
- -
-
- - -
-
- - -
- - - --%> -
+
diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/mainExpPage.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/mainExpPage.jsp index 4ca0761b..01cf37bb 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/mainExpPage.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/mainExpPage.jsp @@ -91,18 +91,20 @@ function fn_egov_inqire_notice(bbsId, nttId) { function goExpPage(num) { + var frm = document.dtlFrm; - var actionUrl = ""; - frm.step.value = num + var actionUrl = ""; if(num==1){//접수페이지 - actionUrl = ""; + goUrl = ""; } else{ - actionUrl = "" + goUrl = "" } + frm.loginNextUrl.value = goUrl; + frm.step.value = num; frm.action = actionUrl; frm.submit(); @@ -189,8 +191,8 @@ function goExpPage(num) {
- -

접수

+ +

조정신청

@@ -205,8 +207,8 @@ function goExpPage(num) {
- -

기일지정

+ +

서류제출

@@ -221,8 +223,8 @@ function goExpPage(num) {
- -

기일개최

+ +

진행상황

@@ -237,8 +239,8 @@ function goExpPage(num) {
- -

조정중

+ +

열람·발급

@@ -253,8 +255,8 @@ function goExpPage(num) {
- -

종료

+ +

문의게시판

@@ -386,6 +388,7 @@ function goExpPage(num) {
- + +
\ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusDetail.jsp index 3321f65e..b6b03049 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusDetail.jsp @@ -16,6 +16,7 @@ $("#tabNav > button").on("click" , function(e){ tabPageLoad($(this).index()); }); + console.log('${step}'); tabPageLoad(0); }); @@ -30,7 +31,8 @@ } , function(res, status, xhr){ console.log(status); - $(".step0"+${step}).addClass("active"); +// console.log(${step}); + $(".step0"+'${step}').addClass("active"); }); } function getPageUrl(idx){ From 5a61871a6e8dd4f1b61570920a40f8dbeb222fa6 Mon Sep 17 00:00:00 2001 From: LJH Date: Thu, 29 Sep 2022 14:35:11 +0900 Subject: [PATCH 4/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?=EC=9D=B4=EB=85=B8=EB=A6=AD=EC=8A=A4=20=EB=8C=80=EC=9A=A9?= =?UTF-8?q?=EB=9F=89=ED=8C=8C=EC=9D=BC=EC=97=85=EB=A1=9C=EB=93=9C=EC=86=94?= =?UTF-8?q?=EB=A3=A8=EC=85=98=20=EB=9D=BC=EC=9D=B4=EC=84=BC=EC=8A=A4=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9=20(22.12.31=EA=B9=8C=EC=A7=80)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/innorix/innorix.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/webapp/innorix/innorix.js b/src/main/webapp/innorix/innorix.js index e131f60f..b710d5a8 100644 --- a/src/main/webapp/innorix/innorix.js +++ b/src/main/webapp/innorix/innorix.js @@ -7,7 +7,9 @@ */ // 라이선스 유형 : INNORIX WP 91일 체험 (만료 2022-09-30) -var INNORIX_LICENSE = "WEiCgfGkBpqQN/Zw0Ae0YQDFQoK5vit/hNZK/8gGNUm+mtjwAJr4dLSFCiLgiY9BOWSg925hgOfaW1olUgUTccrrl6Y="; +/*var INNORIX_LICENSE = "WEiCgfGkBpqQN/Zw0Ae0YQDFQoK5vit/hNZK/8gGNUm+mtjwAJr4dLSFCiLgiY9BOWSg925hgOfaW1olUgUTccrrl6Y=";*/ +// 라이선스 유형 : INNORIX WP 91일 체험 (만료 2022-12-31) +var INNORIX_LICENSE = "SQeXVJiPNj/2u6W8BXoc1pX1l1D0Dc1azbDxUT+BQPLxsV86kF62+FUvIaofOXnArJTjp9kn/ZtUA+Ps0JFla2QGiu0="; var INNORIX_VERSION = '1.1.3.458'; var INNORIX_WIN_VERSION = '1.1.3.458'; From ec06737f1f4d786d9dd4c6c1d039d95bc951561c Mon Sep 17 00:00:00 2001 From: hylee Date: Thu, 29 Sep 2022 15:55:40 +0900 Subject: [PATCH 5/9] =?UTF-8?q?feat:=EC=B2=B4=ED=97=98=ED=95=98=EA=B8=B0?= =?UTF-8?q?=20=EA=B8=B0=EB=8A=A5-=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20-=20=EC=A2=85=EA=B2=B0=20=EC=83=81=EC=84=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accdnt/ars/service/AdjstReqStatusVO.java | 12 + .../adjstExp/web/AdjstExpController.java | 14 + .../web/AdjstExpDetailController.java | 11 + .../jsp/web/kccadr/adjstExp/SsoLoginUsr.jsp | 1 + .../web/kccadr/adjstExp/adjstIncidentList.jsp | 317 +++++++++++++----- .../jsp/web/kccadr/adjstExp/mainExpPage.jsp | 18 +- .../adjstExp/popup/adjstIncidentDetailPop.jsp | 172 ++++++++++ .../adjstExpDetail/adjstIncidentDetail.jsp | 226 +++++++++++++ 8 files changed, 678 insertions(+), 93 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/popup/adjstIncidentDetailPop.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstIncidentDetail.jsp diff --git a/src/main/java/kcc/kccadr/accdnt/ars/service/AdjstReqStatusVO.java b/src/main/java/kcc/kccadr/accdnt/ars/service/AdjstReqStatusVO.java index 80f46b68..ed19bc4c 100644 --- a/src/main/java/kcc/kccadr/accdnt/ars/service/AdjstReqStatusVO.java +++ b/src/main/java/kcc/kccadr/accdnt/ars/service/AdjstReqStatusVO.java @@ -48,6 +48,10 @@ public class AdjstReqStatusVO extends AdjstIncidentVO { private String pageExpIndex; private String expCode; + + private String pageType; + + public String getAdrSn() { return adrSn; @@ -263,5 +267,13 @@ public class AdjstReqStatusVO extends AdjstIncidentVO { this.expCode = expCode; } + public String getPageType() { + return pageType; + } + + public void setPageType(String pageType) { + this.pageType = pageType; + } + } diff --git a/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpController.java b/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpController.java index 19881484..15a8a2b5 100644 --- a/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpController.java +++ b/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpController.java @@ -32,6 +32,7 @@ import kcc.com.uss.ion.pwm.service.MainzoneVO; import kcc.com.uss.ion.pwm.service.PopupManageVO; import kcc.com.uss.ion.pwm.service.PopupzoneVO; import kcc.kccadr.accdnt.ai.service.AdjstIncidentVO; +import kcc.kccadr.accdnt.ars.service.AdjstReqStatusVO; import kcc.kccadr.accdnt.crtfc.service.CrtfcService; import kcc.kccadr.adjst.service.AdjstReqService; import kcc.kccadr.adjst.service.AdjstReqVO; @@ -111,6 +112,8 @@ public class AdjstExpController { System.out.println("adjstReqVO.getStep() :: " + adjstReqVO.getStep()); model.addAttribute("loginNextUrl", adjstReqVO.getLoginNextUrl()); model.addAttribute("step", adjstReqVO.getStep()); + model.addAttribute("searchStatus", adjstReqVO.getSearchStatus()); + return "/web/kccadr/adjstExp/SsoLoginUsr"; } @@ -457,4 +460,15 @@ public class AdjstExpController { adjstReqVO.setRpplRealAddr(rpplRealAddr); adjstReqVO.setRpplRealAddrDtl(rpplRealAddrDtl); } + + + /** + * 조정진행 상세 POPUP 화면 + */ + @RequestMapping("/web/kccadr/adjstExpDetail/popup/adjstIncidentDetailPop.do") + public String adjstIncidentDetailPop(@ModelAttribute("adjstReqStatusVO") AdjstReqStatusVO adjstReqStatusVO, + ModelMap model) throws Exception { + return "/web/kccadr/adjstExp/popup/adjstIncidentDetailPop"; + } + } diff --git a/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpDetailController.java b/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpDetailController.java index 1175ec21..9e57976c 100644 --- a/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpDetailController.java +++ b/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpDetailController.java @@ -84,6 +84,17 @@ public class AdjstExpDetailController { return "/web/kccadr/adjstExpDetail/adjstReqStatusDetail"; } + /** + * 조정진행 상세 화면 + */ + @RequestMapping("/web/kccadr/adjstExpDetail/adjstIncidentDetail.do") + public String adjstIncidentDetail(@ModelAttribute("adjstReqStatusVO") AdjstReqStatusVO adjstReqStatusVO, + ModelMap model) throws Exception { + return "/web/kccadr/adjstExpDetail/adjstIncidentDetail"; + } + + + /** * 조정진행 상세 Tab 조정상세 화면 */ diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/SsoLoginUsr.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/SsoLoginUsr.jsp index 6a84f761..33659bcf 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/SsoLoginUsr.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/SsoLoginUsr.jsp @@ -68,6 +68,7 @@ function usrIdPassFind(choose){ + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstIncidentList.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstIncidentList.jsp index 5d952cc3..16bb4998 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstIncidentList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstIncidentList.jsp @@ -43,7 +43,6 @@ function linkPage(pageNo){ var listForm = document.listForm ; listForm.pageIndex.value = pageNo ; -// listForm.action = ""; listForm.action = ""; listForm.submit(); } @@ -55,47 +54,36 @@ listForm.submit(); } - function fncGoingDetail(adrSeq, adrSn){ + function fncGoingDetail(type){ + /* + *type + * A :신청 + * B :진행 + * C :종결 + */ + var listForm = document.listForm ; - listForm.action = ""; - listForm.submit(); - } - - function fncCloseDetail(adrSeq, adrSn){ - var listForm = document.listForm ; - listForm.adrSeq.value = adrSeq; - listForm.adrSn.value = adrSn; - listForm.action = ""; + listForm.action = ""; +// listForm.pageType.value = type; listForm.submit(); } function fncGoCreate(){ var listForm = document.listForm ; - //listForm.action = ""; // 신청서작성 메뉴 URL로 수정 listForm.action = ""; listForm.submit(); } - function fncSecurityPop(adrSeq,edtTy,edtSn) { - commonPopLayeropen( - "/web/kccadr/accdnt/ai/popup/adjstIncidentReqViewPop.do" - , 550 - , 600 - , {adrSeq : adrSeq, edtTy : edtTy, edtSn : edtSn} - , "N" - , "securityPop" - ); - } - function fncRejectCnPop(adrSeq,rejectCn) { - commonPopLayeropen( - "/web/kccadr/accdnt/ai/popup/adjstIncidentRejectCnPop.do" - , 550 - , 300 - , {adrSeq : adrSeq, rejectCn : rejectCn} - , "N" - , "rejectCnPop" - ); - } + + $(document).ready(function(){ + + $($('.td_num').get().reverse()).each(function(index, item){ + console.log($(item).text(index+1)); + }); + + }); + + @@ -104,12 +92,14 @@ " /> " /> " /> + +
@@ -121,10 +111,10 @@
- - - - + + + +
@@ -160,80 +150,225 @@ - - - 2 - - - 접수일자 -

2021-11-21

- + + + + + + 접수일자 +

2021-11-21

+ 신청인 - 홍길동 + 홍길동 피신청인 - 김길동 외1명 + 김길동 외1명 신청내용 - 미술저작물 + 미술저작물 - - 조정부 -

합의1부

- - - 기일 -

-

- - - 조정차수 -

1차

- - - 조정상태 -

조정진행중

- - - - - 1 - - - 접수일자 -

2021-12-06

- + + 조정부 +

합의1부

+ + + 기일 +

-

+ + + 조정차수 +

1차

+ + + 조정상태 +

작성중

+ + + + + + 접수일자 +

2021-12-06

+ + + 신청인 + 박영희 + + + 피신청인 + 김철수 + + + 신청내용 + 어문저작물 + + + 조정부 +

조정1부

+ + + 기일 +

-

+ + + 조정차수 +

1차

+ + + 조정상태 +

제출완료

+ + + + + + + + + 접수일자 +

2021-11-21

+ 신청인 - 박영희 + 홍길동 피신청인 - 김철수 + 김길동 외1명 신청내용 - 어문저작물 + 미술저작물 - - 조정부 -

조정1부

- - - 기일 -

-

- - - 조정차수 -

1차

- - - 조정상태 + + 조정부 +

합의1부

+ + + 기일 +

-

+ + + 조정차수 +

1차

+ + + 조정상태 +

조정진행중

+ + + + + + 접수일자 +

2021-12-06

+ + + 신청인 + 박영희 + + + 피신청인 + 김철수 + + + 신청내용 + 어문저작물 + + + 조정부 +

조정1부

+ + + 기일 +

-

+ + + 조정차수 +

1차

+ + + 조정상태

조정진행중

- - + + + + + + + + + 접수일자 +

2021-11-21

+ + + 신청인 + 홍길동 + + + 피신청인 + 김길동 + + + 신청내용 + 미술저작물 + + + 조정부 +

합의1부

+ + + 기일 +

-

+ + + 조정차수 +

1차

+ + + 조정상태 +

조정종결

+ + + + + + 접수일자 +

2021-12-06

+ + + 신청인 + 박영희 + + + 피신청인 + 김철수 + + + 신청내용 + 어문저작물 + + + 조정부 +

조정1부

+ + + 기일 +

-

+ + + 조정차수 +

1차

+ + + 조정상태 +

조정종결

+ + +
diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/mainExpPage.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/mainExpPage.jsp index 01cf37bb..56dfb6cc 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/mainExpPage.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/mainExpPage.jsp @@ -96,9 +96,22 @@ function goExpPage(num) { var actionUrl = ""; - if(num==1){//접수페이지 + if(num==1) + {//접수페이지 goUrl = ""; - } else{ + } + else if(num==4) + {// 열랍 발급 + goUrl = ""; + frm.searchStatus.value = 'C'; + } + else if(num==5) + { + return false; + } + else + { +// return false; goUrl = "" } @@ -390,5 +403,6 @@ function goExpPage(num) {
+
\ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/popup/adjstIncidentDetailPop.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/popup/adjstIncidentDetailPop.jsp new file mode 100644 index 00000000..61a5fccb --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/popup/adjstIncidentDetailPop.jsp @@ -0,0 +1,172 @@ + +<%@ 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 uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%> +<%@ 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="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> + +<% pageContext.setAttribute("replaceChar", "\n"); %> +<% +/** + * @Class Name : srcAdmNoPop.jsp + * @Description : 조정접수 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2022.08.16 이준호 최초 생성 + * @author 이준호 + * @since 2022.08.16 + * @version 1.0 + * @see + * + */ +%> + + +관련인 정보 + + + + + + + + +
+
+ +
+

신청인 정보

+
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
신청인정보 : 신청인분류, 신청인 이름, 주소, 이메일, 연락처 등의 정보제공
신청인 분류 +

+ 개인  +

+
신청인 이름 +

+ 홍길동  +

+
주소 +

+ 서울 [04323] 서울특별시 용산구 후암로 107, 5/16층  +

+
이메일 +

+ experience@experience.com  +

+
연락처 +

+ 0226690010  +

+
+ +

피신청인 정보

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
피신청인 분류 +

개인 

+
피신청인 이름 +

김길동 

+
주소 +

진주 [52852] 경상남도 진주시 충의로 19, 1/2/5층 

+
이메일 + experience@experience.com  +
연락처 +

0557920000   

+
+
+ +
+
+
+ + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstIncidentDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstIncidentDetail.jsp new file mode 100644 index 00000000..c60c5180 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstIncidentDetail.jsp @@ -0,0 +1,226 @@ +<%@ page contentType="text/html; charset=utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> + +<% pageContext.setAttribute("replaceChar", "\n"); %> + + + + +조정사건 상세 + + + +<%-- --%> + + + + + +" /> +" /> +" /> + + +
+ +
+ + + + + +
+
+ +
+
+
+

[체험] 조정사건 상세

+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
조정사건 상세 정보 : 신청인 분류, 저작물 유형, 신청인 이름, 대리인 이름, 피신청인 이름등의 정보제공
+

신청인 분류

+ 		+

개인

+ 		+

저작물 유형

+ 		+

저작인접물

+
+

신청인

+ 		+

홀길동

+ 		+

대리인

+ 		+

+
+

피신청인 1

+ 		+

김길동

+
+
+ +
+
+
+ +
+
+ + +
+
+

조정신청 내용

+
+ + + + + + + + + + + + + + + + + + + + + + + + +
조정신청 내용 : 저작물 종류, 신청취지, 신청원인, 첨부파일등의 정보제공
+

저작물 종류

+ 		+

+ 미술저작물 +

+
+

신청취지

+ 		+

[체험] 신청취지 내용 입니다.

+
+

신청원인

+ 		+

[체험] 신청원인 내용 입니다.

+
+

첨부파일

+ 		+ +
+
+ +
+
+
+ +
+
+ +
+
+ + From 7b4b027b083900cd87925925b60a44a8621d1893 Mon Sep 17 00:00:00 2001 From: hylee Date: Thu, 29 Sep 2022 16:53:39 +0900 Subject: [PATCH 6/9] =?UTF-8?q?refactor:=EC=8B=A0=EC=B2=AD=EC=84=9C=20?= =?UTF-8?q?=EC=9E=91=EC=84=B1=20-=20=EC=9E=84=EC=8B=9C=EC=A0=80=EC=9E=A5,?= =?UTF-8?q?=EB=8B=A4=EC=9D=8C=EB=8B=A8=EA=B3=84=20=EC=9D=B4=EB=8F=99=20?= =?UTF-8?q?=EB=B2=84=ED=8A=BC=20=EB=B6=84=EA=B8=B0=EC=B2=98=EB=A6=AC=20/?= =?UTF-8?q?=20=EC=9E=84=EC=8B=9C=EC=A0=80=EC=9E=A5=EC=9D=80=20comfirm=20?= =?UTF-8?q?=ED=9B=84=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/kccadr/adjst/adjstReqRegistStep1.jsp | 6 +- .../web/kccadr/adjst/adjstReqRegistStep2.jsp | 8 +- .../kccadr/kccadrCom/kccadrConstantsJsp.jsp | 126 ++++++++++++++++++ 3 files changed, 135 insertions(+), 5 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep1.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep1.jsp index 4e69779f..17737c2e 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep1.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep1.jsp @@ -547,11 +547,13 @@ $( document ).ready(function(){
- + + <%-- --%> - + +
diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep2.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep2.jsp index 686c1103..1d6ab91e 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep2.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep2.jsp @@ -541,14 +541,16 @@
- - +<%-- --%> + +
<%-- --%> - + +
diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp index 5c62aae4..a3c07bca 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp @@ -336,6 +336,75 @@ var AdjstReq = { }); } + } + ,step1SaveConfirm : function(mode){ + + if(!this.validStep(this.STEP)){ + return false; + } + + var saveList = []; + var agntWarp = $("#agntInfo"); + if(agntWarp.length > 0 ){ + var agentData = this.getAgenData(agntWarp); + saveList.push(agentData); + } + + var reqData = this.getReqPersonData($("#reqPerson")); + saveList.push(reqData); + + // 관련인 리스트 + var data = { + adjstRpplList : saveList + }; + // 조정일련번호 + data.adrSeq = $("#adrSeq").val(); + // 이전신청 불러오기 조정일련번호 + data.copyAdrSeq = $("#copyAdrSeq").val(); + // 조정회차 + data.adrSn = $("#adrSn").val(); + // 신청유형 + data.reqTy = $("#reqTy").val(); + + + + // 신청하기, 체험하기 구분 + var depth = this.expDivision(this.STEP); + + var url = "/web/kccadr/"+depth+"/adjstReqRegistStep1Save.do"; + if(mode == "${KccadrConstants.ADR_MODE_UPT}"){ + url = "/web/kccadr/"+depth+"/adjstReqRegistStep1Update.do"; + } + + if (confirm("신청인 정보 임시저장을 진행하시겠습니까?")) { + $.ajax({ + type: "POST", + url: url, + data: JSON.stringify(data), + dataType:'json', + async: false, + processData: false, + contentType: "application/json", + cache: false, + success: function (returnData, status) { + if(returnData.result == 'SUCCESS'){ + var rsData = returnData.rsVO; + if(rsData != null){ + $("#adrSeq").val(rsData.adrSeq); + $("#adrSn").val(rsData.adrSn); + // 카피 일련번호는 무조건 초기화 시켜준다. + $("#copyAdrSeq").val(""); + } + if(confirm("신청인 정보 임시저장이 완료되었습니다.\n다음 페이지로 이동하시겠습니까?")) + { + AdjstReq.fncGoNext(); + } + } + }, + error: function (e) { alert("저장에 실패하였습니다."); console.log("ERROR : ", e); } + }); + } + }, step2Save : function(mode){ if(!this.validStep(this.STEP)){ @@ -391,6 +460,63 @@ var AdjstReq = { }); } + }, + step2SaveConfirm : function(mode){ + if(!this.validStep(this.STEP)){ + return false; + } + var saveList = []; + + var targetObj = $(".personWarp"); + $.each(targetObj, function(idx , obj){ + saveList.push(AdjstReq.getResPersonData($(this))); + }); + + if(targetObj.length != saveList.length){ + alert("피신청인 정보가 일치하지 않습니다. 관리자에게 문으해주세요."); + return false; + } + console.log(saveList); + // 피신청인 리스트 + var data = { + adjstRpplList : saveList + }; + + // 조정일련번호 + data.adrSeq = $("#adrSeq").val(); + // 조정회차 + data.adrSn = $("#adrSn").val(); + + var depth = this.expDivision(this.STEP); + var url = "/web/kccadr/"+depth+"/adjstReqRegistStep2Save.do"; + + if (confirm("피신청인 정보 임시저장을 진행하시겠습니까?")) { + $.ajax({ + type: "POST", + url: url, + data: JSON.stringify(data), + dataType:'json', + async: false, + processData: false, + contentType: "application/json", + cache: false, + success: function (returnData, status) { + if(returnData.result == 'SUCCESS'){ + var rsData = returnData.rsVO; + if(rsData != null){ + $("#adrSeq").val(rsData.adrSeq); + $("#adrSn").val(rsData.adrSn); + } + if(confirm("피신청인 정보 임시저장이 완료되었습니다.\n다음 페이지로 이동하시겠습니까?")) + { + AdjstReq.fncGoNext(); + } + } + }, + error: function (e) { alert("저장에 실패하였습니다."); console.log("ERROR : ", e); } + }); + } + }, step3Save : function(mode, previewYn, adrSeq){ // previewYn : 조정신청등록 3단계 미리보기 버튼 클릭시 > 3단계 저장 처리후 팝업오픈 From 6e322bd4348befd29465a4edff2a788c01f8068c Mon Sep 17 00:00:00 2001 From: subsub8729 Date: Thu, 29 Sep 2022 18:00:53 +0900 Subject: [PATCH 7/9] =?UTF-8?q?2022/09/29=20=EC=B2=B4=ED=97=98=ED=95=98?= =?UTF-8?q?=EA=B8=B0=20=EB=A9=94=EC=9D=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/kccadrPb/tutorial/css/tutorial.css | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/kccadrPb/tutorial/css/tutorial.css b/src/main/webapp/kccadrPb/tutorial/css/tutorial.css index f7d3c6e4..dfb3b8d3 100644 --- a/src/main/webapp/kccadrPb/tutorial/css/tutorial.css +++ b/src/main/webapp/kccadrPb/tutorial/css/tutorial.css @@ -1,4 +1,8 @@ body{position: relative; width: 100%; height: 100%;} .tutorial{width: 100%; height: 100%; overflow-x: hidden;} -.mask{position: absolute; display: flex; width: 100%; height: 100%; left: 0; top: 0;} -.left_mask,.right_mask{width: 50%; height: 100%; background-color: transparent;} \ No newline at end of file +.tutorial img{position: absolute;left: 50%;top: 0;transform: translateX(-50%);} +.mask{position: fixed; display: flex; width: 100%; height: 100%; left: 0; top: 0; z-index: 5;} +.left_mask,.right_mask{width: 50%; height: 100%; background-color: transparent;} +@media all and (max-width: 1800px){ + .tutorial img{width: 100%; min-width: 1680px;} +} \ No newline at end of file From 0c752e796edda3717933e07361e05310c8da0013 Mon Sep 17 00:00:00 2001 From: hylee Date: Thu, 29 Sep 2022 18:13:00 +0900 Subject: [PATCH 8/9] =?UTF-8?q?refactor:=EC=82=AC=EC=9A=A9=EC=9E=90=20?= =?UTF-8?q?=EC=A1=B0=EC=A0=95=EC=8B=A0=EC=B2=AD=20=EC=98=88=EB=AC=B8?= =?UTF-8?q?=EA=B4=80=EB=A6=AC=20=ED=99=94=EB=A9=B4=20-=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adjPgrMgr/apm/web/ApmController.java | 2 - .../kccadr/adjst/service/AdjstReqService.java | 2 + .../adjst/service/impl/AdjstReqDAO.java | 4 + .../service/impl/AdjstReqServiceImpl.java | 5 ++ .../adjst/web/AdjstReqWebController.java | 24 ++++++ .../kccadr/adjst/AdjstReq_SQL_Mysql.xml | 17 +++++ .../adjst/adjstReqRegistInformation.jsp | 2 +- .../web/kccadr/adjst/adjstReqRegistStep3.jsp | 4 +- .../adjst/popup/adjstReqOpenExamplePop.jsp | 54 +++++++------ .../adjst/popup/adjstReqOpenExamplePop2.jsp | 75 +++++++++++++++++++ .../kccadr/kccadrCom/kccadrConstantsJsp.jsp | 13 +++- 11 files changed, 172 insertions(+), 30 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/popup/adjstReqOpenExamplePop2.jsp diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java index 67a59458..1a210bd4 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java @@ -630,14 +630,12 @@ public class ApmController { model.addAttribute("ccTy", adjstReqVO.getCcTy()); model.addAttribute("exmpCd", adjstReqVO.getExmpCd()); - System.out.println("adjstReqVO.getExmpCd() : "+ adjstReqVO.getExmpCd()); return "/kccadr/adjPgrMgr/apm/popup/adjstReqOpenExamplePop"; } - /** * 대리인등록 팝업 상세 * diff --git a/src/main/java/kcc/kccadr/adjst/service/AdjstReqService.java b/src/main/java/kcc/kccadr/adjst/service/AdjstReqService.java index 12b81fea..9de57583 100644 --- a/src/main/java/kcc/kccadr/adjst/service/AdjstReqService.java +++ b/src/main/java/kcc/kccadr/adjst/service/AdjstReqService.java @@ -52,6 +52,8 @@ public interface AdjstReqService { public AdjstReqVO selectAdjsMgrMaster(AdjstReqVO adjstReqVO) throws Exception; public AdjstReqVO selectAdjstReqOpenExamplePopCn(AdjstReqVO adjstReqVO) throws Exception; + + public AdjstReqVO selectAdjstReqOpenExamplePop(AdjstReqVO adjstReqVO) throws Exception; // 조정사건 대리인/신청인/피신청인 정보 불러오기 public List selectAdjsReqUserListByadjSeq(AdjstReqVO adjstReqVO) throws Exception; diff --git a/src/main/java/kcc/kccadr/adjst/service/impl/AdjstReqDAO.java b/src/main/java/kcc/kccadr/adjst/service/impl/AdjstReqDAO.java index 9750fb91..2b1764d3 100644 --- a/src/main/java/kcc/kccadr/adjst/service/impl/AdjstReqDAO.java +++ b/src/main/java/kcc/kccadr/adjst/service/impl/AdjstReqDAO.java @@ -176,6 +176,10 @@ public class AdjstReqDAO extends EgovAbstractDAO { return (AdjstReqVO) select("AdjstReqDAO.selectAdjstReqOpenAnswerExamplePop",adjstReqVO); } + public AdjstReqVO selectAdjstReqOpenExamplePop(AdjstReqVO adjstReqVO) throws Exception { + return (AdjstReqVO) select("AdjstReqDAO.selectAdjstReqOpenExamplePop",adjstReqVO); + } + public int selectRespondentSchChk(AdjstReqVO adjstReqVO) { return (Integer) select("AdjstReqDAO.selectRespondentSchChk", adjstReqVO); } diff --git a/src/main/java/kcc/kccadr/adjst/service/impl/AdjstReqServiceImpl.java b/src/main/java/kcc/kccadr/adjst/service/impl/AdjstReqServiceImpl.java index 7217d46e..5b3b3db1 100644 --- a/src/main/java/kcc/kccadr/adjst/service/impl/AdjstReqServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjst/service/impl/AdjstReqServiceImpl.java @@ -1175,4 +1175,9 @@ public class AdjstReqServiceImpl extends EgovAbstractServiceImpl implements Adj return new RestResponse(HttpStatus.OK, resultMsg, LocalDateTime.now()); } + + @Override + public AdjstReqVO selectAdjstReqOpenExamplePop(AdjstReqVO adjstReqVO) throws Exception { + return adjstReqDAO.selectAdjstReqOpenExamplePop(adjstReqVO); + } } diff --git a/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java b/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java index eaf74705..bd1dbe0e 100644 --- a/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java +++ b/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java @@ -207,6 +207,30 @@ public class AdjstReqWebController { model.addAttribute("exmpCd", adjstReqVO.getExmpCd()); return "/web/kccadr/adjst/popup/adjstReqOpenExamplePop"; } + + + /** + * 예문 팝업 상세 + * + * @param dlvinfoVO + * @param model + * @return + * @throws Exception + */ + @RequestMapping(value = "/web/kccadr/adjst/popup/adjstReqOpenExamplePop2.do") + public String adjstReqOpenExamplePop2(@ModelAttribute("adjstReqVO") AdjstReqVO adjstReqVO, ModelMap model) throws Exception { + + AdjstReqVO exmp = adjstReqService.selectAdjstReqOpenExamplePop(adjstReqVO); + + if (exmp != null && StringUtils.isNotBlank(exmp.getAtchFileId())) { + FileVO fileVO = new FileVO(); + fileVO.setAtchFileId(exmp.getAtchFileId()); + List fileList = fileService.selectFileInfs(fileVO); + model.addAttribute("fileList", fileList); + } + model.addAttribute("exmp", exmp); + return "/web/kccadr/adjst/popup/adjstReqOpenExamplePop2"; + } @RequestMapping("/web/kccadr/adjst/popup/adjstReqOpenExamplePopCn.do") public ResponseEntity adjstReqOpenExamplePopCn(@RequestBody AdjstReqVO adjstReqVO) throws Exception { diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjst/AdjstReq_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjst/AdjstReq_SQL_Mysql.xml index ce0f0b4d..7005ac1f 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjst/AdjstReq_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjst/AdjstReq_SQL_Mysql.xml @@ -891,4 +891,21 @@ WHERE T1.code_id = #codeId# limit 1 + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistInformation.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistInformation.jsp index bb8ddab7..bbfbd2f7 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistInformation.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistInformation.jsp @@ -79,7 +79,7 @@ function tutorialPop(){

조정신청

- +
diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep3.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep3.jsp index 38fe8ec6..c6396b11 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep3.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep3.jsp @@ -242,10 +242,10 @@ function fn_adjstReq_preview() { <%-- --%> - + - + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/popup/adjstReqOpenExamplePop.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/popup/adjstReqOpenExamplePop.jsp index f2b2c699..d96f4e58 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/popup/adjstReqOpenExamplePop.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/popup/adjstReqOpenExamplePop.jsp @@ -53,31 +53,31 @@ $(document).ready(function(){ /* * 상세내용 select */ - function fn_selectCn(){ - $.ajax({ - type: "POST", - url: "/web/kccadr/adjst/popup/adjstReqOpenExamplePopCn.do", - data: JSON.stringify({exmpCd : $("#exmpCd").val() - , exmpCcTy : $("#exmpCcTy").val() }), - dataType:'json', - async: false, - processData: false, - contentType: "application/json", - cache: false, - success: function (data) { - if(data.status == "OK"){ - console.log('data : ', data); - $('#exmpCn').text(data.data); - }else{ - return false; - } - }, - error: function (e) { alert("조회에 실패하였습니다."); console.log("ERROR : ", e); } - }); +// function fn_selectCn(){ +// $.ajax({ +// type: "POST", +// url: "/web/kccadr/adjst/popup/adjstReqOpenExamplePopCn.do", +// data: JSON.stringify({exmpCd : $("#exmpCd").val() +// , exmpCcTy : $("#exmpCcTy").val() }), +// dataType:'json', +// async: false, +// processData: false, +// contentType: "application/json", +// cache: false, +// success: function (data) { +// if(data.status == "OK"){ +// console.log('data : ', data); +// $('#exmpCn').text(data.data); +// }else{ +// return false; +// } +// }, +// error: function (e) { alert("조회에 실패하였습니다."); console.log("ERROR : ", e); } +// }); - } +// } - fn_selectCn(); +// fn_selectCn(); }) @@ -105,7 +105,12 @@ $(document).ready(function(){ - +<%-- --%> + @@ -113,6 +118,7 @@ $(document).ready(function(){ 내용 + 1)피신청인은 신청인에게 저작권 침해에 따른 손해배상 및 위자료로서 금삼백만원(W3,000,000)을 지급한다. 2)피신청인이 제작, 보유하고 있는 본 건 침해물 <월간 스키라이브>를 조정성립일로부터 14일 이내에 폐기처분한다. 라는 조정을 구합니다 diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/popup/adjstReqOpenExamplePop2.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/popup/adjstReqOpenExamplePop2.jsp new file mode 100644 index 00000000..7736d1e9 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/popup/adjstReqOpenExamplePop2.jsp @@ -0,0 +1,75 @@ +<%@ page contentType="text/html; charset=utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%pageContext.setAttribute("crlf", "\r\n"); %> + + + +조정신청 예문보기 + + + + + +
+
+

조정신청 예문

+
+
+ +
+ * +
+ + + + + + + + + + + +
+ + + + + + 등록된 내용이 없습니다. + + +
+
+ +
+
+
+ + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp index a3c07bca..39b9b3e7 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp @@ -1224,8 +1224,19 @@ var AdjstReq = { ); }, openExamplePop : function(exmpCd){ + var uri = ''; + if(exmpCd == '01') + { + uri = "adjstReqOpenExamplePop.do"; + } + else if (exmpCd == '02') + { + uri = "adjstReqOpenExamplePop2.do"; + + } + commonPopLayeropen( - "/web/kccadr/adjst/popup/adjstReqOpenExamplePop.do" + "/web/kccadr/adjst/popup/"+uri , 1100 , 600 , {ccTy : $("#ccTy").val(), exmpCd : exmpCd} From 2b32ef3a6ab0816c615e86f25a32c65e24171daf Mon Sep 17 00:00:00 2001 From: hylee Date: Thu, 29 Sep 2022 18:32:22 +0900 Subject: [PATCH 9/9] =?UTF-8?q?refactor:=ED=8A=9C=ED=86=A0=EB=A6=AC?= =?UTF-8?q?=EC=96=BC=20=EB=B2=84=ED=8A=BC=20=EC=88=98=EC=A0=95=20/=20?= =?UTF-8?q?=EC=B2=B4=ED=97=98=ED=95=98=EA=B8=B0=EC=8B=A0=EC=B2=AD=20-=20?= =?UTF-8?q?=ED=8A=9C=ED=86=A0=EB=A6=AC=EC=96=BC=20=EA=B8=B0=EB=8A=A5=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kcc/kccadr/adjstExp/web/AdjstExpController.java | 9 +++++++++ .../web/kccadr/adjst/adjstReqRegistInformation.jsp | 2 +- .../web/kccadr/adjstExp/adjstReqRegistInformation.jsp | 11 +++++++++-- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpController.java b/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpController.java index 15a8a2b5..d902024d 100644 --- a/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpController.java +++ b/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpController.java @@ -470,5 +470,14 @@ public class AdjstExpController { ModelMap model) throws Exception { return "/web/kccadr/adjstExp/popup/adjstIncidentDetailPop"; } + + /** + * 조정신청 구분선택 - 안내화면 + */ + @RequestMapping("/web/kccadr/adjstExpDetail/popup/adjstReqRegistTutorial.do") + public String adjstReqRegistTutorial() throws Exception { + + return "/web/kccadr/adjst/adjstReqRegistTutorial"; + } } diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistInformation.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistInformation.jsp index bbfbd2f7..44af24b8 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistInformation.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistInformation.jsp @@ -79,7 +79,7 @@ function tutorialPop(){

조정신청

- +
diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistInformation.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistInformation.jsp index 4eb0059a..3ba51d90 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistInformation.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistInformation.jsp @@ -61,19 +61,26 @@ $( document ).ready(function(){ //공동인증서 등록화면 이동 function fnGoCrtfc(){ - location.href=""; - } + +function tutorialPop(){ + var form = document.popForm; + commonPopWindowopenForm("/web/kccadr/adjstExpDetail/popup/adjstReqRegistTutorial.do" , "50000", "50000", "tutorialPop", $("#popForm")); +} + +
+

조정신청 체험하기

+