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

Merge branch 'advc' of http://hylee@vcs.iten.co.kr:9999/hylee/offedu into advc

Browse Source
This commit is contained in:
hylee 2024-03-15 18:31:03 +09:00
commit 30f8f87732
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -362,6 +362,7 @@
AND a.edu_chasi_ord = d.edu_chasi_ord AND a.edu_chasi_ord = d.edu_chasi_ord
) )
WHERE 1 = 1 WHERE 1 = 1
AND NVL(c.use_yn,'Y')='Y'
AND c.lctr_div_cd = #instrDiv# AND c.lctr_div_cd = #instrDiv#
<isEmpty property="searchAsgnmAprvlCd"> <isEmpty property="searchAsgnmAprvlCd">
AND AND
@ -446,6 +447,7 @@
AND a.edu_chasi_ord = e.edu_chasi_ord AND a.edu_chasi_ord = e.edu_chasi_ord
) )
WHERE 1 = 1 WHERE 1 = 1
AND NVL(c.use_yn,'Y')='Y'
AND c.lctr_div_cd = #instrDiv# AND c.lctr_div_cd = #instrDiv#
<isEmpty property="searchAsgnmAprvlCd"> <isEmpty property="searchAsgnmAprvlCd">
@ -725,6 +727,8 @@
a.edu_aplct_ord = e.edu_aplct_ord a.edu_aplct_ord = e.edu_aplct_ord
AND a.edu_chasi_ord = e.edu_chasi_ord AND a.edu_chasi_ord = e.edu_chasi_ord
) )
WHERE 1=1
AND nvl(c.use_yn,'Y')='Y'
) AA ) AA
WHERE 1=1 WHERE 1=1
AND AA.asgnmAprvlCd = #asgnmAprvlCd# AND AA.asgnmAprvlCd = #asgnmAprvlCd#

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

@ -280,16 +280,16 @@
<!-- 배정 수락 요청 상태 --> <!-- 배정 수락 요청 상태 -->
<c:set var="statCd" value="대기" /> <c:set var="statCd" value="대기" />
</c:when> </c:when>
<c:when test="${(list.asgnmAprvlCd eq '40' and list.userId eq loginVO.id) or <c:when test="${(list.asgnmAprvlCd eq '40') or
(list.hstryUserId eq loginVO.id and (list.hstryCd eq '10' or list.hstryCd eq '40'))}"> (list.hstryUserId eq loginVO.id and (list.hstryCd eq '10' or list.hstryCd eq '40'))}">
<!-- 배정 거절 or 내역 거절 or 내열에 변경요청 --> <!-- 배정 거절 or 내역 거절 or 내열에 변경요청 -->
<c:set var="statCd" value="거절" /> <c:set var="statCd" value="거절" />
</c:when> </c:when>
<c:when test="${list.asgnmAprvlCd eq '30' and list.userId eq loginVO.id}"> <c:when test="${list.asgnmAprvlCd eq '30'}">
<c:set var="statCd" value="수락" /> <c:set var="statCd" value="수락" />
</c:when> </c:when>
<c:when test="${list.asgnmAprvlCd eq '50' and list.userId eq loginVO.id}"> <c:when test="${list.asgnmAprvlCd eq '50'}">
<c:set var="statCd" value="강의신청" /> <c:set var="statCd" value="강의신청" />
</c:when> </c:when>
</c:choose> </c:choose>