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

refactor:[대국민]신청취지, 신청원인 예문 팝업 기능

Browse Source
This commit is contained in:
hylee 2022-10-14 10:50:34 +09:00
parent dc3b7be6bc
commit 13b8f42591
11 changed files with 124 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -646,9 +646,18 @@ public class ApmController {
@RequestMapping(value = "popup/adjstReqOpenExamplePop.do")
public String adjstReqOpenExamplePop(@ModelAttribute("adjstReqVO") AdjstReqVO adjstReqVO, ModelMap model) throws Exception {
model.addAttribute("ccTy", adjstReqVO.getCcTy());
model.addAttribute("exmpCd", adjstReqVO.getExmpCd());
List<AdjstReqVO> exmp = adjstReqService.selectAdjstReqOpenExamplePop(adjstReqVO);
// if (exmp != null && StringUtils.isNotBlank(exmp.getAtchFileId())) {
// FileVO fileVO = new FileVO();
// fileVO.setAtchFileId(exmp.getAtchFileId());
// List<FileVO> fileList = fileService.selectFileInfs(fileVO);
// model.addAttribute("fileList", fileList);
// }
model.addAttribute("exmp", exmp);
model.addAttribute("ccTy", adjstReqVO.getCcTy());
model.addAttribute("exmpCd", adjstReqVO.getExmpCd());
return "/kccadr/adjPgrMgr/apm/popup/adjstReqOpenExamplePop";
}
@ -664,7 +673,7 @@ public class ApmController {
@RequestMapping(value = "popup/adjstReqOpenExamplePop2.do")
public String adjstReqOpenExamplePop2(@ModelAttribute("adjstReqVO") AdjstReqVO adjstReqVO, ModelMap model) throws Exception {
AdjstReqVO exmp = adjstReqService.selectAdjstReqOpenExamplePop(adjstReqVO);
AdjstReqVO exmp = adjstReqService.selectAdjstReqOpenExamplePop(adjstReqVO).get(0);
if (exmp != null && StringUtils.isNotBlank(exmp.getAtchFileId())) {
FileVO fileVO = new FileVO();

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

@ -53,7 +53,7 @@ public interface AdjstReqService {
public AdjstReqVO selectAdjstReqOpenExamplePopCn(AdjstReqVO adjstReqVO) throws Exception;
public AdjstReqVO selectAdjstReqOpenExamplePop(AdjstReqVO adjstReqVO) throws Exception;
public List<AdjstReqVO> selectAdjstReqOpenExamplePop(AdjstReqVO adjstReqVO) throws Exception;
// 조정사건 대리인/신청인/피신청인 정보 불러오기
public List<AdjstReqVO> selectAdjsReqUserListByadjSeq(AdjstReqVO adjstReqVO) throws Exception;

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

@ -165,6 +165,7 @@ public class AdjstReqVO extends ComDefaultVO implements Serializable {
private String reqDetail;
private String rejtReson;
private String edtStatus;
private String exmpMgrId;
private String exmpCd;
private String exmpCn;
private String exmpTit;
@ -881,6 +882,12 @@ public class AdjstReqVO extends ComDefaultVO implements Serializable {
public void setLoginNextUrl(String loginNextUrl) {
this.loginNextUrl = loginNextUrl;
}
public String getExmpMgrId() {
return exmpMgrId;
}
public void setExmpMgrId(String exmpMgrId) {
this.exmpMgrId = exmpMgrId;
}
}

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

@ -176,8 +176,8 @@ 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 List<AdjstReqVO> selectAdjstReqOpenExamplePop(AdjstReqVO adjstReqVO) throws Exception {
return (List<AdjstReqVO>) list("AdjstReqDAO.selectAdjstReqOpenExamplePop",adjstReqVO);
}
public int selectRespondentSchChk(AdjstReqVO adjstReqVO) {

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

@ -1177,7 +1177,7 @@ public class AdjstReqServiceImpl extends EgovAbstractServiceImpl implements Adj
}
@Override
public AdjstReqVO selectAdjstReqOpenExamplePop(AdjstReqVO adjstReqVO) throws Exception {
public List<AdjstReqVO> selectAdjstReqOpenExamplePop(AdjstReqVO adjstReqVO) throws Exception {
return adjstReqDAO.selectAdjstReqOpenExamplePop(adjstReqVO);
}
}

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

@ -50,6 +50,7 @@ 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.adjReqMgrPast.service.AdjReqMgrPastVO;
import kcc.kccadr.adjst.service.AdjstReqService;
import kcc.kccadr.adjst.service.AdjstReqVO;
import kcc.kccadr.cmm.KccadrConstants;
@ -203,10 +204,34 @@ public class AdjstReqWebController {
*/
@RequestMapping("/web/kccadr/adjst/popup/adjstReqOpenExamplePop.do")
public String adjstReqOpenExamplePop(@ModelAttribute("adjstReqVO") AdjstReqVO adjstReqVO, ModelMap model) throws Exception {
model.addAttribute("ccTy", adjstReqVO.getCcTy());
model.addAttribute("exmpCd", adjstReqVO.getExmpCd());
List<AdjstReqVO> exmpList = adjstReqService.selectAdjstReqOpenExamplePop(adjstReqVO);
// if (exmpList != null && StringUtils.isNotBlank(exmpList.getAtchFileId())) {
// FileVO fileVO = new FileVO();
// fileVO.setAtchFileId(exmpList.getAtchFileId());
// List<FileVO> fileList = fileService.selectFileInfs(fileVO);
// model.addAttribute("fileList", fileList);
// }
model.addAttribute("exmpList", exmpList);
return "/web/kccadr/adjst/popup/adjstReqOpenExamplePop";
}
@RequestMapping(value = {"/web/kccadr/adjst/popup/adjstReqOpenExampleAjax.do"})
public ResponseEntity<RestResponse> saveAdjReqRecordAjax(AdjstReqVO adjstReqVO, HttpServletRequest request) throws Exception {
List<AdjstReqVO> exmpList = adjstReqService.selectAdjstReqOpenExamplePop(adjstReqVO);
// if (exmpList != null && StringUtils.isNotBlank(exmpList.getAtchFileId())) {
// FileVO fileVO = new FileVO();
// fileVO.setAtchFileId(exmpList.getAtchFileId());
// List<FileVO> fileList = fileService.selectFileInfs(fileVO);
// model.addAttribute("fileList", fileList);
// }
return ResponseEntity.ok(new RestResponse(HttpStatus.OK, exmpList, "", LocalDateTime.now()));
}
/**
@ -220,7 +245,7 @@ public class AdjstReqWebController {
@RequestMapping(value = "/web/kccadr/adjst/popup/adjstReqOpenExamplePop2.do")
public String adjstReqOpenExamplePop2(@ModelAttribute("adjstReqVO") AdjstReqVO adjstReqVO, ModelMap model) throws Exception {
AdjstReqVO exmp = adjstReqService.selectAdjstReqOpenExamplePop(adjstReqVO);
AdjstReqVO exmp = adjstReqService.selectAdjstReqOpenExamplePop(adjstReqVO).get(0);
if (exmp != null && StringUtils.isNotBlank(exmp.getAtchFileId())) {
FileVO fileVO = new FileVO();
@ -228,7 +253,6 @@ public class AdjstReqWebController {
List<FileVO> fileList = fileService.selectFileInfs(fileVO);
model.addAttribute("fileList", fileList);
}
System.out.println("exmp :: "+ exmp);
model.addAttribute("exmp", exmp);
return "/web/kccadr/adjst/popup/adjstReqOpenExamplePop2";
}

20
src/main/java/kcc/web/MainController.java
View File

@ -1278,7 +1278,7 @@ public class MainController {
if(menuUrl.equals("/web/cop/org/selectOrgDetail.do")){
menuUrl = "/web/cop/org/selectOrgList.do" ;
}else if(menuUrl.equals("/web/kccadr/accdnt/ars/adjstReqStatusDetail.do")
|| menuUrl.equals("/web/kccadr/adjstExpDetail/adjstReqStatusDetail.do")
// || menuUrl.equals("/web/kccadr/adjstExpDetail/adjstReqStatusDetail.do")
|| menuUrl.equals("/web/kccadr/accdnt/acd/adjstChangeDateList.do")
|| menuUrl.equals("/web/kccadr/accdnt/acd/adjstChangeDateCreate.do")
|| menuUrl.equals("/web/kccadr/accdnt/arc/corReqList.do")
@ -1320,7 +1320,21 @@ public class MainController {
}else if(menuUrl.equals("/web/kccadr/accdnt/ai/adjstIncidentDashList.do")) { //나의사건관리 대시보드
menuUrl = "/web/kccadr/accdnt/ai/adjstIncidentList.do";
}
}else if(menuUrl.equals("/web/kccadr/adjstExpDetail/adjstReqStatusDetail.do") // 체험하기
||menuUrl.equals("/web/kccadr/adjstExp/adjstIncidentList.do")
||menuUrl.equals("/web/kccadr/adjstExpDetail/adjstIncidentDetail.do")
||menuUrl.equals("/web/kccadr/adjstExp/adjstReqRegistInformation.do")
||menuUrl.equals("/web/kccadr/adjstExp/adjstReqRegistStep1.do")
||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 = "/web/kccadr/adjstExp/adjstExpMainPage.do";
}
@ -1343,7 +1357,7 @@ public class MainController {
}
}else { //조직도 상세
String menuUrl = request.getRequestURI() ;
if(menuUrl.equals("/web/cop/org/selectOrgDetail.do")){
if(menuUrl.equals("/web/cop/org/selectOrgDetail.do")){
menuUrl = "/web/cop/org/selectOrgList.do" ;
ComDefaultVO searchVO = new ComDefaultVO();
searchVO.setSearchKeyword(menuUrl);

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

@ -894,18 +894,19 @@
<select id="AdjstReqDAO.selectAdjstReqOpenExamplePop" parameterClass="AdjstReqVO" resultClass="AdjstReqVO">
SELECT
T1.EXMP_TIT AS exmpTit
T1.EXMP_MGR_ID AS exmpMgrId
,T1.EXMP_TIT AS exmpTit
,T1.ATCH_FILE_ID AS atchFileId
,T1.EXMP_CC_TY AS exmpCcTy
,T2.EXMP_CD AS exmpCd
,T2.EXMP_CN AS exmpCn
,T1.EXMP_CD AS exmpCd
,T1.EXMP_CN AS exmpCn
FROM
ADR_EXMP_MGR T1
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#
<isEqual property="exmpCd" compareValue="02">
AND T1.EXMP_CC_TY = #ccTy#
</isEqual>
AND T1.EXMP_CD = #exmpCd#
</select>
</sqlMap>

3
src/main/webapp/WEB-INF/jsp/web/com/webCommonNaviWrap.jsp
View File

@ -184,7 +184,8 @@ function snsShare(snsName) {
<c:forEach var="menuLeftResultList" items="${menuLeftResultList}" varStatus="status">
<c:if test="${menuLeftResultList.depths eq '2' }">
<c:forEach var="resultCurrentList" items="${menuCurrentResultList}" varStatus="status">
<c:if test="${menuLeftResultList.menuNo eq resultCurrentList.menuNo }">
<c:if test="${menuLeftResultList.menuNo eq resultCurrentList.menuNo &&
'99921000' ne menuLeftResultList.menuNo}">
<button class="snb_tit" title="하위메뉴 열기"><c:out value='${menuLeftResultList.menuNm}' /></button>
</c:if>
</c:forEach>

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

@ -16,28 +16,47 @@
<script type="text/javaScript" language="javascript">
$(document).ready(function(){
var exmpList = '';
// 레이어팝업 포커싱 이동 수정
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();
});
}
$(".tooltip-close").click(function(){
var activeTarget = $('[data-tooltip-con="fee_info_popup"]');
activeTarget.hide();
$('[data-tooltip="fee_info_popup"]').eq(0).focus();
});
/*
* init
* json으로 데이터 받아오기
*/
var data = new FormData(document.getElementById("selectForm"));
$.ajax({
type:"POST",
url: "/web/kccadr/adjst/popup/adjstReqOpenExampleAjax.do",
data: data,
dataType:'json',
async: false,
processData: false,
contentType: false,
cache: false,
success:function(returnData){
exmpList = returnData.dataList;
},
error:function(request , status, error){
console.log('request : ', request);
console.log('status : ', status);
console.log('error : ', error);
}
});
s /*
* 저작물 변경 event
*/
$('#exmpCcTy').on('change', function(){
fn_selectCn();
$('#selectId').on('change', function(){
var exmpCn = exmpList[$(this).val()].exmpCn;
$('#exmpCn').text(exmpCn);
});
/*
@ -50,48 +69,19 @@ $(document).ready(function(){
$(perId).val($('#exmpCn').text().trim());
});
/*
* 상세내용 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>
<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}"/>
* <kc:code codeId="CC040" code="${exmpList[0].exmpCd}"/>
</div>
</c:if>
<table class="popup_tbType01 t_center">
@ -102,14 +92,13 @@ $(document).ready(function(){
<tbody>
<tr>
<td style="line-height: 30px; text-align: left;">
<kc:code codeId="CC040" code="${exmpCd}"/>
<kc:code codeId="CC040" code="${exmpList[0].exmpCd}"/>
</td>
<td style="line-height: 30px; text-align: left;">
<%-- <kc:select codeId="CC002" name="exmpCcTy" id="exmpCcTy" selectedValue="${ccTy}"/> --%>
<select style="width: 135px;">
<option value="">사건 유형 1</option>
<option value="">사건 유형 2</option>
<option value="">사건 유형 3</option>
<select id="selectId" style="width: 135px;">
<c:forEach var="exmp" items="${exmpList }" varStatus="stat">
<option value="${stat.index }"> <c:out value="${exmp.exmpTit }" /> </option>
</c:forEach>
</select>
</td>
</tr>
@ -118,16 +107,18 @@ $(document).ready(function(){
내용
</td>
<td id="exmpCn" style="line-height: 30px; text-align: left;" >
1)피신청인은 신청인에게 저작권 침해에 따른 손해배상 및 위자료로서 금삼백만원(W3,000,000)을 지급한다. 2)피신청인이 제작, 보유하고 있는 본 건 침해물 <월간 스키라이브>를 조정성립일로부터 14일 이내에 폐기처분한다. 라는 조정을 구합니다
<c:out value="${exmpList[0].exmpCn}" />
</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>
<form id="selectForm" name="selectForm">
<input type="hidden" id="exmpCd" name="exmpCd" value="<c:out value="${exmpList[0].exmpCd}" />" />
</form>
</body>
</html>

1
src/main/webapp/js/page/adjstReq/adjstReq.js
View File

@ -1025,6 +1025,7 @@ var AdjstReq = {
);
},
openExamplePop : function(expmCd){
console.log(" + expmCd :: ", expmCd);
commonPopLayeropen(
"/web/kccadr/adjst/popup/adjstReqOpenExamplePop.do"
, 1100