From 4b663b2731b82f63c43330e354a7fb9d9a03c516 Mon Sep 17 00:00:00 2001 From: HappyITN Date: Mon, 21 Nov 2022 11:34:14 +0900 Subject: [PATCH 1/6] =?UTF-8?q?=EC=A1=B0=EC=83=81=ED=9D=AC=20=EB=A0=88?= =?UTF-8?q?=EB=93=9C=EB=A7=88=EC=9D=B8=20#2894=20=ED=8C=9D=EC=97=85=20?= =?UTF-8?q?=ED=83=80=EC=9D=B4=ED=8B=80=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsp/kccadr/adjPgrMgr/apm/popup/adjstReqOpenExamplePop.jsp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/adjstReqOpenExamplePop.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/adjstReqOpenExamplePop.jsp index a306af41..fca02b82 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/adjstReqOpenExamplePop.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/adjstReqOpenExamplePop.jsp @@ -114,6 +114,7 @@ function workView(obj){
+

신청취지

From 2dedcb5e583c952d7caeb5c029a6b96c7feb3f68 Mon Sep 17 00:00:00 2001 From: HappyITN Date: Mon, 21 Nov 2022 14:19:35 +0900 Subject: [PATCH 2/6] =?UTF-8?q?=EC=A1=B0=EC=83=81=ED=9D=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 조정사건 기록열람 리스트 조정사건 기록열람 신청 페이지 HTML작업 --- .../webapp/kccadrPb/usr/docIssReqList.html | 457 ++++++++++++++++++ .../webapp/kccadrPb/usr/docIssReqRegist.html | 371 ++++++++++++++ 2 files changed, 828 insertions(+) create mode 100644 src/main/webapp/kccadrPb/usr/docIssReqList.html create mode 100644 src/main/webapp/kccadrPb/usr/docIssReqRegist.html diff --git a/src/main/webapp/kccadrPb/usr/docIssReqList.html b/src/main/webapp/kccadrPb/usr/docIssReqList.html new file mode 100644 index 00000000..932d4d96 --- /dev/null +++ b/src/main/webapp/kccadrPb/usr/docIssReqList.html @@ -0,0 +1,457 @@ + + + + + + + + 저작권 전자조정시스템 > 나의 사건 관리 > 사건기록 열람•발급 + + + + + + + + + + + + + + + + + +
+
+ 본문 바로가기 +
+ + +
+
+
+
+ 한국저작권위원회 + 바로가기 +
+
+ 로그인 + 회원가입 +
+ + +
+
+
+
+
+
+

저작권 전자조정시스템 Copyright Electronic Coordination System

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

저작권 전자조정시스템 Copyright Electronic Coordination System

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

조정사건 기록열람 신청목록

+
+ + +
+
+ + + +
+
+ + +
+
+ + +
+
+
+ + +
+
+ + +
+ +
+
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
번호신청일자조정번호신청인피신청인신청서류처리상태
+ 3 + + 신청일자 +

2022-10-31 12:39:16

+ 		+ 조정번호 +

2022조정058

+ 		+ 신청인 + 최하연 + + 피신청인 + 배당결재전까지되돌리 + + 신청서류 +

기일통지서

+ 		+ 처리상태 +

열람완료

+
+ 2 + + 신청일자 +

2022-10-31 12:39:16

+ 		+ 조정번호 +

2022조정058

+ 		+ 신청인 + 최하연 + + 피신청인 + 배당결재전까지되돌리 + + 신청서류 +

기일통지서

+ 		+ 처리상태 +

+
+ 1 + + 신청일자 +

2022-10-31 12:39:16

+ 		+ 조정번호 +

2022조정058

+ 		+ 신청인 + 최하연 + + 피신청인 + 배당결재전까지되돌리 + + 신청서류 +

기일통지서

+ 		+ 처리상태 +

+ + +

+
+
+ + + +
+ +
+ + + +
+ + + + + + + + + + + + + + +
+ +
+
+ + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/kccadrPb/usr/docIssReqRegist.html b/src/main/webapp/kccadrPb/usr/docIssReqRegist.html new file mode 100644 index 00000000..4837a8d8 --- /dev/null +++ b/src/main/webapp/kccadrPb/usr/docIssReqRegist.html @@ -0,0 +1,371 @@ + + + + + + + + 저작권 전자조정시스템 > 나의 사건 관리 > 사건기록 열람•발급 + + + + + + + + + + + + + + + + + +
+
+ 본문 바로가기 +
+ + +
+
+
+
+ 한국저작권위원회 + 바로가기 +
+
+ 로그인 + 회원가입 +
+ + +
+
+
+
+
+
+

저작권 전자조정시스템 Copyright Electronic Coordination System

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

저작권 전자조정시스템 Copyright Electronic Coordination System

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

조정사건 기록열람 신청

+
+
+

열람수수료는 700원, 발급수수료는 1,000원입니다.

+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
조정사건 기록열람 신청 정보 : 조정번호, 신청인 구분, 조정당사자 여부, 서류종류, 열람발급여부 발급부수등의 정보제공
+

필수입력 항목*

+

조정번호

+ 		+ + + +
+

필수입력 항목*

+

신청인 구분

+ 		+
+ + +
+
+

필수입력 항목*

+

조정당사자 여부

+ 		+
+ + + +
+
+

필수입력 항목*

+

서류종류

+ 		+
+ +
+
+

필수입력 항목*

+

열람/발급여부

+ 		+
+ + +
+
+

필수입력 항목*

+

발급부수

