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

Merge branch 'JIWOO' into advc

Browse Source
This commit is contained in:
jiwoo 2023-12-28 12:12:30 +09:00
commit e66e973f6b
5 changed files with 103 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,7 +102,8 @@ public class MyPageController {
* 청소년 진행목록
*/
{
VEEduAplctVO vEEduAplctVO = new VEEduAplctVO();
/*진행/종료 건수에서 신청/완료 건수로 변경 > 진행/종료는 차시 기준. 신청은 신청 기준이라 조회쿼리 변경*/
/*VEEduAplctVO vEEduAplctVO = new VEEduAplctVO();
// 청소년
// 사용자 교육신청 차시 리스트
@ -138,14 +139,45 @@ public class MyPageController {
model.addAttribute("tngrMap", tngrMap);
model.addAttribute("tngrList", tngrList);
model.addAttribute("tngrList", tngrList);*/
//신청목록
VEEduAplctVO vEEduAplctVO = new VEEduAplctVO();
vEEduAplctVO.setUserId(loginVO.getUniqId());
vEEduAplctVO.setLctrDivCd(VeConstants.LCTR_DIV_CD_10);
vEEduAplctVO.setRecordCountPerPage(10);
vEEduAplctVO.setFirstIndex(0);
List<VEEduAplctVO> vEEduAplctVOList = vEEduMIXService.selectPagingApplyList(vEEduAplctVO);
int tngrAplctCnt = 0;
if(vEEduAplctVOList != null && !vEEduAplctVOList.isEmpty()) {
tngrAplctCnt = vEEduAplctVOList.get(0).getTotCnt();
}
model.addAttribute("tngrAplctCnt", tngrAplctCnt);
//완료목록
VEEduChasiVO vEEduChasiVO = new VEEduChasiVO();
vEEduChasiVO.setLctrDivCd(VeConstants.LCTR_DIV_CD_10);
vEEduChasiVO.setAprvlCd(VeConstants.STATUS_CD_EDU_SELCT);
vEEduChasiVO.setUserId(loginVO.getUniqId());
vEEduChasiVO.setSearchStartDt(vEEduAplctVO.getSearchStartDt());
vEEduChasiVO.setSearchEndDt(vEEduAplctVO.getSearchEndDt());
vEEduChasiVO.setRecordCountPerPage(10);
vEEduChasiVO.setFirstIndex(0);
List<VEEduChasiVO> vEEduChasiVOList = vEEduMIXService.selectChasiList(vEEduChasiVO);
int tngrEndCnt = 0;
if(vEEduChasiVOList != null && !vEEduChasiVOList.isEmpty()) {
tngrEndCnt = vEEduChasiVOList.get(0).getTotCnt();
}
model.addAttribute("tngrEndCnt", tngrEndCnt);
model.addAttribute("tngrList", vEEduChasiVOList);
}
/*
* 성인 진행목록
*/
{
VEEduAplctVO vEEduAplctVO = new VEEduAplctVO();
/*진행/종료 건수에서 신청/완료 건수로 변경 > 진행/종료는 차시 기준. 신청은 신청 기준이라 조회쿼리 변경*/
/*VEEduAplctVO vEEduAplctVO = new VEEduAplctVO();
// 청소년
// 사용자 교육신청 차시 리스트
@ -176,7 +208,34 @@ public class MyPageController {
);
model.addAttribute("adultMap", adultMap);
model.addAttribute("adultList", adultList);
model.addAttribute("adultList", adultList);*/
//신청목록
VEEduAplctVO vEEduAplctVO = new VEEduAplctVO();
vEEduAplctVO.setUserId(loginVO.getUniqId());
vEEduAplctVO.setLctrDivCd(VeConstants.LCTR_DIV_CD_20);
vEEduAplctVO.setRecordCountPerPage(10);
vEEduAplctVO.setFirstIndex(0);
List<VEEduAplctVO> vEEduAplctVOList = vEEduMIXService.selectPagingList(vEEduAplctVO);
int adultAplctCnt = 0;
if(vEEduAplctVOList != null && !vEEduAplctVOList.isEmpty()) {
adultAplctCnt = vEEduAplctVOList.get(0).getTotCnt();
}
model.addAttribute("adultAplctCnt", adultAplctCnt);
//완료목록
VEEduChasiVO vEEduChasiVO = new VEEduChasiVO();
vEEduChasiVO.setLctrDivCd(VeConstants.LCTR_DIV_CD_20);
vEEduChasiVO.setAprvlCd(VeConstants.STATUS_CD_EDU_SELCT);
vEEduChasiVO.setUserId(loginVO.getUniqId());
vEEduChasiVO.setRecordCountPerPage(10);
vEEduChasiVO.setFirstIndex(0);
List<VEEduChasiVO> vEEduChasiVOList = vEEduMIXService.selectChasiList(vEEduChasiVO);
int adultEndCnt = 0;
if(vEEduChasiVOList != null && !vEEduChasiVOList.isEmpty()) {
adultEndCnt = vEEduChasiVOList.get(0).getTotCnt();
}
model.addAttribute("adultEndCnt", adultEndCnt);
model.addAttribute("adultList", vEEduChasiVOList);
}
/*
* 체험교실

7
src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduChasiVO.java
View File

@ -135,6 +135,7 @@ public class VEEduChasiVO extends ComDefaultVO implements Serializable {
private String prcsAplctPrdOrd; //기간과정신청정보
private String eduTrgt; //대상
private String eduAprvlCd; //교육 신청상태
public String getQustnrQesitmId10Cnt() {
@ -715,5 +716,11 @@ public class VEEduChasiVO extends ComDefaultVO implements Serializable {
public void setEduTrgt(String eduTrgt) {
this.eduTrgt = eduTrgt;
}
public String getEduAprvlCd() {
return eduAprvlCd;
}
public void setEduAprvlCd(String eduAprvlCd) {
this.eduAprvlCd = eduAprvlCd;
}
}

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

@ -884,7 +884,7 @@
</isNotEmpty>
<isNotEmpty property="searchChrgNm">
AND A.CHRG_NM LIKE '%' || #searchChrgNm# , '%')
AND A.CHRG_NM LIKE '%' || #searchChrgNm# || '%'
</isNotEmpty>
<isNotEmpty property="searchStatusArr">
@ -3804,7 +3804,8 @@
, A.INSTT_NM AS InsttNm
, A.hope_sbjct AS hopeSbjct
, A.INSTT_DIV_CD AS insttDivCd
, A.EDU_SLCT_CD AS eduSlctCd
, A.EDU_SLCT_CD AS eduSlctCd
, A.APRVL_CD AS eduAprvlCd
, B.EDU_CHASI_ORD AS eduChasiOrd
/*
, TO_CHAR(B.EDU_HOPE_DT,'YYYY.MM.DD') AS eduHopeDt

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

@ -19,6 +19,8 @@
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%>
<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%>
<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %>
<un:useConstants var="VeConstants" className="kcc.ve.cmm.VeConstants" />
<head>
<script type="text/javascript">
$( document ).ready(function() {
@ -115,10 +117,10 @@
</div>
<div class="inner_text" style="text-align: left;">
<a href="<c:url value='/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctList.do' />">
<p><i></i>교육진행 <span>${tngrMap['tngrIng']}</span>건</p>
<p><i></i>교육신청 <span>${tngrAplctCnt}</span>건</p>
</a>
<a href="<c:url value='/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndList.do' />">
<p><i></i>교육종료 <span>${tngrMap['tngrEnd']}</span>건</p>
<p><i></i>교육완료 <span>${tngrEndCnt}</span>건</p>
</a>
</div>
</div>
@ -130,10 +132,10 @@
</div>
<div class="inner_text" style="text-align: left;">
<a href="<c:url value='/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctList.do' />">
<p><i></i>교육진행 <span>${adultMap['adultIng']}</span>건</p>
<p><i></i>교육신청 <span>${adultAplctCnt}</span>건</p>
</a>
<a href="<c:url value='/web/ve/aplct/adultVisitEdu/eduEnd/eduEndList.do' />">
<p><i></i>교육종료 <span>${adultMap['adultEnd']}</span>건</p>
<p><i></i>교육완료 <span>${adultEndCnt}</span>건</p>
</a>
</div>
</div>
@ -193,7 +195,7 @@
<th>교육일</th>
<th>신청유형</th>
<th>신청상태</th>
<th>설문</th>
<th>강의평가</th>
</tr>
</thead>
<tbody>
@ -204,34 +206,34 @@
<td><kc:code codeId="VE0007" code="${list.eduSlctCd}"/></td>
<td>
<c:choose>
<c:when test="${list.aprvlCd eq VeConstants.APRVL_CD_230}">
<c:when test="${list.eduAprvlCd eq VeConstants.APRVL_CD_230}">
<span class="app_status1">대기</span>
</c:when>
<c:when test="${list.aprvlCd eq VeConstants.STATUS_CD_SBMT}">
<c:when test="${list.eduAprvlCd eq VeConstants.STATUS_CD_SBMT}">
<span class="app_status1">교육신청</span>
</c:when>
<c:when test="${list.aprvlCd eq VeConstants.STATUS_CD_CFRM}">
<c:when test="${list.eduAprvlCd eq VeConstants.STATUS_CD_CFRM}">
<span class="app_status2">교육승인</span>
</c:when>
<c:when test="${list.aprvlCd eq VeConstants.STATUS_CD_RJT}">
<c:when test="${list.eduAprvlCd eq VeConstants.STATUS_CD_RJT}">
<span class="app_status4">교육반려</span>
</c:when>
<c:when test="${list.aprvlCd eq VeConstants.STATUS_CD_CAN}">
<c:when test="${list.eduAprvlCd eq VeConstants.STATUS_CD_CAN}">
<span class="app_status4">교육취소</span>
</c:when>
<c:when test="${list.aprvlCd eq VeConstants.STATUS_CD_CHI_CMPT}">
<c:when test="${list.eduAprvlCd eq VeConstants.STATUS_CD_CHI_CMPT}">
<span class="app_status4">선정완료</span>
</c:when>
<c:when test="${list.aprvlCd eq VeConstants.STATUS_CD_EDT_REQ}">
<c:when test="${list.eduAprvlCd eq VeConstants.STATUS_CD_EDT_REQ}">
<span class="app_status3">수정요청</span>
</c:when>
<c:when test="${list.aprvlCd eq VeConstants.STATUS_CD_EDT_CMPT}">
<c:when test="${list.eduAprvlCd eq VeConstants.STATUS_CD_EDT_CMPT}">
<span class="app_status3">수정완료</span>
</c:when>
<c:when test="${list.aprvlCd eq VeConstants.STATUS_CD_EDU_SELCT}">
<c:when test="${list.eduAprvlCd eq VeConstants.STATUS_CD_EDU_SELCT}">
<span class="app_status1">교육확정</span>
</c:when>
<c:when test="${list.aprvlCd eq VeConstants.STATUS_CD_WAIT}">
<c:when test="${list.eduAprvlCd eq VeConstants.STATUS_CD_WAIT}">
<span class="app_status1">대기</span>
</c:when>
<c:otherwise>
@ -276,7 +278,7 @@
<th>교육일</th>
<th>신청유형</th>
<th>신청상태</th>
<th>설문</th>
<th>결과보고</th>
</tr>
</thead>
<c:forEach var="list" items="${adultList}" varStatus="status" begin="0" end="2">
@ -286,34 +288,34 @@
<td><kc:code codeId="VE0007" code="${list.eduSlctCd}"/></td>
<td>
<c:choose>
<c:when test="${list.aprvlCd eq VeConstants.APRVL_CD_230}">
<c:when test="${list.eduAprvlCd eq VeConstants.APRVL_CD_230}">
<span class="app_status1">대기</span>
</c:when>
<c:when test="${list.aprvlCd eq VeConstants.STATUS_CD_SBMT}">
<c:when test="${list.eduAprvlCd eq VeConstants.STATUS_CD_SBMT}">
<span class="app_status1">교육신청</span>
</c:when>
<c:when test="${list.aprvlCd eq VeConstants.STATUS_CD_CFRM}">
<c:when test="${list.eduAprvlCd eq VeConstants.STATUS_CD_CFRM}">
<span class="app_status2">교육승인</span>
</c:when>
<c:when test="${list.aprvlCd eq VeConstants.STATUS_CD_RJT}">
<c:when test="${list.eduAprvlCd eq VeConstants.STATUS_CD_RJT}">
<span class="app_status4">교육반려</span>
</c:when>
<c:when test="${list.aprvlCd eq VeConstants.STATUS_CD_CAN}">
<c:when test="${list.eduAprvlCd eq VeConstants.STATUS_CD_CAN}">
<span class="app_status4">교육취소</span>
</c:when>
<c:when test="${list.aprvlCd eq VeConstants.STATUS_CD_CHI_CMPT}">
<c:when test="${list.eduAprvlCd eq VeConstants.STATUS_CD_CHI_CMPT}">
<span class="app_status4">선정완료</span>
</c:when>
<c:when test="${list.aprvlCd eq VeConstants.STATUS_CD_EDT_REQ}">
<c:when test="${list.eduAprvlCd eq VeConstants.STATUS_CD_EDT_REQ}">
<span class="app_status3">수정요청</span>
</c:when>
<c:when test="${list.aprvlCd eq VeConstants.STATUS_CD_EDT_CMPT}">
<c:when test="${list.eduAprvlCd eq VeConstants.STATUS_CD_EDT_CMPT}">
<span class="app_status3">수정완료</span>
</c:when>
<c:when test="${list.aprvlCd eq VeConstants.STATUS_CD_EDU_SELCT}">
<c:when test="${list.eduAprvlCd eq VeConstants.STATUS_CD_EDU_SELCT}">
<span class="app_status1">교육확정</span>
</c:when>
<c:when test="${list.aprvlCd eq VeConstants.STATUS_CD_WAIT}">
<c:when test="${list.eduAprvlCd eq VeConstants.STATUS_CD_WAIT}">
<span class="app_status1">대기</span>
</c:when>
<c:otherwise>
@ -323,7 +325,7 @@
</td>
<td>
<c:choose>
<c:when test="${not empty list.qustnrRespondId}">
<c:when test="${not empty list.rsltAtchFileId}">
제출
</c:when>
<c:otherwise>

2
src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndList.jsp
View File

@ -214,7 +214,7 @@
<span>결과보고</span>
<span>
<c:choose>
<c:when test="${not empty list.qustnrRespondId}">
<c:when test="${not empty list.rsltAtchFileId}">
제출
</c:when>
<c:otherwise>