이지우 - 사용자 성인교육 결과보고 추가, 관리자 성인 교육 결과 상세에 결과보고 정보 팝업 추가

This commit is contained in:
jiwoo 2024-01-04 09:48:36 +09:00
parent 7ef6b0b62d
commit 37e7981df4
5 changed files with 334 additions and 72 deletions

View File

@ -584,7 +584,8 @@ public class InnorixFileServiceImpl extends EgovAbstractServiceImpl implements I
vEEduAplctVO.setEduAplctOrd(adrInnorixFileVO.getEduAplctOrd()); vEEduAplctVO.setEduAplctOrd(adrInnorixFileVO.getEduAplctOrd());
vEEduAplctVO.setLctrSbjct(adrInnorixFileVO.getLctrSbjct()); vEEduAplctVO.setLctrSbjct(adrInnorixFileVO.getLctrSbjct());
vEEduAplctVO.setLctrDay(adrInnorixFileVO.getLctrDay()); //ve_edu_aplct 테이블 데이터로 대체
/*vEEduAplctVO.setLctrDay(adrInnorixFileVO.getLctrDay());
vEEduAplctVO.setLctrStrtH(adrInnorixFileVO.getLctrStrtH()); vEEduAplctVO.setLctrStrtH(adrInnorixFileVO.getLctrStrtH());
vEEduAplctVO.setLctrStrtM(adrInnorixFileVO.getLctrStrtM()); vEEduAplctVO.setLctrStrtM(adrInnorixFileVO.getLctrStrtM());
vEEduAplctVO.setLctrEndH(adrInnorixFileVO.getLctrEndH()); vEEduAplctVO.setLctrEndH(adrInnorixFileVO.getLctrEndH());
@ -593,7 +594,7 @@ public class InnorixFileServiceImpl extends EgovAbstractServiceImpl implements I
vEEduAplctVO.setLctrPlace(adrInnorixFileVO.getLctrPlace()); vEEduAplctVO.setLctrPlace(adrInnorixFileVO.getLctrPlace());
vEEduAplctVO.setLctrTrgt(adrInnorixFileVO.getLctrTrgt()); vEEduAplctVO.setLctrTrgt(adrInnorixFileVO.getLctrTrgt());
vEEduAplctVO.setNos(adrInnorixFileVO.getNos()); vEEduAplctVO.setNos(adrInnorixFileVO.getNos());
vEEduAplctVO.setInstrNm(adrInnorixFileVO.getInstrNm()); vEEduAplctVO.setInstrNm(adrInnorixFileVO.getInstrNm());*/
vEEduAplctVO.setAtchFileId(atchFileId); vEEduAplctVO.setAtchFileId(atchFileId);
vEEduAplctVO.setFrstRegisterId(adrInnorixFileVO.getUniqId()); vEEduAplctVO.setFrstRegisterId(adrInnorixFileVO.getUniqId());

View File