+ 		+ + 통 +
+
+ +
+ + +
+ +
+
+ + + + + + + + \ No newline at end of file From 9979e01acdd65c654be4dc1f9408bde3c9aba62f Mon Sep 17 00:00:00 2001 From: LJH Date: Mon, 21 Nov 2022 14:54:56 +0900 Subject: [PATCH 3/6] =?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=A1=B0=EC=A0=95=EC=A7=84=ED=96=89=20=EB=AA=A9=EB=A1=9D?= =?UTF-8?q?=EC=97=90=EC=84=9C=20=EC=A2=85=EA=B2=B0=20=ED=83=AD=20=EC=A3=BC?= =?UTF-8?q?=EC=84=9D=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/jsp/web/kccadr/accdnt/ai/adjstIncidentList.jsp | 2 +- .../WEB-INF/jsp/web/kccadr/adjstExp/adjstIncidentList.jsp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ai/adjstIncidentList.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ai/adjstIncidentList.jsp index 4fd81722..05570bb7 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ai/adjstIncidentList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ai/adjstIncidentList.jsp @@ -129,7 +129,7 @@ - + <%-- --%>
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 ad97b467..f6f7ec96 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 @@ -122,7 +122,7 @@ - + <%-- --%>
From d574cacb2b1c78ace5a7d7f5755519e8287aec00 Mon Sep 17 00:00:00 2001 From: LJH Date: Mon, 21 Nov 2022 18:09:00 +0900 Subject: [PATCH 4/6] =?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=B2=B4=ED=97=98=ED=95=98=EA=B8=B0=20=EC=82=AC=EA=B1=B4?= =?UTF-8?q?=EA=B8=B0=EB=A1=9D=20=EC=97=B4=EB=9E=8C=20=EB=B0=8F=20=EC=8B=A0?= =?UTF-8?q?=EC=B2=AD=20=EB=B6=99=EC=9D=B4=EA=B8=B0=20=20-=20=EC=B2=B4?= =?UTF-8?q?=ED=97=98=ED=95=98=EA=B8=B0=20=EC=A2=85=EA=B2=B0=EC=82=AC?= =?UTF-8?q?=EA=B1=B4=20=EB=AA=A9=EB=A1=9D,=20=EC=83=81=EC=84=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adjstExp/web/AdjstExpController.java | 36 +++ src/main/java/kcc/web/MainController.java | 8 +- src/main/resources/log4j2.xml | 14 +- .../kccadr/adjstExp/adjstIncidentEndList.jsp | 277 ++++++++++++++++++ .../jsp/web/kccadr/adjstExp/docIssReqList.jsp | 233 +++++++++++++++ .../jsp/web/kccadr/adjstExp/mainExpPage.jsp | 4 +- .../adjstExpDetail/adjstIncidentEndDetail.jsp | 179 +++++++++++ .../kccadr/adjstExpDetail/docIssReqRegist.jsp | 158 ++++++++++ 8 files changed, 896 insertions(+), 13 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstIncidentEndList.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/docIssReqList.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstIncidentEndDetail.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/docIssReqRegist.jsp diff --git a/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpController.java b/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpController.java index 649039e0..f20cad5e 100644 --- a/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpController.java +++ b/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpController.java @@ -402,6 +402,42 @@ public class AdjstExpController { return "/web/kccadr/adjstExp/adjstIncidentList"; } + /** + * 체험하기 사건 기록 및 열람 목록 + */ + @RequestMapping("/web/kccadr/adjstExp/docIssReqList.do") + public String docIssReqList(@ModelAttribute("adjstIncidentVO") AdjstIncidentVO adjstIncidentVO, ModelMap model) throws Exception { + + return "/web/kccadr/adjstExp/docIssReqList"; + } + + /** + * 체험하기 사건 기록 및 열람 등록 + */ + @RequestMapping("/web/kccadr/adjstExp/docIssReqRegist.do") + public String docIssReqRegist(@ModelAttribute("adjstIncidentVO") AdjstIncidentVO adjstIncidentVO, ModelMap model) throws Exception { + + return "/web/kccadr/adjstExpDetail/docIssReqRegist"; + } + + /** + * 체험하기 종결사건목록 + */ + @RequestMapping("/web/kccadr/adjstExp/adjstIncidentEndList.do") + public String adjstIncidentEndList(@ModelAttribute("adjstIncidentVO") AdjstIncidentVO adjstIncidentVO, ModelMap model) throws Exception { + + return "/web/kccadr/adjstExp/adjstIncidentEndList"; + } + + /** + * 체험하기 종결사건상세 + */ + @RequestMapping("/web/kccadr/adjstExpDetail/adjstIncidentEndDetail.do") + public String adjstIncidentEndDetail(@ModelAttribute("adjstIncidentVO") AdjstIncidentVO adjstIncidentVO, ModelMap model) throws Exception { + + return "/web/kccadr/adjstExpDetail/adjstIncidentEndDetail"; + } + /*** * 예문 팝업 * diff --git a/src/main/java/kcc/web/MainController.java b/src/main/java/kcc/web/MainController.java index 1fa17550..8b619908 100644 --- a/src/main/java/kcc/web/MainController.java +++ b/src/main/java/kcc/web/MainController.java @@ -1328,10 +1328,10 @@ public class MainController { ||menuUrl.equals("/web/kccadr/adjstExp/adjstReqRegistStep2.do") ||menuUrl.equals("/web/kccadr/adjstExp/adjstReqRegistStep3.do") ||menuUrl.equals("/web/kccadr/adjstExp/SsoLoginUsr.do") - ||menuUrl.equals("") - ||menuUrl.equals("") - ||menuUrl.equals("") - ||menuUrl.equals("") + ||menuUrl.equals("/web/kccadr/adjstExp/docIssReqList.do") + ||menuUrl.equals("/web/kccadr/adjstExp/docIssReqRegist.do") + ||menuUrl.equals("/web/kccadr/adjstExp/adjstIncidentEndList.do") + ||menuUrl.equals("/web/kccadr/adjstExpDetail/adjstIncidentEndDetail.do") ) { //체험하기 menuUrl = "/web/kccadr/adjstExp/adjstExpMainPage.do"; } diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml index 6e9f3aec..655d472e 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -9,18 +9,18 @@ - - + + - + - - - + + + - + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstIncidentEndList.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstIncidentEndList.jsp new file mode 100644 index 00000000..d3a05b8a --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstIncidentEndList.jsp @@ -0,0 +1,277 @@ +<%-- + 대국민 사용자 + Class Name : adjstReq2Regist.jsp + Description : 조정신청 등록화면2 - 신청인정보 등록 + Modification Information + + 수정일 수정자 수정내용 + ------- -------- --------------------------- + 2021.08.18 여현준 내용 + + author : 여현준 + since : 2021.08.18 + +--%> +<%-- 공통 JS 함수 정의 : /jsp/web/com/webLayout.jsp --%> +<%@ 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="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ 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" %> + + + + + + + + [체험하기] 종결사건 목록 + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+

[체험하기]종결사건 목록

+
+ + +
+
+ + + +
+
+ + +
+ ~ +
+ + +
+
+
+ + +
+
+ + +
+ +
+
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
번호<%----%>접수일자<%----%>사건번호신청인<%----%>피신청인<%----%>신청내용<%----%>조정부<%----%>진행차수<%----%>열람신청
+ 3 + + 접수일자 +

2022-11-14

+ 		+ 조정번호 +

2022조정003

+ 		+ 신청인 + 홍길동 + + 피신청인 + 김철수 + +
+ 신청내용 + +
+ 신청취지 : 피신청인은 신청인에게 저작권 침해에 따른 손해배상 및 위자료로서 금삼백만원(￦3,000,000)을 지급한다. +
+
+ 		+ 조정부 +

조정1팀

+ 		+ 진행차수 +

-

+ 		+ 열람신청 + +
+ 2 + + 접수일자 +

2022-11-14

+ 		+ 조정번호 +

2022조정003

+ 		+ 신청인 + 이영희 + + 피신청인 + 최수진 + +
+ 신청내용 + +
+ 신청취지 : 피신청인은 신청인에게 저작권 침해에 따른 손해배상 및 위자료로서 금삼백만원(￦3,000,000)을 지급한다. +
+
+ 		+ 조정부 +

조정2팀

+ 		+ 진행차수 +

-

+ 		+ 열람신청 + +
+ 1 + + 접수일자 +

2022-11-14

+ 		+ 조정번호 +

2022조정003

+ 		+ 신청인 + 이준호 + + 피신청인 + 김길동 + +
+ 신청내용 + +
+ 신청취지 : 피신청인은 신청인에게 저작권 침해에 따른 손해배상 및 위자료로서 금삼백만원(￦3,000,000)을 지급한다. +
+
+ 		+ 조정부 +

조정2팀

+ 		+ 진행차수 +

-

+ 		+ 열람신청 + +
+
+ + +
+ + + + + +
+ +
+ + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/docIssReqList.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/docIssReqList.jsp new file mode 100644 index 00000000..b43bae83 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/docIssReqList.jsp @@ -0,0 +1,233 @@ +<%-- + 대국민 사용자 + Class Name : adjstReq2Regist.jsp + Description : 조정신청 등록화면2 - 신청인정보 등록 + Modification Information + + 수정일 수정자 수정내용 + ------- -------- --------------------------- + 2021.08.18 여현준 내용 + + author : 여현준 + since : 2021.08.18 + +--%> +<%-- 공통 JS 함수 정의 : /jsp/web/com/webLayout.jsp --%> +<%@ 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="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ 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" %> + + + + + + + + [체험하기] 사건기록 열람•발급 + + + + + + + + + + + + + + + + + + +
+
+
+

조정사건 기록열람 신청목록

+
+ + +
+
+ + + +
+
+ + +
+
+ + +
+
+
+ + +
+
+ + +
+ +
+
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
번호신청일자조정번호신청인피신청인신청서류처리상태
+ 3 + + 신청일자 +

2022-10-31 12:39:16

+ 		+ 조정번호 +

2022조정058

+ 		+ 신청인 + 최하연 + + 피신청인 + 배당결재전까지되돌리 + + 신청서류 +

기일통지서

+ 		+ 처리상태 +

열람완료

+
+ 2 + + 신청일자 +

2022-10-31 12:39:16

+ 		+ 조정번호 +

2022조정058

+ 		+ 신청인 + 최하연 + + 피신청인 + 배당결재전까지되돌리 + + 신청서류 +

기일통지서

+ 		+ 처리상태 +

+
+ 1 + + 신청일자 +

2022-10-31 12:39:16

+ 		+ 조정번호 +

2022조정058

+ 		+ 신청인 + 최하연 + + 피신청인 + 배당결재전까지되돌리 + + 신청서류 +

기일통지서

+ 		+ 처리상태 +

+ + +

+
+
+ + + +
+ +
+ + + +
+ + + + + +
+ +
+
+ + + 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 a65862ef..145bfe07 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 @@ -107,12 +107,12 @@ function goExpPage(num) { } else if(num==4) {// 열랍 발급 - goUrl = ""; + goUrl = ""; frm.searchStatus.value = 'C'; } else if(num==5) {// 열랍 발급 - goUrl = ""; + goUrl = ""; frm.searchStatus.value = 'C'; } else diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstIncidentEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstIncidentEndDetail.jsp new file mode 100644 index 00000000..4d502028 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstIncidentEndDetail.jsp @@ -0,0 +1,179 @@ +<%@ 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="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> + + + + + + + + [체험하기] 종결사건 상세 + + + + + + + + + + + + + + + + + + + + + +
+
+
+

종결사건 상세

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

신청인 분류

+ 		+

개인

+ 		+

저작물 유형

+ 		+

도형저작물

+
+

신청인

+ 		+

홍길동

+ 		+

대리인

+ 		+

김대리

+
+

피신청인 1

+ 		+

김철수

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

조정신청 내용

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

저작물 종류

+ 		+

+ 도형저작물 +

+
+

신청취지

+ 		+

+ 1)피신청인은 신청인에게 저작권 침해에 따른 손해배상 및 위자료로서 금삼백만원(W3,000,000)을 지급한다. + 2)피신청인이 제작, 보유하고 있는 본 건 침해물을 조정성립일로부터 14일 이내에 폐기처분한다. 라는 조정을 구합니다 +

+
+

신청원인

+ 		+

+ 1)신청인은 아마추어 사진작가로서 틈틈이 여행을 하며 취미삼아 사진을 찍어 개인 홈페이지를 통해 일반에 공개하는 등 사진동호회 활동을 열심히 해오고 있습니다. 신청인은 동호회 활동의 일환으로 2004년 1월 10일에 특정 스키장 에서 주변 경치를 소재로 사진 5컷을 촬영하여 2004년 1월 15일에 홈페이지에 올려놓았으며, 일주일 뒤에 저작권위원회에 저작권등록(등록번호:C-2999-123456)을 하였습니다.(첨부1, 2 참조). + 2)피신청인은 스키용품 전문지'스키스키’책자를 발행하는 출판사로서 본격적인 스키철에 대비하여 신청인의 사진 5컷을 허락 없이 7월에서 9월까지 3달에 걸쳐 ‘스키스키’ 1면(국배판)에 전면의 약 1/3정도의 크기로 하단부에 게재하였습니다.(첨부3, 4 참조). +

+
+

첨부파일

+ 		+ +
+
+ +
+
+
+ +
+
+ +
+
+ + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/docIssReqRegist.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/docIssReqRegist.jsp new file mode 100644 index 00000000..c93c0c22 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/docIssReqRegist.jsp @@ -0,0 +1,158 @@ +<%-- + 대국민 사용자 + Class Name : adjstReq2Regist.jsp + Description : 조정신청 등록화면2 - 신청인정보 등록 + Modification Information + + 수정일 수정자 수정내용 + ------- -------- --------------------------- + 2021.08.18 여현준 내용 + + author : 여현준 + since : 2021.08.18 + +--%> +<%-- 공통 JS 함수 정의 : /jsp/web/com/webLayout.jsp --%> +<%@ 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="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ 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" %> + + + + + + + + [체험하기] 사건기록 열람•발급 + + + + + + + + + + + + + + + + + + + +
+
+
+

조정사건 기록열람 신청

+
+
+

열람수수료는 700원, 발급수수료는 1,000원입니다.

+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
조정사건 기록열람 신청 정보 : 조정번호, 신청인 구분, 조정당사자 여부, 서류종류, 열람발급여부 발급부수등의 정보제공
+

필수입력 항목*

+

조정번호

+ 		+ + + +
+

필수입력 항목*

+

신청인 구분

+ 		+
+ + +
+
+

필수입력 항목*

+

조정당사자 여부

+ 		+
+ + + +
+
+

필수입력 항목*

+

서류종류

+ 		+
+ +
+
+

필수입력 항목*

+

열람/발급여부

+ 		+
+ + +
+
+

필수입력 항목*

+

발급부수

+ 		+ + 통 +
+
+ +
+ + +
+ +
+
+ + + + From a4a400db923763ec3941989ade8a902f528060a4 Mon Sep 17 00:00:00 2001 From: LJH Date: Mon, 21 Nov 2022 18:11:25 +0900 Subject: [PATCH 5/6] =?UTF-8?q?log4j2=20=EC=9B=90=EB=B3=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/log4j2.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml index 655d472e..6e9f3aec 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -9,18 +9,18 @@ - - + + - + - - - + + + - + From 8f77c0426fb633d8d54cac6a6cdf7570a5e1633a Mon Sep 17 00:00:00 2001 From: hylee Date: Tue, 22 Nov 2022 16:24:10 +0900 Subject: [PATCH 6/6] =?UTF-8?q?feat:=ED=94=BC=EB=8C=80=EB=A6=AC=EC=9D=B8?= =?UTF-8?q?=20=EC=88=98=EC=A0=95=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= =?UTF-8?q?=20/=20=EB=8C=80=EC=9A=A9=EB=9F=89=20=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=EC=97=85=EB=A1=9C=EB=93=9C=20=EC=86=94=EB=A3=A8=EC=85=98=20?= =?UTF-8?q?=ED=99=9C=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cmm/service/AdrInnorixFileEnumVO.java | 31 +- .../kcc/com/cmm/service/AdrInnorixFileVO.java | 19 +- .../service/impl/InnorixFileServiceImpl.java | 92 +++-- .../adjPgrMgr/apm/service/ApmService.java | 3 +- .../apm/service/impl/ApmServiceImpl.java | 29 +- .../adjPgrMgr/apm/web/ApmController.java | 27 +- .../kccadr/adjPgrMgr/apm/Apm_SQL_Mysql.xml | 3 +- .../adjPgrMgr/apm/popup/updtRpplPop.jsp | 238 +++++++++--- .../apm/popup/updtRpplPop_backup.jsp | 341 ++++++++++++++++++ src/main/webapp/innorix/exam/download.jsp | 8 +- src/main/webapp/innorix/exam/edit.html | 2 +- 11 files changed, 697 insertions(+), 96 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/updtRpplPop_backup.jsp diff --git a/src/main/java/kcc/com/cmm/service/AdrInnorixFileEnumVO.java b/src/main/java/kcc/com/cmm/service/AdrInnorixFileEnumVO.java index 9a1d66f4..371cf040 100644 --- a/src/main/java/kcc/com/cmm/service/AdrInnorixFileEnumVO.java +++ b/src/main/java/kcc/com/cmm/service/AdrInnorixFileEnumVO.java @@ -1,23 +1,40 @@ package kcc.com.cmm.service; public enum AdrInnorixFileEnumVO { - /** 과거사건문서 > 문서관리 */ adjReqMgrPastFileRegist("PST_", "", "", "", "") - /** 조정진행목록 > 사건문서 > 문서등록 */ , docRegPop("CHGDATE_", "정진행관리>>조정진행목록>조정진행상세>사건문서>P>문서등록", "A160", "", "") + /** 과거사건문서 > 문서관리 */ adjReqMgrPastFileRegist("INSERT", "PST_", "", "", "", "", true) + /** 조정진행목록 > 사건문서 > 문서등록 */ , docRegPop("INSERT", "CHGDATE_", "정진행관리>>조정진행목록>조정진행상세>사건문서>P>문서등록", "A160", "", "", true) + /** 조정진행목록 > 조정진행상세 > 대리인 수정 */ , updtRpplPop("UPDATE", "CHGDATE_", "", "", "", "", true) ; - + // INSERT UPDATE 구분 + private final String mode; + + // save 파일명 앞 private final String p_file_nm_prefix; + + // history 값 private final String p_code_desc; + + // history 값 private final String p_stat_cd; private final String p_adrHstryMgrSeq; private final String p_updateQuery; + + //AdrRpplDoc 메소드를 사용할지 말지 여부 + private final boolean isAdrRpplDoc; - AdrInnorixFileEnumVO(String p_file_nm_prefix, String p_code_desc, String p_stat_cd, String p_adrHstryMgrSeq, String p_updateQuery) { + AdrInnorixFileEnumVO(String mode, String p_file_nm_prefix, String p_code_desc, String p_stat_cd, String p_adrHstryMgrSeq, String p_updateQuery, boolean isAdrRpplDoc) { + this.mode = mode; this.p_file_nm_prefix = p_file_nm_prefix; this.p_code_desc = p_code_desc; this.p_stat_cd = p_stat_cd; this.p_adrHstryMgrSeq = p_adrHstryMgrSeq; this.p_updateQuery = p_updateQuery; + this.isAdrRpplDoc = isAdrRpplDoc; + } + + public String getMode() { + return mode; } public String getP_file_nm_prefix() { @@ -40,12 +57,18 @@ public enum AdrInnorixFileEnumVO { return p_updateQuery; } + public boolean isAdrRpplDoc() { + return isAdrRpplDoc; + } + public AdrInnorixFileVO conversion(AdrInnorixFileEnumVO enumVO, AdrInnorixFileVO adrInnorixFileListVO) { adrInnorixFileListVO.setP_file_nm_prefix(enumVO.getP_file_nm_prefix()); adrInnorixFileListVO.setP_code_desc(enumVO.getP_code_desc()); adrInnorixFileListVO.setP_stat_cd(enumVO.getP_stat_cd()); adrInnorixFileListVO.setP_adrHstryMgrSeq(enumVO.getP_adrHstryMgrSeq()); + adrInnorixFileListVO.setMode(enumVO.getMode()); + adrInnorixFileListVO.setAdrRpplDoc(enumVO.isAdrRpplDoc()); return adrInnorixFileListVO; } diff --git a/src/main/java/kcc/com/cmm/service/AdrInnorixFileVO.java b/src/main/java/kcc/com/cmm/service/AdrInnorixFileVO.java index 10860f01..e75b01e6 100644 --- a/src/main/java/kcc/com/cmm/service/AdrInnorixFileVO.java +++ b/src/main/java/kcc/com/cmm/service/AdrInnorixFileVO.java @@ -42,7 +42,8 @@ public class AdrInnorixFileVO extends ComDefaultVO implements Serializable { public String adrDocCn1 = ""; public String openYn = ""; public String atchFileId = ""; - + public String mode = ""; + public boolean isAdrRpplDoc; /* * jsp file name @@ -208,6 +209,22 @@ public class AdrInnorixFileVO extends ComDefaultVO implements Serializable { public void setRpplDocSeq(String rpplDocSeq) { this.rpplDocSeq = rpplDocSeq; } + + public String getMode() { + return mode; + } + + public void setMode(String mode) { + this.mode = mode; + } + + public boolean isAdrRpplDoc() { + return isAdrRpplDoc; + } + + public void setAdrRpplDoc(boolean isAdrRpplDoc) { + this.isAdrRpplDoc = isAdrRpplDoc; + } diff --git a/src/main/java/kcc/com/cmm/service/impl/InnorixFileServiceImpl.java b/src/main/java/kcc/com/cmm/service/impl/InnorixFileServiceImpl.java index aafad0d8..2dc43ecf 100644 --- a/src/main/java/kcc/com/cmm/service/impl/InnorixFileServiceImpl.java +++ b/src/main/java/kcc/com/cmm/service/impl/InnorixFileServiceImpl.java @@ -17,11 +17,14 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; +import com.dreamsecurity.magicline.util.Log; + import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl; import egovframework.rte.fdl.cmmn.exception.FdlException; import egovframework.rte.fdl.idgnr.EgovIdGnrService; import kcc.com.cmm.service.AdrInnorixFileEnumVO; import kcc.com.cmm.service.AdrInnorixFileVO; +import kcc.com.cmm.service.EgovFileMngService; import kcc.com.cmm.service.FileVO; import kcc.com.cmm.service.InnorixFileService; import kcc.com.cmm.service.InnorixFileVO; @@ -50,7 +53,7 @@ import kcc.let.utl.fcc.service.EgovStringUtil; @Service("InnorixFileService") public class InnorixFileServiceImpl extends EgovAbstractServiceImpl implements InnorixFileService { - private static final Logger logger = LoggerFactory.getLogger(InnorixFileServiceImpl.class); + private static final Logger log = LoggerFactory.getLogger(InnorixFileServiceImpl.class); @Resource(name = "InnorixFileDAO") private InnorixFileDAO innorixDAO; @@ -59,7 +62,7 @@ public class InnorixFileServiceImpl extends EgovAbstractServiceImpl implements I private FileManageDAO fileManageDAO; @Value("#{globalSettings['Globals.Innorix.FilePath']}") - private String innoFilePath; + private String INNO_FILE_PATH; @Resource(name = "ansDAO") private AnsDAO ansDAO; @@ -74,6 +77,10 @@ public class InnorixFileServiceImpl extends EgovAbstractServiceImpl implements I //답변서 idgen 서비스 @Resource(name = "egovRldMgrManageGnrService") private EgovIdGnrService egovRldMgrManageGnrService; + + // 첨부파일 정보 + @Resource(name="EgovFileMngService") + private EgovFileMngService fileMngService; @Override public RestResponse insertInnorixFileAjax(AdrInnorixFileVO adrInnorixFileListVO) throws FdlException, Exception { @@ -81,11 +88,17 @@ public class InnorixFileServiceImpl extends EgovAbstractServiceImpl implements I try { AdrInnorixFileEnumVO innorixEnumVO = AdrInnorixFileEnumVO.valueOf(adrInnorixFileListVO.getJspFileName()); adrInnorixFileListVO = innorixEnumVO.conversion(innorixEnumVO, adrInnorixFileListVO); - + // 파일 저장 후 atchFileId 받아옴 - adrInnorixFileListVO.setAtchFileId(this.updateFileData(adrInnorixFileListVO)); + if("INSERT".equals(adrInnorixFileListVO.getMode())) + adrInnorixFileListVO.setAtchFileId(this.insertFileData(adrInnorixFileListVO)); + if("UPDATE".equals(adrInnorixFileListVO.getMode())) + adrInnorixFileListVO.setAtchFileId(this.updateFileData(adrInnorixFileListVO)); - adrInnorixFileListVO.setRpplDocSeq(this.insertAdrRpplDoc(adrInnorixFileListVO)); + log.info("adrInnorixFileListVO.isAdrRpplDoc() :: [{}]", adrInnorixFileListVO.isAdrRpplDoc()); + + if(adrInnorixFileListVO.isAdrRpplDoc()) + adrInnorixFileListVO.setRpplDocSeq(this.insertAdrRpplDoc(adrInnorixFileListVO)); // P_code_desc가 없으면 이력을 넣지 않음. if(StringUtils.isNotEmpty(adrInnorixFileListVO.getP_code_desc())) @@ -108,38 +121,69 @@ public class InnorixFileServiceImpl extends EgovAbstractServiceImpl implements I * @return * @throws Exception */ + public String insertFileData(AdrInnorixFileVO innorixVO) throws Exception { + + + String atchFileId = idgenService.getNextStringId(); + + List result = this.fileChange(innorixVO, atchFileId, 0); + + + log.info(" // file data 반복문 끝 "); + // 파일 업로드 + fileManageDAO.insertFileInfs(result); + + return atchFileId; + } + public String updateFileData(AdrInnorixFileVO innorixVO) throws Exception { + + + String atchFileId = innorixVO.getAtchFileId(); + + + FileVO fvo = new FileVO(); + fvo.setAtchFileId(atchFileId); + int fileSn = fileMngService.getMaxFileSN(fvo); + + List result = this.fileChange(innorixVO, atchFileId, fileSn); + + + // 파일 업로드 + fileManageDAO.updateFileInfs(result); + + return atchFileId; + } + + + + private List fileChange(AdrInnorixFileVO innorixVO, String atchFileId, int fileSn) { List result = new ArrayList(); - - String fileNextId = idgenService.getNextStringId(); - - int fileSn = 0; - - logger.info(" file data 반복문 시작 :: [{}]", innorixVO.getInnorixFileListVO().size()); + log.info(" file data 반복문 시작 :: [{}]", innorixVO.getInnorixFileListVO().size()); for(InnorixFileVO innorixFileVO : innorixVO.getInnorixFileListVO()) { FileVO fileVO = new FileVO(); // new 파일명 String newName = innorixVO.getP_file_nm_prefix() + EgovStringUtil.getTimeStamp(); - logger.info("[{}]번쨰 newName :: [{}]", fileSn, newName); + log.info("[{}]번쨰 newName :: [{}]", fileSn, newName); - String oriFullPath = innoFilePath + innorixFileVO.getServerFileName(); - String newFullPath = innoFilePath + newName; + String oriFullPath = INNO_FILE_PATH + innorixFileVO.getServerFileName(); + String newFullPath = INNO_FILE_PATH + newName; try { File orifile = FileUtils.getFile(oriFullPath); File newfile = FileUtils.getFile(newFullPath); FileUtils.moveFile(orifile, newfile); } catch (IOException e) { - logger.info("파일명 수정 실패 :: [{}] ==> [{}]", oriFullPath, newFullPath ); + log.info("파일명 수정 실패 :: [{}] ==> [{}]", oriFullPath, newFullPath ); e.printStackTrace(); } - fileVO.setAtchFileId(fileNextId); + fileVO.setAtchFileId(atchFileId); fileVO.setFileSn(Integer.toString(fileSn)); - fileVO.setFileStreCours(innoFilePath); + fileVO.setFileStreCours(INNO_FILE_PATH); fileVO.setStreFileNm(newName); fileVO.setOrignlFileNm(innorixFileVO.getServerFileName()); fileVO.setFileExtsn(FilenameUtils.getExtension(oriFullPath)); @@ -150,16 +194,10 @@ public class InnorixFileServiceImpl extends EgovAbstractServiceImpl implements I fileSn++; } - - logger.info(" // file data 반복문 끝 "); - // 파일 업로드 - fileManageDAO.insertFileInfs(result); - - return fileNextId; + log.info(" // file data 반복문 끝 "); + return result; } - - /** * @methodName : updateAdrRpplDoc * @author : 이호영 @@ -172,7 +210,7 @@ public class InnorixFileServiceImpl extends EgovAbstractServiceImpl implements I */ private String insertAdrRpplDoc(AdrInnorixFileVO adrInnorixFileListVO) throws Exception { // RpplDoc Insert - logger.info("RpplDoc Insert "); + log.info("RpplDoc Insert "); AnsVO ansVO = new AnsVO(); ansVO.setAdrSeq(adrInnorixFileListVO.getAdrSeq()); // adrSn이 비여있으면 과거사건등록문서라 "1"이 고정으로 들어감 @@ -187,7 +225,7 @@ public class InnorixFileServiceImpl extends EgovAbstractServiceImpl implements I ansVO.setLastUpdusrId(adrInnorixFileListVO.getLastUpdusrId()); ansDAO.ansSubmitAjax_setp1(ansVO); - logger.info(" + ansVO.getRpplDocSeq() :: [{}]", ansVO.getRpplDocSeq()); + log.info(" + ansVO.getRpplDocSeq() :: [{}]", ansVO.getRpplDocSeq()); return ansVO.getRpplDocSeq(); } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/ApmService.java b/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/ApmService.java index cc2bc8d5..d0ac9926 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/ApmService.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/ApmService.java @@ -1,6 +1,7 @@ package kcc.kccadr.adjPgrMgr.apm.service; import java.util.List; +import java.util.Map; import kcc.kccadr.accdnt.adr.service.AdjstDeputyReqVO; import kcc.kccadr.accdnt.arc.service.CorReqVO; @@ -118,6 +119,6 @@ public interface ApmService { void updtRpplPopPastAjax(RpplVO rpplVO); - RpplVO findByResPonDentDId(RpplVO rpplVO); + Map findByResPonDentDIdAndFileList(RpplVO rpplVO); } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/impl/ApmServiceImpl.java b/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/impl/ApmServiceImpl.java index da6a4097..a0bcbf40 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/impl/ApmServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/impl/ApmServiceImpl.java @@ -2,11 +2,16 @@ package kcc.kccadr.adjPgrMgr.apm.service.impl; import java.util.HashMap; import java.util.List; +import java.util.Map; import javax.annotation.Resource; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Repository; +import com.dreamsecurity.magice2e.util.Log; + +import kcc.com.cmm.service.impl.FileManageDAO; import kcc.com.cmm.util.StringUtil; import kcc.kccadr.accdnt.adr.service.AdjstDeputyReqVO; import kcc.kccadr.accdnt.arc.service.CorReqVO; @@ -38,7 +43,9 @@ public class ApmServiceImpl implements ApmService { // 조정사건이력관리 DAO @Resource(name = "adrHstryMgrDAO") private AdrHstryMgrDAO adrHstryMgrDAO; - + + @Resource(name = "FileManageDAO") + private FileManageDAO fileMngDAO; @Override public List selectApmCorrectionList(ApmCorrectVO apmCorrectVO) throws Exception { @@ -597,23 +604,33 @@ public class ApmServiceImpl implements ApmService { @Override public void updtRpplPopPastAjax(RpplVO rpplVO) { - System.out.println("rpplVO.getRpplNm() :: "+ rpplVO.getRpplNm()); RpplVO returnVO = this.rpplDataEncrypt(rpplVO); apmDAO.updtRpplPopPastAjax(returnVO); } @Override - public RpplVO findByResPonDentDId(RpplVO rpplVO) { + public Map findByResPonDentDIdAndFileList(RpplVO rpplVO) { - System.out.println(" ;::::: "+ rpplVO.getRpplRespddSeq()); try { - return this.rpplDataDecrypt(apmDAO.findByResPonDentDId(rpplVO)); + Map map = new HashMap(); + RpplVO rpplInfoVO = this.rpplDataDecrypt(apmDAO.findByResPonDentDId(rpplVO)); + + if(StringUtils.isNotBlank(rpplInfoVO.getAtchFileId())){ + kcc.com.cmm.service.FileVO fileVO = new kcc.com.cmm.service.FileVO(); + fileVO.setAtchFileId(rpplInfoVO.getAtchFileId()); + List fileList = fileMngDAO.selectFileInfs(fileVO); + map.put("fileList", fileList); + } + + map.put("rpplInfoVO", rpplInfoVO); + + + return map; } catch (Exception e) { e.printStackTrace(); } -// RpplVO resultVO = apmDAO.findByResPonDentDId(rpplVO); return null; } 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 7604f655..c94f7298 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java @@ -3,8 +3,10 @@ package kcc.kccadr.adjPgrMgr.apm.web; import java.util.ArrayList; import java.util.Arrays; import java.util.Date; +import java.util.LinkedHashMap; import java.util.List; import java.util.Locale; +import java.util.Map; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; @@ -26,6 +28,7 @@ import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.support.RedirectAttributes; @@ -722,9 +725,13 @@ public class ApmController { @RequestMapping(value = "popup/updtRpplPop.do") public String updtRpplPop(@ModelAttribute("info") RpplVO rpplVO, ModelMap model) throws Exception { - RpplVO resultVO = apmService.findByResPonDentDId(rpplVO); - model.addAttribute("resultVO", resultVO); + Map resultMap = apmService.findByResPonDentDIdAndFileList(rpplVO); + + + + model.addAttribute("resultVO", resultMap.get("rpplInfoVO")); + model.addAttribute("fileList", resultMap.get("fileList")); return "/kccadr/adjPgrMgr/apm/popup/updtRpplPop"; } @@ -1319,7 +1326,7 @@ public class ApmController { //String atchFileId = this.fileValCheckNdbInsert(multiRequest, modelAndView, checkFileUtil.getS_exts(), i_limit_size, i_file_limit); //EXT, MB size and ea String atchFileId = checkFileUtil.fileValCheckNdbInsert(multiRequest, modelAndView, "CHGDATE_", checkFileUtil.getS_exts(), i_limit_size, i_file_limit); //EXT, MB size and ea - log.debug(">>>>>>>>>>>>>>>>>>>>>>>atchFileId:"+atchFileId); + log.debug(">>>>>>>>>>>>>>>>>>>>>>>atchFileId: [{}]"+atchFileId); if ("ERROR".equals(atchFileId)) return modelAndView; @@ -1406,11 +1413,15 @@ public class ApmController { modelAndView.addObject("message", "로그인 해주세요."); return modelAndView; } - - rpplVO.setLastUpdusrId(userId); - - try { - apmService.updtRpplPopPastAjax(rpplVO); + /*파일등록 */ + //String atchFileId = ""; // 조정신청 첨부파일 아이디 + //String FratchFileId = ""; //대리인 첨부파일 아이디 + + rpplVO.setLastUpdusrId(userId); + + try { + log.info(" === apmService.updtRpplPopPastAjax() === "); + apmService.updtRpplPopPastAjax(rpplVO); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/apm/Apm_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/apm/Apm_SQL_Mysql.xml index 198f1380..e954e657 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/apm/Apm_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/apm/Apm_SQL_Mysql.xml @@ -597,12 +597,13 @@ , RPPL_GRADE = #rpplGrade# , RPPL_EMAIL_YN = #rpplEmailYn# , RPPL_SMS_YN = #rpplSmsYn# + , ATCH_FILE_ID = #atchFileId# + , LAST_UPDT_PNTTM = SYS_DATETIME , LAST_UPDUSR_ID = #lastUpdusrId# , RPPL_RELATION = #rpplRelation# , RPPL_RELATION_ETC = #rpplRelationEtc# - , RPPL_CONN_NO = #rpplConnNo# WHERE ADR_SEQ = #adrSeq# AND RPPL_SEQ = #rpplSeq# diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/updtRpplPop.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/updtRpplPop.jsp index 1fddd404..8417c8fc 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/updtRpplPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/updtRpplPop.jsp @@ -25,12 +25,14 @@ %> -대리인등록 +대리인수정 + + <%-- 원자력 --%> " /> " /> - " /> + " /> + " /> + " />
- -

