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

2023-12-19 14:42 사용자 필터조건 수정

Browse Source
This commit is contained in:
myname 2023-12-19 14:42:11 +09:00
parent 42e91ec0ed
commit 5fd1a85220
11 changed files with 161 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
src/main/java/kcc/let/my/web/MyPageController.java
View File

@ -1,95 +1,29 @@
package kcc.let.my.web; package kcc.let.my.web;
import java.io.OutputStream;
import java.security.SecureRandom;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.CellStyle;
import org.apache.poi.ss.usermodel.Font;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.xssf.streaming.SXSSFWorkbook;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.ui.ModelMap; import org.springframework.ui.ModelMap;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.support.SessionStatus;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.mvc.support.RedirectAttributes; import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import org.springmodules.validation.commons.DefaultBeanValidator;
import com.penta.scpdb.ScpDbAgent;
import com.sci.v2.pcc.secu.SciSecuManager;
import com.sci.v2.pcc.secu.hmac.SciHmac;
import NiceID.Check.CPClient;
import egovframework.rte.fdl.property.EgovPropertyService;
import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper;
import egovframework.rte.psl.dataaccess.util.EgovMap;
import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo;
import kcc.com.cmm.ComDefaultCodeVO;
import kcc.com.cmm.EgovMessageSource;
import kcc.com.cmm.EgovMultiPartEmail;
import kcc.com.cmm.LoginVO; import kcc.com.cmm.LoginVO;
import kcc.com.cmm.ReadVO;
import kcc.com.cmm.UserVO;
import kcc.com.cmm.service.EgovCmmUseService;
import kcc.com.cmm.service.EgovFileMngService;
import kcc.com.cmm.service.EgovFileMngUtil;
import kcc.com.cmm.service.FileVO;
import kcc.com.cmm.service.ReadService;
import kcc.com.cmm.util.StringUtil;
import kcc.com.cmm.util.WebUtil;
import kcc.com.uss.ion.cnf.service.ProhibitMngService;
import kcc.com.uss.ion.cnf.service.WordFilterService;
import kcc.com.uss.ion.cnf.service.WordFilterVO;
import kcc.com.utl.fcc.service.EgovStringUtil;
import kcc.com.utl.user.service.CheckLoginUtil; import kcc.com.utl.user.service.CheckLoginUtil;
import kcc.let.cop.bbs.service.Board;
import kcc.let.cop.bbs.service.BoardChgHst;
import kcc.let.cop.bbs.service.BoardMaster;
import kcc.let.cop.bbs.service.BoardMasterVO; import kcc.let.cop.bbs.service.BoardMasterVO;
import kcc.let.cop.bbs.service.BoardVO; import kcc.let.cop.bbs.service.BoardVO;
import kcc.let.cop.bbs.service.EgovBBSAttributeManageService;
import kcc.let.cop.bbs.service.EgovBBSManageService;
import kcc.let.sym.mnu.mpm.service.EgovMenuManageService;
import kcc.let.sym.mnu.mpm.service.MenuManageVO;
import kcc.let.sym.site.service.EgovSiteManagerService;
import kcc.let.sym.site.service.SiteManagerVO;
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.let.utl.sim.service.EgovClntInfo;
import kcc.ve.aplct.fndtnEnhanceTrn.service.FndtnEnhanceTrnService; import kcc.ve.aplct.fndtnEnhanceTrn.service.FndtnEnhanceTrnService;
import kcc.ve.cmm.VeConstants; import kcc.ve.cmm.VeConstants;
import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO;
@ -186,6 +120,7 @@ public class MyPageController {
Map<String, String> tngrMap = tngrList.stream() Map<String, String> tngrMap = tngrList.stream()
.collect(Collectors.partitioningBy(vo -> "30".equals(vo.getAsgnmAprvlCd()), Collectors.counting())) .collect(Collectors.partitioningBy(vo -> "30".equals(vo.getAsgnmAprvlCd()), Collectors.counting()))
//.collect(Collectors.partitioningBy(vo -> "60".equals(vo.getAprvlCd()), Collectors.counting()))
.entrySet().stream() .entrySet().stream()
.collect(Collectors.toMap( .collect(Collectors.toMap(
entry -> entry.getKey() ? "tngrEnd" : "tngrIng", entry -> entry.getKey() ? "tngrEnd" : "tngrIng",
@ -251,10 +186,15 @@ public class MyPageController {
System.out.println("vEEduAplctVOList.size() :: "+vEEduAplctVOList.size()); System.out.println("vEEduAplctVOList.size() :: "+vEEduAplctVOList.size());
// vEEduAplctVOList에서 10, 11, 12, 13 값 제거 // vEEduAplctVOList에서 10, 11, 12, 13 값 제거
List<VEEduAplctVO> filteredList = vEEduAplctVOList.stream() List<VEEduAplctVO> filteredList = vEEduAplctVOList.stream()
/*
.filter(item -> !item.getAprvlCd().equals("10") .filter(item -> !item.getAprvlCd().equals("10")
&& !item.getAprvlCd().equals("11") && !item.getAprvlCd().equals("11")
&& !item.getAprvlCd().equals("12") && !item.getAprvlCd().equals("12")
&& !item.getAprvlCd().equals("13")) && !item.getAprvlCd().equals("13"))
*/
.filter(item -> item.getAprvlCd().equals("80")
|| item.getAprvlCd().equals("20")
)
.collect(Collectors.toList()); .collect(Collectors.toList());
// -- 종료 80 // -- 종료 80
// -- 진행중 20~70 // -- 진행중 20~70
@ -277,6 +217,7 @@ public class MyPageController {
* */ * */
{ {
VEPrcsDetailVO vEPrcsDetailVO = new VEPrcsDetailVO(); VEPrcsDetailVO vEPrcsDetailVO = new VEPrcsDetailVO();
vEPrcsDetailVO.setUserId(loginVO.getUniqId()); vEPrcsDetailVO.setUserId(loginVO.getUniqId());
@ -285,6 +226,7 @@ public class MyPageController {
vEPrcsDetailVO.setRecordCountPerPage(1000000); vEPrcsDetailVO.setRecordCountPerPage(1000000);
vEPrcsDetailVO.setFirstIndex(0); vEPrcsDetailVO.setFirstIndex(0);
/*
List<VEPrcsDetailVO> vEPrcsDetailVOList = vEPrcsAplctPrdService.findByAprvlList(vEPrcsDetailVO); List<VEPrcsDetailVO> vEPrcsDetailVOList = vEPrcsAplctPrdService.findByAprvlList(vEPrcsDetailVO);
// 요청 // 요청
long cont = vEPrcsDetailVOList.stream().filter(t-> "10".equals(t.getAprvlCd())).count(); long cont = vEPrcsDetailVOList.stream().filter(t-> "10".equals(t.getAprvlCd())).count();
@ -299,9 +241,15 @@ public class MyPageController {
model.addAttribute("fndtnMap", fndtnMap); model.addAttribute("fndtnMap", fndtnMap);
model.addAttribute("fndtnList", vEPrcsDetailVOList); model.addAttribute("fndtnList", vEPrcsDetailVOList);
*/
//신청중, 수강중, 종료된 수량
Map<String,Object> countMap = vEPrcsAplctPrdService.findAllDashboardCnt(vEPrcsDetailVO);
model.addAttribute("countMap", countMap);
} }
//내 문의 목록
{ {
VEPrcsDetailVO vEPrcsDetailVO = new VEPrcsDetailVO(); VEPrcsDetailVO vEPrcsDetailVO = new VEPrcsDetailVO();

5
src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java
View File

@ -2,7 +2,6 @@ package kcc.ve.oprtn.cndtnSspnIdtmt.web;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.Optional;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@ -25,10 +24,8 @@ import kcc.com.cmm.ComDefaultCodeVO;
import kcc.com.cmm.ComDefaultVO; import kcc.com.cmm.ComDefaultVO;
import kcc.com.cmm.LoginVO; import kcc.com.cmm.LoginVO;
import kcc.com.cmm.service.EgovFileMngService; import kcc.com.cmm.service.EgovFileMngService;
import kcc.com.cmm.service.FileVO;
import kcc.com.cmm.service.impl.CmmUseDAO; import kcc.com.cmm.service.impl.CmmUseDAO;
import kcc.com.cmm.util.StringUtil; import kcc.com.cmm.util.StringUtil;
import kcc.com.utl.fcc.service.EgovDateUtil;
import kcc.com.utl.user.service.CheckLoginUtil; import kcc.com.utl.user.service.CheckLoginUtil;
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;
@ -1760,7 +1757,7 @@ public class CndtnPrcsInfoMngController {
// 데이터가 없으면 Insert // 데이터가 없으면 Insert
if(vEDetail_DVO == null) { if(vEDetail_DVO == null) {
vEDetailVO.setAplctStateCd("10"); // 신청상태코드 VEA003 10:미이수 20:이수 //vEDetailVO.setAplctStateCd("10"); // 신청상태코드 VEA003 10:미이수 20:이수
vEDetailVO.setFrstRegisterId(uniqId); vEDetailVO.setFrstRegisterId(uniqId);
vEAPrcsAplctPrdInstrAsgnmService.insertAprvlCdEduAplctDetail(vEDetailVO); vEAPrcsAplctPrdInstrAsgnmService.insertAprvlCdEduAplctDetail(vEDetailVO);

2
src/main/java/kcc/ve/oprtn/fndtnEnhanceTrn/prcsAplctPrdMng/web/FndthPrcsAplctPrdMngController.java
View File

@ -991,7 +991,7 @@ public class FndthPrcsAplctPrdMngController {
// 데이터가 없으면 Insert // 데이터가 없으면 Insert
if(vEDetail_DVO == null) { if(vEDetail_DVO == null) {
vEDetailVO.setAplctStateCd("10"); // 신청상태코드 VEA003 10:미이수 20:이수 //vEDetailVO.setAplctStateCd("10"); // 신청상태코드 VEA003 10:미이수 20:이수
vEDetailVO.setFrstRegisterId(uniqId); vEDetailVO.setFrstRegisterId(uniqId);
vEAPrcsAplctPrdInstrAsgnmService.insertAprvlCdEduAplctDetail(vEDetailVO); vEAPrcsAplctPrdInstrAsgnmService.insertAprvlCdEduAplctDetail(vEDetailVO);

54
src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml
View File

@ -3952,6 +3952,58 @@
<isNotEqual property="pageIndex" compareValue="0">
/*
LIMIT recordCountPerPage OFFSET firstIndex
*/
OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY;
</isNotEqual>
</select>
<!-- 차시별 강사배치 리스트 page -->
<select id="VEEduMIXDAO.selectChasiListMypage_bak" parameterClass="VEEduChasiVO" resultClass="VEEduChasiVO">
/* VEEduMIXDAO.selectChasiListMypage */
SELECT COUNT(1) OVER() AS totCnt ,
ROWNUM AS rowNo ,
A.EDU_APLCT_ORD AS eduAplctOrd
, A.LCTR_DIV_CD AS lctrDivCd
, A.addr AS sAddr
, A.EDU_PRSNL AS eduPrsnl
, A.schol_instt_nm AS scholInsttNm
, A.edu_place AS eduPlace
, A.INSTT_NM AS InsttNm
, A.hope_sbjct AS hopeSbjct
, A.INSTT_DIV_CD AS insttDivCd
, A.EDU_SLCT_CD AS eduSlctCd
, A.rslt_atch_file_id AS rsltAtchFileId
FROM
VE_EDU_APLCT A
WHERE 1=1
AND NVL(A.USE_YN, 'Y') <![CDATA[ <> ]]> 'N'
<isNotEmpty property="eduAplctOrd">
AND A.EDU_APLCT_ORD = #eduAplctOrd#
</isNotEmpty>
<isNotEmpty property="lctrDivCd">
AND A.LCTR_DIV_CD = #lctrDivCd#
</isNotEmpty>
<isNotEmpty property="aprvlCd">
AND A.APRVL_CD=#aprvlCd#
</isNotEmpty>
<isNotEmpty property="userId">
AND A.USER_ID = #userId#
</isNotEmpty>
ORDER BY 1
<isEmpty property="orderByQuery">
, A.EDU_APLCT_ORD DESC
</isEmpty>
<isNotEmpty property="orderByQuery">
, $orderByQuery$
</isNotEmpty>
<isNotEqual property="pageIndex" compareValue="0"> <isNotEqual property="pageIndex" compareValue="0">
/* /*
LIMIT recordCountPerPage OFFSET firstIndex LIMIT recordCountPerPage OFFSET firstIndex
@ -3962,7 +4014,7 @@
<!-- 차시별 강사배치 리스트 page --> <!-- 차시별 강사배치 리스트 page -->
<select id="VEEduMIXDAO.selectChasiListMypage" parameterClass="VEEduChasiVO" resultClass="VEEduChasiVO"> <select id="VEEduMIXDAO.selectChasiListMypage" parameterClass="VEEduChasiVO" resultClass="VEEduChasiVO">
/* VEEduMIXDAO.selectChasiList */ /* VEEduMIXDAO.selectChasiListMypage_bak */
SELECT COUNT(1) OVER() AS totCnt , SELECT COUNT(1) OVER() AS totCnt ,
ROWNUM AS rowNo , ROWNUM AS rowNo ,
A.EDU_APLCT_ORD AS eduAplctOrd A.EDU_APLCT_ORD AS eduAplctOrd

51
src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml
View File

@ -679,7 +679,12 @@
AND vadi.aplct_state_cd = #searchStatus# AND vadi.aplct_state_cd = #searchStatus#
</isEqual> </isEqual>
<isEqual property="searchStatus" compareValue="20"> /*이수완료 : 종료 강의*/ <isEqual property="searchStatus" compareValue="20"> /*이수완료 : 종료 강의*/
AND vadi.aplct_state_cd = #searchStatus# AND vadi.aplct_state_cd is not null
AND a.aprvl_cd = #searchStatus#
</isEqual>
<isEqual property="searchStatus" compareValue="15"> /*수강중 강의*/
AND vadi.aplct_state_cd is null
AND a.aprvl_cd = 20
</isEqual> </isEqual>
<isEqual property="searchStatus" compareValue="10"> /*요청 : 요청 강의*/ <isEqual property="searchStatus" compareValue="10"> /*요청 : 요청 강의*/
AND a.aprvl_cd = #searchStatus# AND a.aprvl_cd = #searchStatus#
@ -699,6 +704,7 @@
*/ */
SELECT SELECT
NVL(SUM(CASE WHEN a.aprvl_cd = '10' THEN 1 ELSE 0 END),0) AS count_aprvl_cd_10 NVL(SUM(CASE WHEN a.aprvl_cd = '10' THEN 1 ELSE 0 END),0) AS count_aprvl_cd_10
/*
, NVL(SUM(CASE , NVL(SUM(CASE
WHEN a.aprvl_cd = '20' WHEN a.aprvl_cd = '20'
AND TO_DATE(c.edu_ddln_pnttm, 'YYYY.MM.DD') &gt;= CURRENT_DATE AND TO_DATE(c.edu_ddln_pnttm, 'YYYY.MM.DD') &gt;= CURRENT_DATE
@ -706,7 +712,27 @@
THEN 1 THEN 1
ELSE 0 ELSE 0
END),0) AS count_aprvl_cd_20 END),0) AS count_aprvl_cd_20
, NVL(SUM(CASE WHEN a.aprvl_cd = '20' AND b.aplct_state_cd = '20' THEN 1 ELSE 0 END),0) AS count_end_cd */
, NVL(SUM(CASE
WHEN a.aprvl_cd = '20'
AND b.aplct_state_cd IS NULL
THEN 1
ELSE 0
END),0) AS count_aprvl_cd_20
/*
, NVL(SUM(CASE WHEN a.aprvl_cd = '20'
AND b.aplct_state_cd = '20'
THEN 1
ELSE 0
END)
,0) AS count_end_cd
*/
, NVL(SUM(CASE WHEN a.aprvl_cd = '20'
AND b.aplct_state_cd IS NOT NULL
THEN 1
ELSE 0
END)
,0) AS count_end_cd
FROM FROM
ve_edu_aplct a ve_edu_aplct a
LEFT JOIN vea_aplct_detail_info b LEFT JOIN vea_aplct_detail_info b
@ -725,14 +751,19 @@
count_end_cd 는 조건이 b.aplct_state_cd = '20' (VEA003 - 이수완료) count_end_cd 는 조건이 b.aplct_state_cd = '20' (VEA003 - 이수완료)
*/ */
SELECT SELECT
SUM(CASE WHEN a.aprvl_cd = '10' THEN 1 ELSE 0 END) AS count_aprvl_cd_10 NVL(SUM(CASE WHEN a.aprvl_cd = '10' THEN 1 ELSE 0 END),0) AS count_aprvl_cd_10
, SUM(CASE , NVL(SUM(CASE
WHEN a.aprvl_cd = '20' WHEN a.aprvl_cd = '20'
AND TO_DATE(c.edu_strt_pnttm, 'YYYY.MM.DD') = CURRENT_DATE AND b.aplct_state_cd IS NULL
THEN 1 THEN 1
ELSE 0 ELSE 0
END) AS count_aprvl_cd_20 END),0) AS count_aprvl_cd_20
, SUM(CASE WHEN a.aprvl_cd = '20' AND b.aplct_state_cd = '20' THEN 1 ELSE 0 END) AS count_end_cd , NVL(SUM(CASE
WHEN a.aprvl_cd = '20'
AND b.aplct_state_cd IS NOT NULL
THEN 1
ELSE 0
END),0) AS count_end_cd
FROM FROM
ve_edu_aplct a ve_edu_aplct a
LEFT JOIN vea_aplct_detail_info b LEFT JOIN vea_aplct_detail_info b

38
src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp
View File

@ -55,15 +55,33 @@
form.submit(); form.submit();
} }
//실무역량강화 링크
function fn_goListForm(data){
var form = document.goListForm ;
form.searchStatus.value = data ;
form.submit();
}
//체험교실 링크
function fn_goExprnListForm(data){
var form = document.goExprnListForm ;
form.searchStatus2.value = data ;
form.submit();
}
</script> </script>
</head> </head>
<body> <body>
<form id="goExprnListForm" name="goExprnListForm" action="<c:url value="/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctList.do" />" method="post">
<input type="hidden" id="searchStatus2" name="searchStatus2" />
</form>
<form id="goListForm" name="goListForm" action="<c:url value="/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.do" />" method="post">
<input type="hidden" id="searchStatus" name="searchStatus" />
</form>
<form id="deatilForm" name="deatilForm" > <form id="deatilForm" name="deatilForm" >
<input type="hidden" id="prcsAplctPrdQnaOrd" name="prcsAplctPrdQnaOrd" value=""/> <input type="hidden" id="prcsAplctPrdQnaOrd" name="prcsAplctPrdQnaOrd" value=""/>
@ -95,7 +113,7 @@
<p><img src="/offedu/visitEdu/usr/publish/images/content/mypage_icon01.png" alt="찾아가는 교육 청소년 마이페이지 아이콘"> 찾교(청소년)</p> <p><img src="/offedu/visitEdu/usr/publish/images/content/mypage_icon01.png" alt="찾아가는 교육 청소년 마이페이지 아이콘"> 찾교(청소년)</p>
</div> </div>
<div class="inner_text" style="text-align: left;"> <div class="inner_text" style="text-align: left;">
<a href="<c:url value='/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndList.do' />"> <a href="<c:url value='/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctList.do' />">
<p><i></i>교육진행 <span>${tngrMap['tngrIng']}</span>건</p> <p><i></i>교육진행 <span>${tngrMap['tngrIng']}</span>건</p>
</a> </a>
<a href="<c:url value='/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndList.do' />"> <a href="<c:url value='/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndList.do' />">
@ -110,7 +128,7 @@
<p><img src="/offedu/visitEdu/usr/publish/images/content/mypage_icon02.png" alt="찾아가는 성인 마이페이지 아이콘"> 찾교(성인)</p> <p><img src="/offedu/visitEdu/usr/publish/images/content/mypage_icon02.png" alt="찾아가는 성인 마이페이지 아이콘"> 찾교(성인)</p>
</div> </div>
<div class="inner_text" style="text-align: left;"> <div class="inner_text" style="text-align: left;">
<a href="<c:url value='/web/ve/aplct/adultVisitEdu/eduEnd/eduEndList.do' />"> <a href="<c:url value='/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctList.do' />">
<p><i></i>교육진행 <span>${adultMap['adultIng']}</span>건</p> <p><i></i>교육진행 <span>${adultMap['adultIng']}</span>건</p>
</a> </a>
<a href="<c:url value='/web/ve/aplct/adultVisitEdu/eduEnd/eduEndList.do' />"> <a href="<c:url value='/web/ve/aplct/adultVisitEdu/eduEnd/eduEndList.do' />">
@ -125,10 +143,10 @@
<p><img src="/offedu/visitEdu/usr/publish/images/content/mypage_icon03.png" alt="체험교실 마이페이지 아이콘"> 찾교(체험교실)</p> <p><img src="/offedu/visitEdu/usr/publish/images/content/mypage_icon03.png" alt="체험교실 마이페이지 아이콘"> 찾교(체험교실)</p>
</div> </div>
<div class="inner_text" style="text-align: left;"> <div class="inner_text" style="text-align: left;">
<a href="#"> <a href="#" onclick="fn_goExprnListForm(20)">
<p><i></i>교육진행 <span>${exprnMap['exprnIng']}</span>건</p> <p><i></i>운영확정 <span>${exprnMap['exprnIng']}</span>건</p>
</a> </a>
<a href="#"> <a href="#" onclick="fn_goExprnListForm(80)">
<p><i></i>교육종료 <span>${exprnMap['exprnEnd']}</span>건</p> <p><i></i>교육종료 <span>${exprnMap['exprnEnd']}</span>건</p>
</a> </a>
</div> </div>
@ -140,11 +158,11 @@
<p><img src="/offedu/visitEdu/usr/publish/images/content/mypage_icon04.png" alt="실무역량강화 마이페이지 아이콘"> 실무역량강화</p> <p><img src="/offedu/visitEdu/usr/publish/images/content/mypage_icon04.png" alt="실무역량강화 마이페이지 아이콘"> 실무역량강화</p>
</div> </div>
<div class="inner_text" style="text-align: left;"> <div class="inner_text" style="text-align: left;">
<a href="#"><!-- 요청 + 미이수 --> <a href="#" onclick="fn_goListForm(15)"><!-- 요청 + 미이수 -->
<p><i></i>교육진행 <span>${fndtnMap['fndtnIng']}</span>건</p> <p><i></i>교육진행 <span><c:out value="${countMap['COUNT_APRVL_CD_20']}" /></span>건</p>
</a> </a>
<a href="#"> <a href="#" onclick="fn_goListForm(20)">
<p><i></i>교육종료 <span>${fndtnMap['fndtnEnd']}</span>건</p> <p><i></i>교육종료 <span><c:out value="${countMap['COUNT_END_CD']}" /></span>건</p>
</a> </a>
</div> </div>
</div> </div>

6
src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctDetail.jsp
View File

@ -80,9 +80,12 @@
} }
function fncGoList(){ function fncGoList(){
/*
var listForm = document.listForm ; var listForm = document.listForm ;
listForm.action = "<c:url value='/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.do'/>"; listForm.action = "<c:url value='/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.do'/>";
listForm.submit(); listForm.submit();
*/
history.back(-1);
} }
function fncGoEdit(){ function fncGoEdit(){
@ -304,6 +307,9 @@
</div> </div>
<div class="btn_wrap btn_layout01"> <div class="btn_wrap btn_layout01">
<div class="btn_left"> <div class="btn_left">
<button type="button" id="listBtn" class="btnType02" onclick="fncGoList();">
목록
</button>
</div> </div>
<div class="btn_center"> <div class="btn_center">
</div> </div>

9
src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.jsp
View File

@ -310,8 +310,9 @@ $(document).ready(function(){
<select class="selType1" id="searchStatus" name="searchStatus"> <select class="selType1" id="searchStatus" name="searchStatus">
<option ${vEPrcsDetailVO.searchStatus eq '' ? 'selected' : ''} value="">전체</option> <option ${vEPrcsDetailVO.searchStatus eq '' ? 'selected' : ''} value="">전체</option>
<option ${vEPrcsDetailVO.searchStatus eq 10 ? 'selected' : ''} value="10">교육신청</option> <option ${vEPrcsDetailVO.searchStatus eq 10 ? 'selected' : ''} value="10">교육신청</option>
<option ${vEPrcsDetailVO.searchStatus eq 5 ? 'selected' : ''} value="5">미이수</option> <%-- <option ${vEPrcsDetailVO.searchStatus eq 5 ? 'selected' : ''} value="5">미이수</option> --%>
<option ${vEPrcsDetailVO.searchStatus eq 20 ? 'selected' : ''} value="20">이수완료</option> <option ${vEPrcsDetailVO.searchStatus eq 15 ? 'selected' : ''} value="15">진행중</option>
<option ${vEPrcsDetailVO.searchStatus eq 20 ? 'selected' : ''} value="20">완료</option>
</select> </select>
</div> </div>
<div class="btn_wrap"> <div class="btn_wrap">
@ -357,6 +358,8 @@ $(document).ready(function(){
<td onclick="fncGoDetail('<c:out value="${list.prcsAplctPrdOrd}"/>');" style="cursor:pointer;"> <td onclick="fncGoDetail('<c:out value="${list.prcsAplctPrdOrd}"/>');" style="cursor:pointer;">
<%-- <c:out value="${list.prcsNm}"/>(<c:out value="${list.prcsAplctPrdOrd}"/>) --%> <%-- <c:out value="${list.prcsNm}"/>(<c:out value="${list.prcsAplctPrdOrd}"/>) --%>
<c:out value="${list.prcsNm}"/> <c:out value="${list.prcsNm}"/>
<c:out value="${list.aprvlCd}"/>
(<c:out value="${list.aplctStateCd}"/>)
</td> </td>
<td> <td>
<c:out value="${list.eduStrtPnttm}"/>~<c:out value="${list.eduDdlnPnttm}"/> <c:out value="${list.eduStrtPnttm}"/>~<c:out value="${list.eduDdlnPnttm}"/>
@ -405,7 +408,7 @@ $(document).ready(function(){
</tr> </tr>
</c:forEach> </c:forEach>
<c:if test="${empty list}"> <c:if test="${empty list}">
<tr><td colspan="6"><spring:message code="common.nodata.msg" /></td></tr> <tr><td colspan="5"><spring:message code="common.nodata.msg" /></td></tr>
</c:if> </c:if>
</tbody> </tbody>
</table> </table>

2
src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp
View File

@ -124,7 +124,7 @@
<li class="edu_apply" style="cursor: pointer;" onclick="fn_goListForm(10)"><i></i> <li class="edu_apply" style="cursor: pointer;" onclick="fn_goListForm(10)"><i></i>
<div class="text_area">신청중 강의<p><span><c:out value="${countMap['COUNT_APRVL_CD_10']}" /></span>건</p></div> <div class="text_area">신청중 강의<p><span><c:out value="${countMap['COUNT_APRVL_CD_10']}" /></span>건</p></div>
</li> </li>
<li class="edu_register" style="cursor: pointer;" onclick="fn_goListForm(5)"><i></i> <li class="edu_register" style="cursor: pointer;" onclick="fn_goListForm(15)"><i></i>
<div class="text_area">수강중 강의<p><span><c:out value="${countMap['COUNT_APRVL_CD_20']}" /></span>건</p></div> <div class="text_area">수강중 강의<p><span><c:out value="${countMap['COUNT_APRVL_CD_20']}" /></span>건</p></div>
</li> </li>
<li class="edu_close" style="cursor: pointer;" onclick="fn_goListForm(20)"><i></i> <li class="edu_close" style="cursor: pointer;" onclick="fn_goListForm(20)"><i></i>

2
src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp
View File

@ -128,7 +128,7 @@
</div> </div>
<ul class="edu_process"> <ul class="edu_process">
<li class="edu_apply" style="cursor: pointer;" onclick="fn_goListForm(10)"><i></i><div class="text_area">신청중 강의<p><span><c:out value="${empty countMap['COUNT_APRVL_CD_10'] ? '0' : countMap['COUNT_APRVL_CD_10']}" /></span>건</p></div></li> <li class="edu_apply" style="cursor: pointer;" onclick="fn_goListForm(10)"><i></i><div class="text_area">신청중 강의<p><span><c:out value="${empty countMap['COUNT_APRVL_CD_10'] ? '0' : countMap['COUNT_APRVL_CD_10']}" /></span>건</p></div></li>
<li class="edu_register" style="cursor: pointer;" onclick="fn_goListForm(5)"><i></i><div class="text_area">수강중 강의<p><span><c:out value="${empty countMap['COUNT_APRVL_CD_20'] ? '0' : countMap['COUNT_APRVL_CD_20']} " /></span>건</p></div></li> <li class="edu_register" style="cursor: pointer;" onclick="fn_goListForm(15)"><i></i><div class="text_area">수강중 강의<p><span><c:out value="${empty countMap['COUNT_APRVL_CD_20'] ? '0' : countMap['COUNT_APRVL_CD_20']} " /></span>건</p></div></li>
<li class="edu_close" style="cursor: pointer;" onclick="fn_goListForm(20)"><i></i><div class="text_area">종료된 강의<p><span><c:out value="${empty countMap['COUNT_END_CD'] ? '0' : countMap['COUNT_END_CD']}" /></span>건</p></div></li> <li class="edu_close" style="cursor: pointer;" onclick="fn_goListForm(20)"><i></i><div class="text_area">종료된 강의<p><span><c:out value="${empty countMap['COUNT_END_CD'] ? '0' : countMap['COUNT_END_CD']}" /></span>건</p></div></li>
</ul> </ul>

5
src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp
View File

@ -415,8 +415,9 @@ $(document).ready(function(){
<select class="selType1" id="searchStatus" name="searchStatus"> <select class="selType1" id="searchStatus" name="searchStatus">
<option ${vEPrcsDetailVO.searchStatus eq '' ? 'selected' : ''} value="">전체</option> <option ${vEPrcsDetailVO.searchStatus eq '' ? 'selected' : ''} value="">전체</option>
<option ${vEPrcsDetailVO.searchStatus eq 10 ? 'selected' : ''} value="10">교육신청</option> <option ${vEPrcsDetailVO.searchStatus eq 10 ? 'selected' : ''} value="10">교육신청</option>
<option ${vEPrcsDetailVO.searchStatus eq 30 ? 'selected' : ''} value="30">교육취소</option> <%-- <option ${vEPrcsDetailVO.searchStatus eq 30 ? 'selected' : ''} value="30">교육취소</option> --%>
<option ${vEPrcsDetailVO.searchStatus eq 20 ? 'selected' : ''} value="20">이수완료</option> <option ${vEPrcsDetailVO.searchStatus eq 15 ? 'selected' : ''} value="15">진행중</option>
<option ${vEPrcsDetailVO.searchStatus eq 20 ? 'selected' : ''} value="20">완료</option>
</select> </select>
</div> </div>
<div class="btn_wrap"> <div class="btn_wrap">