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

Merge branch 'hylee' into advc

Browse Source
This commit is contained in:
hylee 2023-12-08 15:05:21 +09:00
commit 326115f094
3 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -197,10 +197,10 @@ public class MyPageController {
vEEduChasiVO.setPageUnit(vEEduAplctVO.getPageUnit()); vEEduChasiVO.setPageUnit(vEEduAplctVO.getPageUnit());
vEEduChasiVO.setPageSize(vEEduAplctVO.getPageSize()); vEEduChasiVO.setPageSize(vEEduAplctVO.getPageSize());
List<VEEduChasiVO> vEEduChasiVOList = vEEduMIXService.selectChasiListMypage(vEEduChasiVO); List<VEEduChasiVO> adultList = vEEduMIXService.selectChasiListMypage(vEEduChasiVO);
Map<String, String> tngrMap = vEEduChasiVOList.stream() Map<String, String> tngrMap = adultList.stream()
.collect(Collectors.partitioningBy(vo -> "30".equals(vo.getAsgnmAprvlCd()), Collectors.counting())) .collect(Collectors.partitioningBy(vo -> "30".equals(vo.getAsgnmAprvlCd()), Collectors.counting()))
.entrySet().stream() .entrySet().stream()
.collect(Collectors.toMap( .collect(Collectors.toMap(
@ -210,6 +210,7 @@ public class MyPageController {
); );
model.addAttribute("adultMap", tngrMap); model.addAttribute("adultMap", tngrMap);
model.addAttribute("adultList", adultList);
} }
// return "/web/cop/bbs/FaqListAjax"; // return "/web/cop/bbs/FaqListAjax";
return "web/my/myPageDashBoard"; return "web/my/myPageDashBoard";

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

@ -672,6 +672,15 @@
<isNotEmpty property="searchEndDt"> <isNotEmpty property="searchEndDt">
AND vpap.edu_strt_pnttm <![CDATA[ <= ]]> #searchEndDt# AND vpap.edu_strt_pnttm <![CDATA[ <= ]]> #searchEndDt#
</isNotEmpty> </isNotEmpty>
<isEqual property="searchStatus" compareValue="30">
AND vadi.aplct_state_cd = #searchStatus#
</isEqual>
<isEqual property="searchStatus" compareValue="20">
AND vadi.aplct_state_cd = #searchStatus#
</isEqual>
<isEqual property="searchStatus" compareValue="10">
AND a.aprvl_cd = #searchStatus#
</isEqual>
/*AND a.aprvl_cd != '100' 찜하기 제거*/ /*AND a.aprvl_cd != '100' 찜하기 제거*/
ORDER BY vpap.edu_strt_pnttm desc ORDER BY vpap.edu_strt_pnttm desc

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

@ -11,10 +11,10 @@
<un:useConstants var="VeConstants" className="kcc.ve.cmm.VeConstants" /> <un:useConstants var="VeConstants" className="kcc.ve.cmm.VeConstants" />
<title>교육신청 목록 > 성인 찾아가는 저작권 교육 > 한국저작권위원회 저작권 교육 시스템</title> <title>교육신청 목록 > 성인 찾아가는 저작권 교육 > 한국저작권위원회 저작권 교육 시스템</title>
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<%-- <spring:eval expression="@property['Globals.Innorix.License']" var="license"/> --%> <spring:eval expression="@property['Globals.Innorix.License']" var="license"/>
<%-- <script src="<c:url value='/innorix/innorix_${license}.js' />"></script> --%> <script src="<c:url value='/innorix/innorix_${license}.js' />"></script>
<%-- <script src="<c:url value='/js/kccadr/innorixCommon.js' />"></script> --%> <script src="<c:url value='/js/kccadr/innorixCommon.js' />"></script>
<%-- <link rel="stylesheet" href="<c:url value='/innorix/innorix.css'/>" type="text/css"> --%> <link rel="stylesheet" href="<c:url value='/innorix/innorix.css'/>" type="text/css">
<style> <style>
input:disabled { input:disabled {
background-color: #f9f9f9 !important; background-color: #f9f9f9 !important;
@ -414,11 +414,9 @@ $(document).ready(function(){
<label for="searchStatus" class="label">신청상태 선택</label> <label for="searchStatus" class="label">신청상태 선택</label>
<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 VeConstants.STATUS_CD_SBMT ? 'selected' : ''} value="${VeConstants.STATUS_CD_SBMT}">교육신청</option> <option ${vEPrcsDetailVO.searchStatus eq 10 ? 'selected' : ''} value="10">교육신청</option>
<option ${vEPrcsDetailVO.searchStatus eq VeConstants.STATUS_CD_EDT_REQ ? 'selected' : ''} value="${VeConstants.STATUS_CD_EDT_REQ}">수정요청</option> <option ${vEPrcsDetailVO.searchStatus eq 30 ? 'selected' : ''} value="30">교육취소</option>
<option ${vEPrcsDetailVO.searchStatus eq VeConstants.STATUS_CD_EDT_CMPT ? 'selected' : ''} value="${VeConstants.STATUS_CD_EDT_CMPT}">수정완료</option> <option ${vEPrcsDetailVO.searchStatus eq 20 ? 'selected' : ''} value="20">이수완료</option>
<option ${vEPrcsDetailVO.searchStatus eq VeConstants.STATUS_CD_CAN ? 'selected' : ''} value="${VeConstants.STATUS_CD_CAN}">교육취소</option>
<option ${vEPrcsDetailVO.searchStatus eq VeConstants.STATUS_CD_EDU_SELCT ? 'selected' : ''} value="${VeConstants.STATUS_CD_EDU_SELCT}">교육확정</option>
</select> </select>
</div> </div>
<div class="btn_wrap"> <div class="btn_wrap">