대리인 등록

+ +

대리인 수정

@@ -248,40 +419,15 @@
대리신청서 - - - - -
- - - - - - - - - - - - - - - - - - - -
파일 명종류크기삭제
-

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

-
+ + + +

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

+ + +

+ <%--
@@ -327,13 +473,15 @@
+ --%>
- + +
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/updtRpplPop_backup.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/updtRpplPop_backup.jsp new file mode 100644 index 00000000..72cbb64d --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/updtRpplPop_backup.jsp @@ -0,0 +1,341 @@ + +<%@ 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"%> +<% +/** + * @Class Name : srcAdmNoPop.jsp + * @Description : 조정접수 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2021.08.16 김봉호 최초 생성 + * @author 김봉호 + * @since 2021.08.16 + * @version 1.0 + * @see + * + */ +%> + + +대리인수정 + + + + + + +<%-- 원자력 --%> + + + + + " /> + " /> + " /> + " /> + + + +
+
+ +

대리인 수정

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
대리인 이름 + +
본인과의 관계 +
+ + + + + + + + + + + + + + + + + +
+
직책 + +
대리인 주소 + + +
+ + +
+ +
이메일 + + + + "> + @ + "> + + +
연락처 + + - + + - + + +
이메일 수신여부 +
+ + + + + + + + +
+
SMS 수신여부 +
+ + + + + + + + +
+
대리신청서 + + + + +
+ + + + + + + + + + + + + + + + + + + +
파일 명종류크기삭제
+

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

