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

2024-02-22 14:07 실무역량강화 찜하기 카운터에서 제외하도록 쿼리 수정함

Browse Source
This commit is contained in:
myname 2024-02-22 14:08:15 +09:00
parent c3f78d10cb
commit c75c72fa46
15 changed files with 159 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEInstrAsgnmVO.java
View File

@ -149,6 +149,7 @@ public class VEInstrAsgnmVO extends ComDefaultVO implements Serializable {
private String yr; //강사 메모
private String eduPlace; //교육장소
private String eduPlaceCd; //교육장소코드
private String prcsAplctPrdOrd; //과정신청기간순번
@ -852,5 +853,11 @@ public class VEInstrAsgnmVO extends ComDefaultVO implements Serializable {
public void setFeeInsttCd(String feeInsttCd) {
this.feeInsttCd = feeInsttCd;
}
public String getEduPlaceCd() {
return eduPlaceCd;
}
public void setEduPlaceCd(String eduPlaceCd) {
this.eduPlaceCd = eduPlaceCd;
}
}

2
src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/web/VEAsgnmController.java
View File

@ -711,7 +711,7 @@ public class VEAsgnmController {
vEInstrAsgnmVOInfo = egovCryptoUtil.decryptVEInstrAsgnmVO(vEInstrAsgnmVOInfo);
//대상 리스트, 페이징 정보 전달
model.addAttribute("info", vEInstrAsgnmVOInfo);
//사용자 교육신청 과정 리스트
VEPrcsDetailVO vEPrcsDetailVO = new VEPrcsDetailVO();
vEPrcsDetailVO.setUseYn("Y");

3
src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml
View File

@ -775,6 +775,7 @@
, b.instt_nm AS insttNm
, b.hope_sbjct AS hopeSbjct
, b.EDU_PLACE AS eduPlace
, b.edu_place_cd AS eduPlaceCd
, a.memo_cn AS memoCn
, ((SUBSTR(a.end_tm, 1,2) - SUBSTR(a.strt_tm, 1,2)) * 60) + (SUBSTR(a.end_tm, 3,4) - SUBSTR(a.strt_tm, 3,4)) AS eduTM
@ -815,6 +816,7 @@
, a.lrn_tm AS lrnTm
, b.edu_cn AS eduCn
, b.edu_place AS eduPlace
, b.edu_place_cd AS eduPlaceCd
, a.trgt AS trgt
, a.prsnl AS prsnl
/*
@ -927,6 +929,7 @@
, b.phone AS phone
, b.email AS email
, b.edu_place AS eduPlace
, b.edu_place_cd AS eduPlaceCd
, b.end_oprtn_dt AS endOprtnDt
, b.instt_div_cd AS insttDivCd
, b.schol_div_cd AS scholDivCd

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

@ -261,6 +261,7 @@
AND a.use_yn = 'Y'
AND a.aprvl_cd != '40' /* 취소된 내역 안 보여줌 */
AND a.aprvl_cd != 100 /*찜 신청자 제거*/
<!-- AND le.MBER_NM IS NOT NULL -->
</select>

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

@ -379,6 +379,8 @@
WHERE x.prcs_ord = a.prcs_aplct_prd_ord
AND x.sbmt_yn='Y'
AND x.aprvl_cd != 40 /*취소된 신청자 제거*/
AND x.aprvl_cd != 100 /*찜 신청자 제거*/
<!-- AND le.MBER_NM IS NOT NULL -->
) AS nosCnt1
/*

2
src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngDetail.jsp
View File

@ -629,7 +629,7 @@
</c:when>
<c:otherwise>
<tr>
<td colspan="5">신청자가 없습니다.</td>
<td colspan="11">신청자가 없습니다.</td>
</tr>
</c:otherwise>
</c:choose>

24
src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngDetail.jsp
View File

@ -508,18 +508,18 @@
</c:if>
</td>
</tr>
<tr>
<th scope="row">
<p>교육내용</p>
</th>
<td colspan="3">
<c:forEach var="list" items="${list}" varStatus="status">
<c:if test="${fn:contains(info.eduCn, list.prcsOrd)}">
- ${list.prcsNm} <br/>
</c:if>
</c:forEach>
</td>
</tr>
<!-- <tr> -->
<!-- <th scope="row"> -->
<!-- <p>교육내용</p> -->
<!-- </th> -->
<!-- <td colspan="3"> -->
<%-- <c:forEach var="list" items="${list}" varStatus="status"> --%>
<%-- <c:if test="${fn:contains(info.eduCn, list.prcsOrd)}"> --%>
<%-- - ${list.prcsNm} <br/> --%>
<%-- </c:if> --%>
<%-- </c:forEach> --%>
<!-- </td> -->
<!-- </tr> -->
<tr>
<th scope="row">
<p>기자재 유무</p>

24
src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAsgnmCnfrmMngDetail.jsp
View File

@ -502,18 +502,18 @@
<col style="width: 220px;">
<col style="width: auto;">
</colgroup>
<tr>
<th scope="row">
<p>교육내용</p>
</th>
<td colspan="3">
<c:forEach var="list" items="${list}" varStatus="status">
<c:if test="${fn:contains(info.eduCn, list.prcsOrd)}">
- ${list.prcsNm} <br/>
</c:if>
</c:forEach>
</td>
</tr>
<!-- <tr> -->
<!-- <th scope="row"> -->
<!-- <p>교육내용</p> -->
<!-- </th> -->
<!-- <td colspan="3"> -->
<%-- <c:forEach var="list" items="${list}" varStatus="status"> --%>
<%-- <c:if test="${fn:contains(info.eduCn, list.prcsOrd)}"> --%>
<%-- - ${list.prcsNm} <br/> --%>
<%-- </c:if> --%>
<%-- </c:forEach> --%>
<!-- </td> -->
<!-- </tr> -->
<tr>
<th scope="row">
<p>기자재 유무</p>

24
src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngDetail.jsp
View File

@ -559,18 +559,18 @@ function replyCalculation(){
<col style="width: auto;">
</colgroup>
<tbody>
<tr>
<th scope="row">
<p>교육내용</p>
</th>
<td>
<c:forEach var="plist" items="${list}" varStatus="status">
<c:if test="${fn:contains(info.eduCn, plist.prcsOrd)}">
- ${plist.prcsNm} <br/>
</c:if>
</c:forEach>
</td>
</tr>
<!-- <tr> -->
<!-- <th scope="row"> -->
<!-- <p>교육내용</p> -->
<!-- </th> -->
<!-- <td> -->
<%-- <c:forEach var="plist" items="${list}" varStatus="status"> --%>
<%-- <c:if test="${fn:contains(info.eduCn, plist.prcsOrd)}"> --%>
<%-- - ${plist.prcsNm} <br/> --%>
<%-- </c:if> --%>
<%-- </c:forEach> --%>
<!-- </td> -->
<!-- </tr> -->
<tr>
<th scope="row">
<p>기자재 유무</p>

41
src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/eduAplctMngDetailPopup.jsp
View File

@ -148,28 +148,27 @@
<th scope="row">
<p>교육장소</p>
</th>
<td colspan="3">
<c:out value="${info.eduPlace}" />
<p style="padding-left:10%; display:inline-block;">
<input type="checkbox" <c:if test="${info.corpsEdu eq 'Y'}">checked</c:if> disabled="disabled"> 집체교육
</p>
<p style="padding-left:20px; display:inline-block;">
<input type="checkbox" <c:if test="${info.broadroomEdu eq 'Y'}">checked</c:if> disabled="disabled"> 방송실교육
</p>
</td>
</tr>
<tr>
<th scope="row">
<p>교육내용</p>
</th>
<td colspan="3">
<c:forEach var="list" items="${list}" varStatus="status">
<c:if test="${fn:contains(info.eduCn, list.prcsOrd)}">
- ${list.prcsNm} <br/>
</c:if>
</c:forEach>
</td>
<td colspan="3">
<c:if test="${info.eduPlaceCd eq '99'}">
${info.eduPlace}
</c:if>
<c:if test="${info.eduPlaceCd ne '99'}">
<ve:code codeId="VEA010" code="${info.eduPlaceCd}"/>
</c:if>
</td>
</tr>
<!-- <tr> -->
<!-- <th scope="row"> -->
<!-- <p>교육내용</p> -->
<!-- </th> -->
<!-- <td colspan="3"> -->
<%-- <c:forEach var="list" items="${list}" varStatus="status"> --%>
<%-- <c:if test="${fn:contains(info.eduCn, list.prcsOrd)}"> --%>
<%-- - ${list.prcsNm} <br/> --%>
<%-- </c:if> --%>
<%-- </c:forEach> --%>
<!-- </td> -->
<!-- </tr> -->
<tr>
<th scope="row">
<p>기자재 유무</p>

16
src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp
View File

@ -159,14 +159,16 @@ function _fncEduHopeDtStep1(
return ;
}else if(returnData.result == "fail"){
//alert("신청한 차시 중 신청기간, 강의가능시간이 아닌 교육이 있습니다.");
alert(returnData.msg+"는 강의가능시간이 아닙니다.");
//alert(returnData.msg+"는 강의가능시간이 아닙니다.");
alert("강의가능시간은 (관리자가 지정해둔 시간) 입니다.");
flag = false;
return;
}
if(!duplChk) {
if(returnData.result == "fail2"){
if(confirm("중복된 신청 건이 있습니다. 진행하시겠습니까?")){
//if(confirm("중복된 신청 건이 있습니다. 진행하시겠습니까?")){
if(confirm("수정 내용을 제출하시겠습니까?")){
//중복신청건이 있어도 등록(최초 질의 후 재질의 방지)
duplChk = true;
} else {
@ -526,11 +528,15 @@ function _chkChasiTime(p_this){
alert("등록 되었습니다.");
if(type != 'I'){
if(type = 'S'){
/*
if(confirm("교육콘텐츠를 추가로 신청하시겠습니까?\n(해당 콘텐츠는 차시당 10분 내외의 동영상 mp4 파일이며, 찾아가는 저작권 교육과 별도로 학교에서 자체적으로 사용 가능합니다.)")){
location.href="<c:url value='/web/ve/aplct/otsdCprtnPrcs/lctrAplct/lctrAplctReg.do'/>"
http://localhost:3080/offedu/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctList.do
}else{
fncGoDetail(); //상세화면 이동
}
*/
fncGoDetail(); //상세화면 이동
}else{
fncGoDetail(); //상세화면 이동
}
@ -922,7 +928,8 @@ function _chkChasiTime(p_this){
return ;
}else if(returnData.result == "fail"){
//alert("신청한 차시 중 신청기간, 강의가능시간이 아닌 교육이 있습니다.");
alert(returnData.msg+"는 강의가능시간이 아닙니다.");
//alert(returnData.msg+"는 강의가능시간이 아닙니다.");
alert("강의가능시간은 (관리자가 지정해둔 시간) 입니다.");
flag = false;
return ;
}else if(returnData.result == "fail6"){
@ -939,7 +946,8 @@ function _chkChasiTime(p_this){
*/
}else if(!duplChk) {
if(returnData.result == "fail2"){
if(confirm("중복된 신청 건이 있습니다. 진행하시겠습니까?")){
//if(confirm("중복된 신청 건이 있습니다. 진행하시겠습니까?")){
if(confirm("수정 내용을 제출하시겠습니까?")){
//중복신청건이 있어도 등록(최초 질의 후 재질의 방지)
duplChk = true;
} else {

31
src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmDetail.jsp
View File

@ -440,24 +440,29 @@
</th>
<td colspan="3">${info.addr}</td>
</tr>
<tr>
<th scope="row">
<p>교육내용</p>
</th>
<td colspan="3">
<c:forEach var="eduList" items="${eduList}" varStatus="status">
<c:if test="${fn:contains(info.eduCn, eduList.prcsOrd)}">
- ${eduList.prcsNm} <br/>
</c:if>
</c:forEach>
</td>
</tr>
<!-- <tr> -->
<!-- <th scope="row"> -->
<!-- <p>교육내용</p> -->
<!-- </th> -->
<!-- <td colspan="3"> -->
<%-- <c:forEach var="eduList" items="${eduList}" varStatus="status"> --%>
<%-- <c:if test="${fn:contains(info.eduCn, eduList.prcsOrd)}"> --%>
<%-- - ${eduList.prcsNm} <br/> --%>
<%-- </c:if> --%>
<%-- </c:forEach> --%>
<!-- </td> -->
<!-- </tr> -->
<tr>
<th scope="row">
<p>교육장소</p>
</th>
<td colspan="3">
${info.eduPlace}
<c:if test="${info.eduPlaceCd eq '99'}">
${info.eduPlace}
</c:if>
<c:if test="${info.eduPlaceCd ne '99'}">
<ve:code codeId="VEA010" code="${info.eduPlaceCd}"/>
</c:if>
</td>
</tr>
<tr class="trLength4">

33
src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmRqstDetail.jsp
View File

@ -171,24 +171,29 @@
</th>
<td colspan="3">${info.addr}</td>
</tr>
<tr>
<th scope="row">
<p>교육내용</p>
</th>
<td colspan="3">
<c:forEach var="eduList" items="${eduList}" varStatus="status">
<c:if test="${fn:contains(info.eduCn, eduList.prcsOrd)}">
- ${eduList.prcsNm} <br/>
</c:if>
</c:forEach>
</td>
</tr>
<!-- <tr> -->
<!-- <th scope="row"> -->
<!-- <p>교육내용</p> -->
<!-- </th> -->
<!-- <td colspan="3"> -->
<%-- <c:forEach var="eduList" items="${eduList}" varStatus="status"> --%>
<%-- <c:if test="${fn:contains(info.eduCn, eduList.prcsOrd)}"> --%>
<%-- - ${eduList.prcsNm} <br/> --%>
<%-- </c:if> --%>
<%-- </c:forEach> --%>
<!-- </td> -->
<!-- </tr> -->
<tr>
<th scope="row">
<p>교육장소</p>
</th>
<td colspan="3">
${info.eduPlace}
<td colspan="3">
<c:if test="${info.eduPlaceCd eq '99'}">
${info.eduPlace}
</c:if>
<c:if test="${info.eduPlaceCd ne '99'}">
<ve:code codeId="VEA010" code="${info.eduPlaceCd}"/>
</c:if>
</td>
</tr>
<tr class="trLength4">

48
src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp
View File

@ -204,7 +204,7 @@
<col style="width: 15%;">
<col style="width: 12%;">
<col style="width: 12%;">
<col style="width: 12%;">
<%-- <col style="width: 12%;"> --%>
</colgroup>
<thead>
<tr>
@ -216,7 +216,7 @@
<th scope="col">기관(학교)명</th>
<th scope="col">교육대상</th>
<th scope="col">신청상태</th>
<th scope="col">교환상태</th>
<!-- <th scope="col">교환상태</th> -->
</tr>
</thead>
<tbody>
@ -304,32 +304,26 @@
</c:when>
</c:choose>
</td>
<td>
<!-- <td> -->
<c:set var="exchnCd" value="" />
<!--
신청상태가 대기면
${list.asgnmAprvlCd eq '20'}
-->
<c:choose>
<c:when test="${list.asgnmAprvlCd eq '20'}">
<c:if test="${empty list.exchnOrd }">
<c:set var="exchnCd" value="신청" />
<button type="button" class="btnType04" onclick="fn_eduRegPopup('<c:out value="${list.eduAplctOrd}"/>', '<c:out value="${list.eduChasiOrd}"/>');" ><c:out value='${exchnCd}'/></button>
</c:if>
<c:if test="${not empty list.exchnOrd
and list.exchnCd eq '10'}">
<c:set var="exchnCd" value="진행중" />
<button type="button" class="btnType04" id="ingId" data-info="<c:out value="${list.instrNm}"/>" data-ord="<c:out value="${list.exchnOrd}"/>" data-tooltip="target_confirm_popup" ><c:out value='${exchnCd}'/></button>
</c:if>
</c:when>
<c:otherwise>
-
</c:otherwise>
</c:choose>
<%-- <button class="btnType06 btn_list" data-tooltip="target_confirm_popup" ><c:out value='${exchnCd}'/></button> --%>
</td>
<%-- <c:set var="exchnCd" value="" /> --%>
<%-- <c:choose> --%>
<%-- <c:when test="${list.asgnmAprvlCd eq '20'}"> --%>
<%-- <c:if test="${empty list.exchnOrd }"> --%>
<%-- <c:set var="exchnCd" value="신청" /> --%>
<%-- <button type="button" class="btnType04" onclick="fn_eduRegPopup('<c:out value="${list.eduAplctOrd}"/>', '<c:out value="${list.eduChasiOrd}"/>');" ><c:out value='${exchnCd}'/></button> --%>
<%-- </c:if> --%>
<%-- <c:if test="${not empty list.exchnOrd --%>
<%-- and list.exchnCd eq '10'}"> --%>
<%-- <c:set var="exchnCd" value="진행중" /> --%>
<%-- <button type="button" class="btnType04" id="ingId" data-info="<c:out value="${list.instrNm}"/>" data-ord="<c:out value="${list.exchnOrd}"/>" data-tooltip="target_confirm_popup" ><c:out value='${exchnCd}'/></button> --%>
<%-- </c:if> --%>
<%-- </c:when> --%>
<%-- <c:otherwise> --%>
<!-- - -->
<%-- </c:otherwise> --%>
<%-- </c:choose> --%>
<!-- </td> -->
</tr>
</c:forEach>
<c:if test="${empty vEInstrAsgnmVOList}">

31
src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/endInfo/instrEduEndDetail.jsp
View File

@ -192,24 +192,29 @@ $( document ).ready(function() {
</th>
<td colspan="3"><c:out value="${info.addr}" /></td>
</tr>
<tr>
<th scope="row">
<p>교육내용</p>
</th>
<td colspan="3">
<c:forEach var="plist" items="${prcsList}" varStatus="status">
<c:if test="${fn:contains(info.eduCn, plist.prcsOrd)}">
- ${plist.prcsNm} <br/>
</c:if>
</c:forEach>
</td>
</tr>
<!-- <tr> -->
<!-- <th scope="row"> -->
<!-- <p>교육내용</p> -->
<!-- </th> -->
<!-- <td colspan="3"> -->
<%-- <c:forEach var="plist" items="${prcsList}" varStatus="status"> --%>
<%-- <c:if test="${fn:contains(info.eduCn, plist.prcsOrd)}"> --%>
<%-- - ${plist.prcsNm} <br/> --%>
<%-- </c:if> --%>
<%-- </c:forEach> --%>
<!-- </td> -->
<!-- </tr> -->
<tr>
<th scope="row">
<p>교육장소</p>
</th>
<td colspan="3">
${info.eduPlace}
<c:if test="${info.eduPlaceCd eq '99'}">
${info.eduPlace}
</c:if>
<c:if test="${info.eduPlaceCd ne '99'}">
<ve:code codeId="VEA010" code="${info.eduPlaceCd}"/>
</c:if>
</td>
</tr>
<tr class="trLength4">