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 ac88b541..85263f0b 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java @@ -619,13 +619,11 @@ public class ApmController { */ @RequestMapping(value = "popup/adjstReqOpenExamplePop.do") public String adjstReqOpenExamplePop(@ModelAttribute("adjstReqVO") AdjstReqVO adjstReqVO, ModelMap model) throws Exception { - - AdjstReqVO expm = adjstReqService.selectAdjstReqOpenExamplePop(adjstReqVO); - -// apmVO.setSrchRpplTy(apmVO.getRpplTy()); -// model.addAttribute("rppList", apmService.selectAdrRpplList(apmVO)); - - model.addAttribute("expm", expm); + + 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 e545ae3c..12b81fea 100644 --- a/src/main/java/kcc/kccadr/adjst/service/AdjstReqService.java +++ b/src/main/java/kcc/kccadr/adjst/service/AdjstReqService.java @@ -51,7 +51,7 @@ public interface AdjstReqService { // 조정사건 정보 불러오기 public AdjstReqVO selectAdjsMgrMaster(AdjstReqVO adjstReqVO) throws Exception; - public AdjstReqVO selectAdjstReqOpenExamplePop(AdjstReqVO adjstReqVO) throws Exception; + public AdjstReqVO selectAdjstReqOpenExamplePopCn(AdjstReqVO adjstReqVO) throws Exception; // 조정사건 대리인/신청인/피신청인 정보 불러오기 public List selectAdjsReqUserListByadjSeq(AdjstReqVO adjstReqVO) throws Exception; diff --git a/src/main/java/kcc/kccadr/adjst/service/AdjstReqVO.java b/src/main/java/kcc/kccadr/adjst/service/AdjstReqVO.java index 1df4c032..93afadfe 100644 --- a/src/main/java/kcc/kccadr/adjst/service/AdjstReqVO.java +++ b/src/main/java/kcc/kccadr/adjst/service/AdjstReqVO.java @@ -826,35 +826,35 @@ public class AdjstReqVO extends ComDefaultVO implements Serializable { this.edtStatus = edtStatus; } - public String getExpmCd() { + public String getExmpCd() { return exmpCd; } - public void setExpmCd(String exmpCd) { + public void setExmpCd(String exmpCd) { this.exmpCd = exmpCd; } - public String getExpmCn() { + public String getExmpCn() { return exmpCn; } - public void setExpmCn(String exmpCn) { + public void setExmpCn(String exmpCn) { this.exmpCn = exmpCn; } - public String getExpmTit() { + public String getExmpTit() { return exmpTit; } - public void setExpmTit(String exmpTit) { + public void setExmpTit(String exmpTit) { this.exmpTit = exmpTit; } - public String getExpmCcTy() { + public String getExmpCcTy() { return exmpCcTy; } - public void setExpmCcTy(String exmpCcTy) { + public void setExmpCcTy(String exmpCcTy) { this.exmpCcTy = exmpCcTy; } 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 fd25c459..9750fb91 100644 --- a/src/main/java/kcc/kccadr/adjst/service/impl/AdjstReqDAO.java +++ b/src/main/java/kcc/kccadr/adjst/service/impl/AdjstReqDAO.java @@ -166,9 +166,9 @@ public class AdjstReqDAO extends EgovAbstractDAO { public int updateAdrMgrEditInfo(AdjstReqVO adjstReqVO) throws Exception { return (Integer) update("AdjstReqDAO.updateAdrMgrEditInfo", adjstReqVO); } - - public AdjstReqVO selectAdjstReqOpenExamplePop(AdjstReqVO adjstReqVO) throws Exception { - return (AdjstReqVO) select("AdjstReqDAO.selectAdjstReqOpenExamplePop",adjstReqVO); + + public AdjstReqVO selectAdjstReqOpenExamplePopCn(AdjstReqVO adjstReqVO) throws Exception { + return (AdjstReqVO) select("AdjstReqDAO.selectAdjstReqOpenExamplePopCn",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 835fe5b8..10d7f0a7 100644 --- a/src/main/java/kcc/kccadr/adjst/service/impl/AdjstReqServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjst/service/impl/AdjstReqServiceImpl.java @@ -882,10 +882,10 @@ public class AdjstReqServiceImpl extends EgovAbstractServiceImpl implements Adj } return result; } - + @Override - public AdjstReqVO selectAdjstReqOpenExamplePop(AdjstReqVO adjstReqVO) throws Exception { - return adjstReqDAO.selectAdjstReqOpenExamplePop(adjstReqVO); + public AdjstReqVO selectAdjstReqOpenExamplePopCn(AdjstReqVO adjstReqVO) throws Exception { + return adjstReqDAO.selectAdjstReqOpenExamplePopCn(adjstReqVO); } /////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java b/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java index 77486a2b..a981efa8 100644 --- a/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java +++ b/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java @@ -1,6 +1,7 @@ package kcc.kccadr.adjst.web; import java.text.SimpleDateFormat; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -17,6 +18,8 @@ import org.json.simple.JSONArray; import org.json.simple.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.core.env.SystemEnvironmentPropertySource; +import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; @@ -46,6 +49,7 @@ import kcc.com.cmm.util.StringUtil; import kcc.com.utl.fcc.service.EgovStringUtil; import kcc.com.utl.user.service.CheckAdrProcessUtil; import kcc.kccadr.accdnt.crtfc.service.CrtfcService; +import kcc.kccadr.adjPgrMgr.exmp.cmm.ExmpManageVO; import kcc.kccadr.adjst.service.AdjstReqService; import kcc.kccadr.adjst.service.AdjstReqVO; import kcc.kccadr.cmm.KccadrConstants; @@ -199,17 +203,26 @@ public class AdjstReqWebController { */ @RequestMapping("/web/kccadr/adjst/popup/adjstReqOpenExamplePop.do") public String adjstReqOpenExamplePop(@ModelAttribute("adjstReqVO") AdjstReqVO adjstReqVO, ModelMap model) throws Exception { - AdjstReqVO expm = adjstReqService.selectAdjstReqOpenExamplePop(adjstReqVO); - if (expm != null && StringUtils.isNotBlank(expm.getAtchFileId())) { - FileVO fileVO = new FileVO(); - fileVO.setAtchFileId(expm.getAtchFileId()); - List fileList = fileService.selectFileInfs(fileVO); - model.addAttribute("fileList", fileList); - } - model.addAttribute("expm", expm); + model.addAttribute("ccTy", adjstReqVO.getCcTy()); + model.addAttribute("exmpCd", adjstReqVO.getExmpCd()); return "/web/kccadr/adjst/popup/adjstReqOpenExamplePop"; } + @RequestMapping("/web/kccadr/adjst/popup/adjstReqOpenExamplePopCn.do") + public ResponseEntity adjstReqOpenExamplePopCn(@RequestBody AdjstReqVO adjstReqVO) throws Exception { + System.out.println("adjstReqVO.getExmpCd() :: "+ adjstReqVO.getExmpCd()); + System.out.println("adjstReqVO.getExmpCcTy() :: "+ adjstReqVO.getExmpCcTy()); + AdjstReqVO expm = adjstReqService.selectAdjstReqOpenExamplePopCn(adjstReqVO); + +// if (expm != null && StringUtils.isNotBlank(expm.getAtchFileId())) { +// FileVO fileVO = new FileVO(); +// fileVO.setAtchFileId(expm.getAtchFileId()); +// List fileList = fileService.selectFileInfs(fileVO); +// model.addAttribute("fileList", fileList); +// } + return ResponseEntity.ok().body(new RestResponse(HttpStatus.OK, expm.getExmpCn(), LocalDateTime.now())); + } + /** * 조정신청 구분선택 - 안내화면 */ diff --git a/src/main/java/kcc/kccadr/cmm/RestResponse.java b/src/main/java/kcc/kccadr/cmm/RestResponse.java index f84945bc..1a1055af 100644 --- a/src/main/java/kcc/kccadr/cmm/RestResponse.java +++ b/src/main/java/kcc/kccadr/cmm/RestResponse.java @@ -66,12 +66,12 @@ public class RestResponse { this.status = status; } - public String getMessage() { + public String getData() { return data; } - public void setMessage(String message) { - this.data = message; + public void setData(String data) { + this.data = data; } public LocalDateTime getTimestamp() { 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 3ca076bf..ce0f0b4d 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 @@ -859,7 +859,8 @@ AND EDT_SN = #edtSn# AND EDT_TY = #edtTy# - SELECT T1.EXMP_TIT AS exmpTit ,T1.ATCH_FILE_ID AS atchFileId @@ -871,8 +872,8 @@ INNER JOIN ADR_EXMP_DTL T2 ON T1.EXMP_CC_TY = T2.EXMP_CC_TY WHERE 1=1 - AND T1.EXMP_CC_TY = #ccTy# - AND T2.EXMP_CD = #exmpCd# + AND T1.EXMP_CC_TY = #exmpCcTy# + AND T2.EXMP_CD = #exmpCd# 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 76a4f5f3..8a2653c6 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 @@ -34,45 +34,93 @@ //$('#oldDe').text(moment('').format('YYYY-MM-DD')); //$('#newDe').text(moment('').add(1, 'months').format('YYYY-MM-DD')); + function fncClose() { + window.close(); + } + + /* + * 저작물 변경 event + */ + $('#exmpCcTy').on('change', function(){ + fn_selectCn(); + }); + + /* + * 등록버튼 click event + */ + $('#redBtn').on('click', function(){ + var exmpCd = $("#exmpCd").val(); + console.log(exmpCd.replace(/(^0+)/, "")); + var perId = '#reqCn'+exmpCd.replace(/(^0+)/, ""); + $(opener.document).find(perId).text($('#exmpCn').text()); + window.close(); + + }); + + /* + * 상세내용 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); } + }); + } + + fn_selectCn(); }); - - function fncClose() { - window.close(); - } - +
-

- - - - - - - - - - -
-

- - - - - - 등록된 내용이 없습니다. - - -

-
+

+ + + + + + + + + + + + + + + +
+ + + +
+ 내용 + +
- +
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/adjReqMgrOffRegist.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/adjReqMgrOffRegist.jsp index 7a20dfef..4d9bb2c6 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/adjReqMgrOffRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/adjReqMgrOffRegist.jsp @@ -38,13 +38,13 @@ - - - -
-
-

조정신청 예문

-
-
- -
- * -
- - - - - - - - - - - -
- - - - - - 등록된 내용이 없습니다. - - -
-
- -
-
-
- - +<%@ 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 47d228f2..720a838d 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 @@ -1059,12 +1059,12 @@ var AdjstReq = { , "adjstHostoryPop" ); }, - openExamplePop : function(expmCd){ + openExamplePop : function(exmpCd){ commonPopLayeropen( "/web/kccadr/adjst/popup/adjstReqOpenExamplePop.do" , 1100 , 600 - , {ccTy : $("#ccTy").val(), expmCd : expmCd} + , {ccTy : $("#ccTy").val(), exmpCd : exmpCd} , "N" , "openExamplePop" );