From dc328297bc2bc8f41723c248344666d1745779a5 Mon Sep 17 00:00:00 2001 From: hylee Date: Sun, 11 Sep 2022 14:24:47 +0900 Subject: [PATCH] =?UTF-8?q?feat:=EC=B2=B4=ED=97=98=ED=95=98=EA=B8=B0=20?= =?UTF-8?q?=EC=A7=84=ED=96=89=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accdnt/adr/service/AdjstDeputyReqVO.java | 9 + .../web/AdjstExpDetailController.java | 25 +- .../kccadr/accdnt/adr/adjstDeputyReqList.jsp | 2 +- .../accdnt/ars/tab/docIssReqViewPop.jsp | 6 +- .../adjstExp/adjstReqRegistInformation.jsp | 3 + .../kccadr/adjstExp/adjstReqRegistStep3.jsp | 2 +- .../adjstExpDetail/adjstDeputyReqCreate.jsp | 420 ++++++++++++++++++ .../adjstReqStatusTabDetail.jsp | 7 - .../adjstReqStatusTabStatus.jsp | 8 +- .../adjstExpDetail/docIssReqViewPop.jsp | 134 ++++++ .../adjstExpDetail/expAdjstDeputyReqList.jsp | 34 +- .../kccadr/kccadrCom/kccadrConstantsJsp.jsp | 9 +- 12 files changed, 619 insertions(+), 40 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstDeputyReqCreate.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/docIssReqViewPop.jsp diff --git a/src/main/java/kcc/kccadr/accdnt/adr/service/AdjstDeputyReqVO.java b/src/main/java/kcc/kccadr/accdnt/adr/service/AdjstDeputyReqVO.java index b33e99a6..0e795c2e 100644 --- a/src/main/java/kcc/kccadr/accdnt/adr/service/AdjstDeputyReqVO.java +++ b/src/main/java/kcc/kccadr/accdnt/adr/service/AdjstDeputyReqVO.java @@ -78,6 +78,7 @@ public class AdjstDeputyReqVO extends ComDefaultVO implements Serializable { private String resPonDentNms; private String ccTy; private String rejectCn; + private String expCode; public int getRowNumber() { return rowNumber; @@ -390,5 +391,13 @@ public class AdjstDeputyReqVO extends ComDefaultVO implements Serializable { public void setRejectCn(String rejectCn) { this.rejectCn = rejectCn; } + + public String getExpCode() { + return expCode; + } + + public void setExpCode(String expCode) { + this.expCode = expCode; + } } diff --git a/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpDetailController.java b/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpDetailController.java index 43e52191..7c85421d 100644 --- a/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpDetailController.java +++ b/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpDetailController.java @@ -29,9 +29,11 @@ import kcc.com.cmm.service.EgovFileMngService; import kcc.com.cmm.service.FileVO; import kcc.com.cmm.util.StringUtil; import kcc.com.utl.fcc.service.EgovStringUtil; +import kcc.kccadr.accdnt.adr.service.AdjstDeputyReqVO; import kcc.kccadr.accdnt.ai.service.AdjstIncidentVO; import kcc.kccadr.accdnt.ars.service.AdjstReqStatusVO; import kcc.kccadr.accdnt.crtfc.service.CrtfcService; +import kcc.kccadr.adjclsmgr.service.AdjClsMgrVO; import kcc.kccadr.adjst.service.AdjstReqService; import kcc.kccadr.adjst.service.AdjstReqVO; import kcc.kccadr.adjstExp.service.AdjstExpService; @@ -158,7 +160,7 @@ public class AdjstExpDetailController { * 조정신청 구분선택 - 안내화면 */ @RequestMapping("/web/kccadr/adjstExpDetail/popup/openExpExamplePop.do") - public String adjstReqOpenAnswerExamplePop(@ModelAttribute("adjstReqStatusVO") AdjstReqStatusVO adjstReqStatusVO, ModelMap model) throws Exception { + public String adjstReqOpenAnswerExamplePop(@ModelAttribute("adjDeputyReqVO") AdjstDeputyReqVO adjDeputyReqVO, ModelMap model) throws Exception { String returnUrl = "/web/kccadr/adjstExpDetail/"; @@ -179,7 +181,7 @@ public class AdjstExpDetailController { */ - switch (adjstReqStatusVO.getExpCode()) { + switch (adjDeputyReqVO.getExpCode()) { case "01": returnUrl += "expAnsSubmit"; break; case "02": returnUrl += "expAdjstDeputyReqList"; @@ -187,14 +189,27 @@ public class AdjstExpDetailController { default: returnUrl += "expAnsSubmit"; break; } - System.out.println("returnUrl : "+ returnUrl); - - return returnUrl; } + + // 기록열람, 조정조서 발급 요청 팝업 + @RequestMapping(value = "/web/kccadr/adjstExpDetail/popup/docIssReqViewPop.do") + public String docIssReqViewPop(@ModelAttribute("adjClsMgrVO") AdjClsMgrVO adjClsMgrVO, ModelMap model) throws Exception { +// model.addAttribute("security", adjReqMgrService.selectAdjstReqSecurityInfo(param)); + return "/web/kccadr/adjstExpDetail/docIssReqViewPop"; + } + + /** + * 조정대리신청 화면 + */ + @RequestMapping("/web/kccadr/adjstExpDetail/popup/adjstDeputyReqCreate.do") + public String adjstDeputyReqCreate(@ModelAttribute("adjDeputyReqVO") AdjstDeputyReqVO adjDeputyReqVO, ModelMap model) throws Exception { + return "/web/kccadr/adjstExpDetail/adjstDeputyReqCreate"; + } + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/adr/adjstDeputyReqList.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/adr/adjstDeputyReqList.jsp index be288f52..a62ba4a2 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/adr/adjstDeputyReqList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/adr/adjstDeputyReqList.jsp @@ -13,7 +13,7 @@ + + + + + + + + + + +
+ + + +
+ +
+ + + + + +
+ + + + + + + + + +
+
+
+

조정대리신청

+
+ + + + + +
+
+

조정대리 정보

+ <%----%> +
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
조정대리 정보 : 이름, 생년월일, 주소, 자택(사무소), 휴대전화등의 정보 입력
+

필수입력 항목*

+

이름

+
+ + +

필수입력 항목*

+

생년월일

+
+ +
+

필수입력 항목*

+

주소

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

필수입력 항목*

+

자택(사무소)

+
+ + + +

필수입력 항목*

+

휴대전화

+
+ + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + +
위임인과의 관계, 첨부서류, 조정위임 사항등의 정보 입력
+

필수입력 항목*

+

위임인과의 관계

+
+
+ checked > + + checked > + + checked> + +
+
+

필수입력 항목*

+

첨부서류

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

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

+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
첨부파일 리스트 : 파일명, 종류, 크기, 삭제
파일 명종류크기삭제
+ ${fileList.orignlFileNm} + + "> + + "> + + +
+
+
+

필수입력 항목*

+

조정위임 사항

+
+

+ 1. 저작권 분쟁조정에 관한 일체의 조정행위 및 합의 행위
+ 2. 조정의 취하
+ 3. 기타 +

+
+
+ +
+
+
+ + + + + + + + + +
+
+ +
+
+ +
+ + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusTabDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusTabDetail.jsp index 7c493e3d..a25d39ca 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusTabDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusTabDetail.jsp @@ -217,17 +217,10 @@ resInfo--%>

- <%-- -

주소

- - -

()

- --%>

신청인 분류

-<%--

--%>

diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusTabStatus.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusTabStatus.jsp index b2ef9871..370911d6 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusTabStatus.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusTabStatus.jsp @@ -18,7 +18,7 @@ //function fncSecurityPop2(adrSeq,edtTy,edtSn) { function fncSecurityPop2(docuReqCd) { commonPopLayeropen( - "/web/kccadr/accdnt/ars/tab/docIssReqViewPop.do" + "/web/kccadr/adjstExpDetail/popup/docIssReqViewPop.do" , 800 , 600 , {docuReqCd : docuReqCd, adrSeq : $("#adrSeq").val()} @@ -86,15 +86,15 @@ $(document).ready(function() {
-
+ <%-- --%> <%-- --%> -
+
- +
diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/docIssReqViewPop.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/docIssReqViewPop.jsp new file mode 100644 index 00000000..2d18f30f --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/docIssReqViewPop.jsp @@ -0,0 +1,134 @@ +<%@ 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"%> + + + + +조정신청 보완/수정요청 + + + + + + + + + + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/expAdjstDeputyReqList.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/expAdjstDeputyReqList.jsp index 6af5aa80..ca90a6ad 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/expAdjstDeputyReqList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/expAdjstDeputyReqList.jsp @@ -11,21 +11,19 @@ 조정대리신청 목록 + @@ -35,11 +33,11 @@ -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> + + + + +
@@ -96,8 +94,8 @@
- - + +
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 cc708993..47d228f2 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 @@ -816,9 +816,14 @@ var AdjstReq = { return false; } + if($(".uploaded_obj").length <= 0 ) { - alert("파일첨부는 필수입력입니다."); - return false; + if(this.STEP == "${KccadrConstants.STEP9}"){ + alert("조정신청에서 첨부파일은 필수입력입니다."); + }else{ + alert("파일첨부는 필수입력입니다."); + return false; + } } return true;