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}