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

이지우 - 관리자 > 청소년교육 > 교육신청관리 > 신청서 일괄출력 누락 정보 추가 및 빈페이지 제거

Browse Source
This commit is contained in:
jiwoo 2023-06-30 15:41:10 +09:00
parent bf04903d9e
commit 96e09425ae
2 changed files with 42 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAplctMng/web/EduAplctMngTngrController.java
View File

@ -402,6 +402,7 @@ public class EduAplctMngTngrController {
List<VEEduChasiVO> vEEduChasiVOList = vVEEduChasiService.selectList(vEEduChasiVO);
model.addAttribute("chasiList", vEEduChasiVOList);
model.addAttribute("cryptoUtil",egovCryptoUtil);
return "oprtn/tngrVisitEdu/popup/eduAplctMngDetailPopup";
}

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

@ -37,22 +37,15 @@
/* Page Url Hide */
@page {
size: auto; /* auto is the initial value */
margin: 0; /* this affects the margin in the printer settings */
margin: 0; /* this affects the margin in the printer settings */
}
@media print {
.cont_tit {
page-break-before: always;
}
.page_break {
page-break-before: always;
height: 40px;
}
.print_mark {
page-break-before: auto;
}
html, body {height:auto;margin: 0 !important;padding: 0 !important;overflow: hidden;page-break-after: avoid;}
.cont_tit {page-break-before: always;}
.page_break {page-break-inside:avoid; page-break-after:auto}
.print_mark {page-break-before: auto;}
form{display: none;}
}
</style>
@ -155,7 +148,15 @@
<th scope="row">
<p>교육장소</p>
</th>
<td colspan="3"><c:out value="${info.eduPlace}" /></td>
<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">
@ -183,7 +184,7 @@
</th>
<td colspan="3">
<c:choose>
<c:when test="${info.useYn eq 'N'}">
<c:when test="${info.useYn eq 'N' or info.aprvlCd eq '40'}">
<span class="app_status3">신청취소</span>
</c:when>
<c:when test="${info.sbmtYn eq 'N' or empty info.sbmtYn}">
@ -192,12 +193,24 @@
<c:when test="${info.aprvlCd eq '10'}">
<span class="app_status1">교육신청</span>
</c:when>
<c:when test="${info.aprvlCd eq '230'}">
<span class="app_status1">대기</span>
</c:when>
<c:when test="${info.aprvlCd eq '20'}">
<span class="app_status1">교육확정</span>
<span class="app_status1">교육승인</span>
</c:when>
<c:when test="${info.aprvlCd eq '30'}">
<span class="app_status1">교육반려</span>
</c:when>
<c:when test="${info.aprvlCd eq '60'}">
<span class="app_status1">교육확정</span>
</c:when>
<c:when test="${info.aprvlCd eq '70'}">
<span class="app_status1">수정요청<c:if test="${info.isWait eq 'Y'}">(대기)</c:if></span>
</c:when>
<c:when test="${info.aprvlCd eq '80'}">
<span class="app_status1">수정완료<c:if test="${info.isWait eq 'Y'}">(대기)</c:if></span>
</c:when>
<c:otherwise>
-
</c:otherwise>
@ -214,9 +227,9 @@
</c:if>
</tbody>
</table>
<p class="page_break"></p>
<br/>
<div class="page_break"></div>
<div class="pop_tb_tit01">
<p>교육차시 정보</p>
</div>
@ -235,6 +248,7 @@
<th scope="col">시간</th>
<th scope="col">구분</th>
<th scope="col">대상</th>
<th scope="col">배정강사</th>
<th scope="col">인원</th>
</tr>
</thead>
@ -264,6 +278,15 @@
<ve:code codeId="VE0010" code="${list.divCd}"/>
</td>
<td><c:out value="${list.trgt}" /></td>
<td>
<c:out value="${cryptoUtil.decrypt(list.instrNm)}"/>
<c:if test="${list.instrNm eq null}">
-
</c:if>
<c:if test="${list.instrNm ne null}">
<br/>(${fn:split(list.userId,'_')[1]*1})
</c:if>
</td>
<td><c:out value="${list.prsnl}" /></td>
</tr>
</c:forEach>