tolag3/kcc_adr_advc_git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hylee'

Browse Source 
Conflicts:
	src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java
This commit is contained in:
hylee 2022-09-15 14:53:33 +09:00
commit 189dbf8599
12 changed files with 258 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java
View File

@ -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";
}

2
src/main/java/kcc/kccadr/adjst/service/AdjstReqService.java
View File

@ -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<AdjstReqVO> selectAdjsReqUserListByadjSeq(AdjstReqVO adjstReqVO) throws Exception;

16
src/main/java/kcc/kccadr/adjst/service/AdjstReqVO.java
View File

@ -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;
}

6
src/main/java/kcc/kccadr/adjst/service/impl/AdjstReqDAO.java
View File

@ -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);
}

6
src/main/java/kcc/kccadr/adjst/service/impl/AdjstReqServiceImpl.java
View File

@ -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);
}
///////////////////////////////////////////////////////////////////////////////////////////

29
src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java
View File

@ -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<FileVO> 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<RestResponse> 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<FileVO> fileList = fileService.selectFileInfs(fileVO);
// model.addAttribute("fileList", fileList);
// }
return ResponseEntity.ok().body(new RestResponse(HttpStatus.OK, expm.getExmpCn(), LocalDateTime.now()));
}
/**
* 조정신청 구분선택 - 안내화면
*/

6
src/main/java/kcc/kccadr/cmm/RestResponse.java
View File

@ -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() {

7
src/main/resources/egovframework/sqlmap/kccadr/adjst/AdjstReq_SQL_Mysql.xml
View File

@ -859,7 +859,8 @@
AND EDT_SN = #edtSn#
AND EDT_TY = #edtTy#
</update>
<select id="AdjstReqDAO.selectAdjstReqOpenExamplePop" parameterClass="AdjstReqVO" resultClass="AdjstReqVO">
<select id="AdjstReqDAO.selectAdjstReqOpenExamplePopCn" parameterClass="AdjstReqVO" resultClass="AdjstReqVO">
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# <!-- 01:신청취지, 02:신청원인 -->
</select>
<!-- 답변서 예문 select -->

106
src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/adjstReqOpenExamplePop.jsp
View File

@ -34,45 +34,93 @@
//$('#oldDe').text(moment('<c:out value="${info.adrEndDeDay}" />').format('YYYY-MM-DD'));
//$('#newDe').text(moment('<c:out value="${info.adrEndDeDay}" />').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();
}
</script>
</head>
<body>
<form:form id="p" name="p" method="post" onsubmit="return false;">
<input type="hidden" id="exmpCd" name="exmpCd" value="${exmpCd }"/>
<div class="area_popup case_change" style="width: 550px;">
<div class="cont_popup">
<p class="tb_tit"><kc:code codeId="CC040" code="${expm.expmCd}"/></p>
<table class="pop_tbType01">
<colgroup>
<col style="width: 50%;">
<col style="width: auto;">
</colgroup>
<tbody>
<tr>
<td colspan="2">
<p>
<c:choose>
<c:when test="${not empty expm.expmCn}">
<c:out value="${fn:replace(expm.expmCn, crlf , '<br/>')}" escapeXml="false" />
</c:when>
<c:otherwise>
등록된 내용이 없습니다.
</c:otherwise>
</c:choose>
</p>
</td>
</tr>
</tbody>
</table>
<p class="tb_tit"><kc:code codeId="CC040" code="${exmpCd}"/></p>
<table class="popup_tbType01 t_center">
<colgroup>
<col style="width: 20%;">
<col style="width: 80%;">
</colgroup>
<tbody>
<tr>
<td style="line-height: 30px; text-align: left;">
<kc:code codeId="CC040" code="${exmpCd}"/>
</td>
<td style="line-height: 30px; text-align: left;">
<kc:select codeId="CC002" id="exmpCcTy" selectedValue="${ccTy}"/>
</td>
</tr>
<tr>
<td style="line-height: 30px; text-align: left;">
내용
</td>
<td id="exmpCn" style="line-height: 30px; text-align: left;" >
</td>
</tr>
</tbody>
</table>
<div class="btn_wrap btn_layout04">
<button class="btnType06" onclick="fncClose()">확인</button>
<button class="btnType06" id="redBtn">등록</button>
</div>
</div>
</div>

8
src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/adjReqMgrOffRegist.jsp
View File