@ -32,6 +32,7 @@ import kcc.kccadr.adjreqmgr.service.AdjReqMgrVO;
import kcc.kccadr.kccadrCom.service.KccadrMgrUdtService; import kcc.kccadr.kccadrCom.service.KccadrMgrUdtService;
import kcc.let.uat.uia.service.SsoLoginVO; import kcc.let.uat.uia.service.SsoLoginVO;
import kcc.let.utl.fcc.service.EgovCryptoUtil; import kcc.let.utl.fcc.service.EgovCryptoUtil;
import kcc.ve.cmm.VeConstants;
import kcc.ve.cmm.VeInstrFeeMng; import kcc.ve.cmm.VeInstrFeeMng;
import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEAsgnmMIXService; import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEAsgnmMIXService;
import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEEduChasiInstrAsgnmService; import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEEduChasiInstrAsgnmService;
@ -1212,6 +1213,51 @@ public class AreaLctrMngAdultController {
} }
/**
* 결과보고
*/
@RequestMapping("popup/rsltRprtPopup.do")
public String rsltRprtPopup(
@ModelAttribute("vEEduAplctVO") VEEduAplctVO vEEduAplctVO
, ModelMap model
, HttpServletRequest request
) throws Exception {
//로그인 처리====================================
//로그인 정보 가져오기
//String s_userCheckNInfo = checkLoginUtil.userCheckNInfo(model, request);
//if (!"".equals(s_userCheckNInfo)) return s_userCheckNInfo;
//로그인 처리====================================
try {
//기본데이터 불러오기
vEEduAplctVO = vEEduAplctService.selectDetail(vEEduAplctVO);
//데이터 복호화 - VO 단위로 만들어서 사용
vEEduAplctVO = egovCryptoUtil.decryptVEEduAplctVOInfo(vEEduAplctVO);
model.addAttribute("info", vEEduAplctVO);
//교육신청 차시 리스트 - 강의일시 강사 정보 조회용
VEEduChasiVO vEEduChasiVO = new VEEduChasiVO();
vEEduChasiVO.setEduAplctOrd(vEEduAplctVO.getEduAplctOrd());
vEEduChasiVO.setInstrDiv(VeConstants.LCTR_DIV_CD_20);
vEEduChasiVO.setPageIndex(0);
vEEduChasiVO.setSiteId("20");
List<VEEduChasiVO> vEEduChasiVOList = vEEduMIXService.selectChasiList202312(vEEduChasiVO);
//복호화
vEEduChasiVOList = egovCryptoUtil.decryptVEEduChasiVOList(vEEduChasiVOList);
model.addAttribute("chasiList", vEEduChasiVOList);
}catch(Exception ex) {
ex.printStackTrace();
}
return "oprtn/adultVisitEdu/popup/rsltRprtPopup";
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////////////////
// //
// //

View File

@ -83,6 +83,15 @@
document.createForm.submit(); document.createForm.submit();
} }
//결과보고
function fncRsltRprtInfo() { //메뉴생성 화면 호출
//document.listForm.authorCode.value = vAuthorCode;
document.chasiStatusPopForm.action = "<c:url value='/kccadr/oprtn/adultVisitEdu/popup/rsltRprtPopup.do'/>";
window.open("#", "_rsltRprtPop", "scrollbars = no, top=100px, left=100px, height=700px, width=750px");
document.chasiStatusPopForm.target = "_rsltRprtPop";
document.chasiStatusPopForm.submit();
}
function fncExcelDown(){ function fncExcelDown(){
var listForm = document.createForm ; var listForm = document.createForm ;
listForm.action = "<c:url value='/kccadr/oprtn/adultVisitEdu/eduRsltSrvyExcelDownLoad.do'/>"; listForm.action = "<c:url value='/kccadr/oprtn/adultVisitEdu/eduRsltSrvyExcelDownLoad.do'/>";
@ -185,7 +194,7 @@
<form:form id="chasiStatusPopForm" name="chasiStatusPopForm" action=""> <form:form id="chasiStatusPopForm" name="chasiStatusPopForm" action="">
<input type="hidden" name="eduAplctOrd" value="<c:out value="${vEEduAplctVO.eduAplctOrd}" />" /> <input type="hidden" name="eduAplctOrd" value="<c:out value="${vEEduAplctVO.eduAplctOrd}" />" />
<input type="hidden" name="eduChasiOrd" value="<c:out value="${vEEduAplctVO.eduChasiOrd}" />" /> <input type="hidden" name="eduChasiOrd" value="<c:out value="${vEEduAplctVO.eduChasiOrd}" />" />
</form:form> </form:form>
<form:form id="listForm" name="listForm" method="post" onsubmit="return false;"> <form:form id="listForm" name="listForm" method="post" onsubmit="return false;">
<input type="hidden" name="pageIndex" value="<c:out value='${vEEduAplctVO.pageIndex}' />"/> <input type="hidden" name="pageIndex" value="<c:out value='${vEEduAplctVO.pageIndex}' />"/>
<input type="hidden" name="searchSortCnd" value="<c:out value="${vEEduAplctVO.searchSortCnd}" />" /> <input type="hidden" name="searchSortCnd" value="<c:out value="${vEEduAplctVO.searchSortCnd}" />" />
@ -429,18 +438,21 @@
</c:import> </c:import>
</td> </td>
</tr> </tr>
<tr> <c:if test="${!empty info.veaRsltRprtOrd }">
<th scope="row"><p>결과보고</p></th> <tr>
<td> <th scope="row"><p>결과보고</p></th>
<c:import url="/cmm/fms/selectOffeduFile.do" charEncoding="utf-8"> <td>
<c:param name="param_atchFileId" value="${info.rsltAtchFileId}" /> <%-- <c:import url="/cmm/fms/selectOffeduFile.do" charEncoding="utf-8">
<c:param name="type" value="rslt_atch_file_id" /> <c:param name="param_atchFileId" value="${info.rsltAtchFileId}" />
<c:param name="table" value="ve_edu_aplct" /> <c:param name="type" value="rslt_atch_file_id" />
<c:param name="deleteFlag" value="Y" /> <c:param name="table" value="ve_edu_aplct" />
<c:param name="eduAplctOrd" value="${vEEduAplctVO.eduAplctOrd}" /> <c:param name="deleteFlag" value="Y" />
</c:import> <c:param name="eduAplctOrd" value="${vEEduAplctVO.eduAplctOrd}" />
</td> </c:import> --%>
</tr> <button class="btn_type06" onclick="fncRsltRprtInfo(); return false;" >결과보고보기</button>
</td>
</tr>
</c:if>
<tr> <tr>
<th scope="row"><p>강사료</p></th> <th scope="row"><p>강사료</p></th>
<td><c:out value='${info.eduPrsnl}'/> <td><c:out value='${info.eduPrsnl}'/>

View File

@ -0,0 +1,174 @@
<!DOCTYPE html>
<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %>
<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%>
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
<%
/**
* @Class Name : instrCostPopup.jsp
* @Description : 강사비용 팝업
* @Modification Information
* @
* @ 수정일 수정자 수정내용
* @ ------- -------- ---------------------------
* @ 2021.08.09 김봉호 최초 생성
* @author 안주영
* @since 2022.01.04
* @version 1.0
* @see
*
*/
%>
<html lang="ko">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<script type="text/javascript">
</script>
<title>결과보고팝업</title>
<script type="text/javaScript" language="javascript">
$(document).ready(function(){
});
function fncPopClose(){
self.close();
}
</script>
</head>
<body>
<form:form id="createForm" name="createForm" method="post" commandName="vEInstrFeeAcmdtVO" onsubmit="return false;">
<input type="hidden" name="eduAplctOrd" id="eduAplctOrd" value="<c:out value="${info.eduAplctOrd}" />">
<input type="hidden" name="eduChasiOrd" id="eduChasiOrd" value="<c:out value="${info.eduChasiOrd}" />">
<input type="hidden" name="instrFeeOrd" id="instrFeeOrd" value="<c:out value="${info.instrFeeOrd}" />" />
<input type="hidden" name="sbmtYn" id="sbmtYn" value="" />
<div class="area_popup">
<div class="cont_popup">
<div class="pop_tb_tit01">
<p>결과보고</p>
</div>
<table class="pop_tb_type02">
<colgroup>
<col style="width: 150px;">
<col style="width: auto;">
</colgroup>
<tbody>
<tr>
<th scope="row">
<p>강의주제</p>
</th>
<td><c:out value="${info.lctrSbjct }" /></td>
</tr>
<c:forEach var="list" items="${chasiList}" varStatus="status">
<tr>
<th scope="row">
<p>강의날짜</p>
</th>
<td>
<c:out value="${list.eduHopeDt}"/>
</td>
</tr>
<tr>
<th scope="row">
<p>강의시간</p>
</th>
<td>
<fmt:parseDate value="${list.strtTm}" var="strtTm" pattern="kkmm"/>
<fmt:formatDate value="${strtTm}" pattern="kk:mm"/>
~
<fmt:parseDate value="${list.endTm}" var="endTm" pattern="kkmm"/>
<fmt:formatDate value="${endTm}" pattern="kk:mm"/>
(${list.lrnTm}분)
</td>
</tr>
</c:forEach>
<c:if test="${info.eduSlctCd eq '10'}">
<tr>
<th scope="row">
<p>교육매체</p>
</th>
<td>
<c:if test="${info.eduMdCd eq '99' }">
<c:out value="${info.eduMd}"/>
</c:if>
<c:if test="${info.eduMdCd ne '99' }">
<ve:code codeId="VEA015" code="${info.eduMdCd}"/>
</c:if>
</td>
</tr>
</c:if>
<c:if test="${info.eduSlctCd ne '10'}">
<tr>
<th scope="row">
<p>장 소</p>
</th>
<td>
<c:out value="(${info.post}) ${info.addr} ${info.addrDetail}"/>
</td>
</tr>
</c:if>
<tr>
<th scope="row">
<p>교육대상</p>
</th>
<td>
<c:out value="${info.eduTrgt}"/>
</td>
</tr>
<tr>
<th scope="row">
<p>인원</p>
</th>
<td>
<c:out value="${info.eduPrsnl}"/>
</td>
</tr>
<tr>
<th scope="row">
<p>강사명(소속)</p>
</th>
<td>
<c:forEach var="list" items="${chasiList}" varStatus="status">
<c:choose>
<c:when test="${empty list.instrNm }">
-
</c:when>
<c:otherwise>
<c:out value="${list.instrNm}(${list.blng})"/>
</c:otherwise>
</c:choose>
</c:forEach>
</td>
</tr>
<tr>
<th scope="row">
<p>첨부파일</p>
</th>
<td>
<c:import url="/cmm/fms/selectSimpleDownInfs.do" charEncoding="utf-8">
<c:param name="param_atchFileId" value="${info.atchFileId}" />
</c:import>
</td>
</tr>
</tbody>
</table>
<div class="btn_wrap_pop btn_layout01">
<div class="btn_left">
</div>
<div class="btn_center">
<button type="button" class="btn_type02" onclick="fncPopClose()">닫기</button>
</div>
<div class="btn_right">
</div>
</div>
</div>
</div>
</form:form>
</body>
</html>

View File

@ -561,22 +561,11 @@
function fn_callBackInnorix(data){ function fn_callBackInnorix(data){
var url = "<c:url value='/web/common/insertInnorixReqRsltAjax.do' />"; var url = "<c:url value='/web/common/insertInnorixReqRsltAjax.do' />";
// 강의 일시
var lctrDay = $('input[name=lctrDay]').val().replaceAll('.', '-');
var sendData = { var sendData = {
"eduAplctOrd": '<c:out value='${info.eduAplctOrd}'/>' "eduAplctOrd": '<c:out value='${info.eduAplctOrd}'/>'
, "lctrDay": lctrDay
, "lctrStrtH": $('#lctrStrtH').val()
, "lctrStrtM": $('#lctrStrtM').val()
, "lctrEndH": $('#lctrEndH').val()
, "lctrEndM": $('#lctrEndM').val()
, "innorixFileListVO": data , "innorixFileListVO": data
, "lctrSbjct" : $('#lctrSbjct').val() , "lctrSbjct" : $('#lctrSbjct').val()
, "lctrPlace" : $('#lctrPlace').val() , "type" : "RSLT"
, "lctrTrgt" : $('#lctrTrgt').val()
, "nos" : $('#nos').val()
, "instrNm" : $('#instrNm').val()
, "successMsg" : "등록이 완료되었습니다." , "successMsg" : "등록이 완료되었습니다."
} }
@ -1501,7 +1490,7 @@
<div class="tb_tit01"> <div class="tb_tit01">
<div class="tb_tit01_left"> <div class="tb_tit01_left">
<p>강의 개요</p> <p>결과보고</p>
</div> </div>
</div> </div>
<div class="tb_type01 tb_write"> <div class="tb_type01 tb_write">
@ -1543,14 +1532,31 @@
</td> </td>
</tr> </tr>
</c:forEach> </c:forEach>
<tr> <c:if test="${info.eduSlctCd eq '10'}">
<th scope="row"> <tr>
<p>장 소</p> <th scope="row">
</th> <p>교육매체</p>
<td colspan="3"> </th>
<c:out value="(${info.post}) ${info.addr} ${info.addrDetail}"/> <td colspan="3">
</td> <c:if test="${info.eduMdCd eq '99' }">
</tr> <c:out value="${info.eduMd}"/>
</c:if>
<c:if test="${info.eduMdCd ne '99' }">
<ve:code codeId="VEA015" code="${info.eduMdCd}"/>
</c:if>
</td>
</tr>
</c:if>
<c:if test="${info.eduSlctCd ne '10'}">
<tr>
<th scope="row">
<p>장 소</p>
</th>
<td colspan="3">
<c:out value="(${info.post}) ${info.addr} ${info.addrDetail}"/>
</td>
</tr>
</c:if>
<tr> <tr>
<th scope="row"> <th scope="row">
<p>교육대상</p> <p>교육대상</p>
@ -1661,46 +1667,60 @@
<c:out value="${info.lctrSbjct }" /> <c:out value="${info.lctrSbjct }" />
</td> </td>
</tr> </tr>
<tr> <c:forEach var="list" items="${chasiList}" varStatus="status">
<th scope="row"> <tr>
<p>강의날짜</p> <th scope="row">
</th> <p>강의날짜</p>
<td colspan="3"> </th>
<c:out value="${info.lctrDay }" /> <td colspan="3">
</td> <c:out value="${list.eduHopeDt}"/>
</tr> </td>
<tr> </tr>
<th scope="row"> <tr>
<p>강의시간</p> <th scope="row">
</th> <p>강의시간</p>
<td colspan="3"> </th>
<div class="btn_wrap"> <td colspan="3">
<!-- Hours (시) Dropdown --> <fmt:parseDate value="${list.strtTm}" var="strtTm" pattern="kkmm"/>
<c:out value="${info.lctrStrtH }" /> <fmt:formatDate value="${strtTm}" pattern="kk:mm"/>
:
<c:out value="${info.lctrStrtM }" />
~ ~
<!-- Hours (시) Dropdown --> <fmt:parseDate value="${list.endTm}" var="endTm" pattern="kkmm"/>
<c:out value="${info.lctrEndH }" /> <fmt:formatDate value="${endTm}" pattern="kk:mm"/>
: (${list.lrnTm}분)
<c:out value="${info.lctrEndM }" /> </td>
<!-- Minutes (분) Dropdown --> </tr>
</td> </c:forEach>
</tr> <c:if test="${info.eduSlctCd eq '10'}">
<tr> <tr>
<th scope="row"> <th scope="row">
<p>장 소</p> <p>교육매체</p>
</th> </th>
<td colspan="3"> <td colspan="3">
<c:out value="${info.lctrPlace }" /> <c:if test="${info.eduMdCd eq '99' }">
</td> <c:out value="${info.eduMd}"/>
</tr> </c:if>
<c:if test="${info.eduMdCd ne '99' }">
<ve:code codeId="VEA015" code="${info.eduMdCd}"/>
</c:if>
</td>
</tr>
</c:if>
<c:if test="${info.eduSlctCd ne '10'}">
<tr>
<th scope="row">
<p>장 소</p>
</th>
<td colspan="3">
<c:out value="(${info.post}) ${info.addr} ${info.addrDetail}"/>
</td>
</tr>
</c:if>
<tr> <tr>
<th scope="row"> <th scope="row">
<p>교육대상</p> <p>교육대상</p>
</th> </th>
<td colspan="3"> <td colspan="3">
<c:out value="${info.lctrTrgt }" /> <c:out value="${info.eduTrgt}"/>
</td> </td>
</tr> </tr>
<tr> <tr>
@ -1708,7 +1728,7 @@
<p>인 원</p> <p>인 원</p>
</th> </th>
<td colspan="3"> <td colspan="3">
<c:out value="${info.nos }" /> <c:out value="${info.eduPrsnl}"/>
</td> </td>
</tr> </tr>
<tr> <tr>
@ -1716,7 +1736,16 @@
<p>강사명(소속)</p> <p>강사명(소속)</p>
</th> </th>
<td colspan="3"> <td colspan="3">
<c:out value="${info.instrNm }" /> <c:forEach var="list" items="${chasiList}" varStatus="status">
<c:choose>
<c:when test="${empty list.instrNm }">
-
</c:when>
<c:otherwise>
<c:out value="${list.instrNm}(${list.blng})"/>
</c:otherwise>
</c:choose>
</c:forEach>
</td> </td>
</tr> </tr>
<tr> <tr>