+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
파일 명종류크기삭제
+ + + + "> + + + + "> + + + + +
+
+
+ +
+ + +
+
+
+ + + diff --git a/src/main/webapp/innorix/exam/download.jsp b/src/main/webapp/innorix/exam/download.jsp index 5408f3cc..97e5b24e 100644 --- a/src/main/webapp/innorix/exam/download.jsp +++ b/src/main/webapp/innorix/exam/download.jsp @@ -14,6 +14,8 @@ String filePath = saveDir.substring(0, saveDir.lastIndexOf("/") + 1); 유닉스 - /storage/path1/path2/data */ +// filePath = request.getParameter("innoDirPath"); +filePath = "D:/usr/local/tomcat/file/sht/"; // downloadType : "stream" 설정시 자동 전달되는 GET Param 값 String szStartOffset = request.getParameter("_StartOffset"); String szEndOffset = request.getParameter("_EndOffset"); @@ -42,8 +44,10 @@ if (fileID != null) { } if (fileName != null) { - sysFileName = "data/" + fileName; - orgFileName = "data/" + fileName; + sysFileName = "" + fileName; + sysFileName = "" + fileName; +// orgFileName = "data/" + fileName; +// orgFileName = "data/" + fileName; } // 파일명 깨짐대응 문자열 인코딩 처리 diff --git a/src/main/webapp/innorix/exam/edit.html b/src/main/webapp/innorix/exam/edit.html index d1918c20..f3ea1d5c 100644 --- a/src/main/webapp/innorix/exam/edit.html +++ b/src/main/webapp/innorix/exam/edit.html @@ -1 +1 @@ - ← 예제 목록


| |

\ No newline at end of file + ← 예제 목록


| |

\ No newline at end of file