@ -38,13 +38,13 @@
<validator:javascript formName="model" staticJavascript="false" xhtml="true" cdata="false"/>
<script type="text/javaScript" language="javascript">
function openExampleAdminPop(expmCd) {
function openExampleAdminPop(exmpCd) {
var pop = document.pop;
pop.ccTy.value = $('#ccTy').val();
pop.expmCd.value = expmCd;
pop.exmpCd.value = exmpCd;
commonPopWindowopenForm("/kccadr/adjPgrMgr/apm/popup/adjstReqOpenExamplePop.do", '600', '400', "openExampleAdminPop", $('#pop'));
commonPopWindowopenForm("/kccadr/adjPgrMgr/apm/popup/adjstReqOpenExamplePop.do", '500', '400', "openExampleAdminPop", $('#pop'));
}
$(document).ready(function(){
@ -1603,7 +1603,7 @@ function openExampleAdminPop(expmCd) {
<input type="hidden" id="adrAvoidSeq" name="adrAvoidSeq" value="">
<input type="hidden" id="agntSeq" name="agntSeq" value=""> -->
<input type="hidden" name="ccTy" value="">
<input type="hidden" id="expmCd" name="expmCd" value="">
<input type="hidden" id="exmpCd" name="exmpCd" value="">
</form>
<form:form commandName="adrVO" name="adrVO" method="post" enctype="multipart/form-data">

202
src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/popup/adjstReqOpenExamplePop.jsp
View File

@ -1,75 +1,127 @@
<%@ 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"); %>
<!DOCTYPE html>
<html lang="ko">
<head>
<title>조정신청 예문보기</title>
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<script type="text/javascript" src="/kccadrPb/usr/script/popup.js"></script>
<script type="text/javaScript" language="javascript">
$(document).ready(function(){
// 레이어팝업 포커싱 이동 수정
var popupTit = $(".cont_tit03").text();
if(popupTit.trim() == "* 신청취지"){
$(".tooltip-close").click(function(){
var activeTarget = $('[data-tooltip-con="fee_info_popup"]');
activeTarget.hide();
$('[data-tooltip="fee_info_popup"]').eq(0).focus();
});
}else{
$(".tooltip-close").click(function(){
var activeTarget = $('[data-tooltip-con="fee_info_popup"]');
activeTarget.hide();
$('[data-tooltip="fee_info_popup"]').eq(1).focus();
});
}
})
</script>
</head>
<body>
<div class="popup_wrap fee_info_popup" style="max-width: 580px;" tabindex="0" data-tooltip-con="fee_info_popup" data-focus="fee_info_popup" data-focus-prev="fee_info_popup_close">
<div class="popup_tit">
<p>조정신청 예문</p> <button class="btn_popup_close tooltip-close" data-focus="fee_info_popup_close" title="팝업 닫기"><i></i></button>
</div>
<div class="popup_cont">
<c:if test="${not empty expm.expmCd}">
<div class="cont_tit03">
* <kc:code codeId="CC040" code="${expm.expmCd}"/>
</div>
</c:if>
<table class="popup_tbType01 t_center">
<colgroup>
<col style="width: 60%;">
<col style="width: 40%;">
</colgroup>
<tbody>
<tr>
<td colspan="2" style="line-height: 30px; text-align: left;">
<c:choose>
<c:when test="${not empty expm.expmCn}">
<c:out value="${fn:replace(expm.expmCn, crlf , '<br/>')}" escapeXml="false" />
</c:when>
<c:otherwise>
등록된 내용이 없습니다.
</c:otherwise>
</c:choose>
</td>
</tr>
</tbody>
</table>
<div class="btn_wrap">
<button class="btnType01 tooltip-close" data-focus="fee_info_popup_close" data-focus-next="fee_info_popup">닫기</button>
</div>
</div>
</div>
</body>
</html>
<%@ 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"); %>
<!DOCTYPE html>
<html lang="ko">
<head>
<title>조정신청 예문보기</title>
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<script type="text/javascript" src="/kccadrPb/usr/script/popup.js"></script>
<script type="text/javaScript" language="javascript">
$(document).ready(function(){
// 레이어팝업 포커싱 이동 수정
var popupTit = $(".cont_tit03").text();
if(popupTit.trim() == "* 신청취지"){
$(".tooltip-close").click(function(){
var activeTarget = $('[data-tooltip-con="fee_info_popup"]');
activeTarget.hide();
$('[data-tooltip="fee_info_popup"]').eq(0).focus();
});
}else{
$(".tooltip-close").click(function(){
var activeTarget = $('[data-tooltip-con="fee_info_popup"]');
activeTarget.hide();
$('[data-tooltip="fee_info_popup"]').eq(1).focus();
});
}
/*
* 저작물 변경 event
*/
$('#exmpCcTy').on('change', function(){
fn_selectCn();
});
/*
* 등록버튼 event
*/
$('#redBtn').on('click', function(){
var exmpCd = $("#exmpCd").val();
console.log(exmpCd.replace(/(^0+)/, ""));
var perId = '#reqCn'+exmpCd.replace(/(^0+)/, "");
$(perId).text($('#exmpCn').text());
});
/*
* 상세내용 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();
})
</script>
</head>
<body>
<div class="popup_wrap fee_info_popup" style="max-width: 580px;" tabindex="0" data-tooltip-con="fee_info_popup" data-focus="fee_info_popup" data-focus-prev="fee_info_popup_close">
<input type="hidden" id="exmpCd" name="exmpCd" value="${exmpCd }"/>
<div class="popup_tit">
<p>조정신청 예문</p> <button class="btn_popup_close tooltip-close" data-focus="fee_info_popup_close" title="팝업 닫기"><i></i></button>
</div>
<div class="popup_cont">
<c:if test="${not empty exmpCd}">
<div class="cont_tit03">
* <kc:code codeId="CC040" code="${exmpCd}"/>
</div>
</c:if>
<table class="popup_tbType01 t_center">
<colgroup>
<col style="width: 20%;">
<col style="width: 80%;">
</colgroup>
<tbody>
<tr>
<td style="line-height: 30px; text-align: left;">
<kc:code codeId="CC040" code="${exmpCd}"/>
</td>
<td style="line-height: 30px; text-align: left;">
<kc:select codeId="CC002" name="exmpCcTy" id="exmpCcTy" selectedValue="${ccTy}"/>
</td>
</tr>
<tr>
<td style="line-height: 30px; text-align: left;">
내용
</td>
<td id="exmpCn" style="line-height: 30px; text-align: left;" >
</td>
</tr>
</tbody>
</table>
<div class="btn_wrap">
<!-- <button class="btnType01 tooltip-close" data-focus="fee_info_popup_close" data-focus-next="fee_info_popup">닫기</button> -->
<button class="btnType01 tooltip-close" id="redBtn">등록</button>
</div>
</div>
</div>
</body>
</html>

4
src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp
View File

@ -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"
);