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

2024-03-19 12:07 강사 강의요청리스트 수정

Browse Source
This commit is contained in:
myname 2024-03-19 12:07:44 +09:00
parent e31dfc5626
commit 7a2dad9e27
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1114,17 +1114,33 @@
<!-- 배정내역 테이블 등록 --> <!-- 배정내역 테이블 등록 -->
<insert id="VEAsgnmMIXDAO.insertAsgnmHstry" parameterClass="VEInstrAsgnmVO"> <insert id="VEAsgnmMIXDAO.insertAsgnmHstry" parameterClass="VEInstrAsgnmVO">
/* VEAsgnmMIXDAO.insertAsgnmHstry */ /* VEAsgnmMIXDAO.insertAsgnmHstry */
INSERT INTO ve_edu_chasi_instr_asgnm_hstry(
MERGE INTO ve_edu_chasi_instr_asgnm_hstry T1
USING DUAL
ON (
T1.edu_aplct_ord = #eduAplctOrd#
AND T1.edu_chasi_ord = #eduChasiOrd#
AND T1.user_id = #userId#
AND T1.hstry_cd = #hstryCd#
)
WHEN MATCHED THEN
UPDATE SET
frst_regist_pnttm = SYSDATE
WHEN NOT MATCHED THEN
INSERT (
edu_aplct_ord, edu_aplct_ord,
edu_chasi_ord, edu_chasi_ord,
user_id, user_id,
hstry_cd hstry_cd,
frst_regist_pnttm
) VALUES ( ) VALUES (
#eduAplctOrd#, #eduAplctOrd#,
#eduChasiOrd#, #eduChasiOrd#,
#userId#, #userId#,
#hstryCd# #hstryCd#,
SYSDATE
) )
</insert> </insert>
<!-- 배정내역 테이블 삭제 --> <!-- 배정내역 테이블 삭제 -->

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

@ -386,13 +386,15 @@
<!-- 배정 수락 요청 상태 --> <!-- 배정 수락 요청 상태 -->
<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.hstryUserId eq loginVO.id and (list.hstryCd eq '10' or list.hstryCd eq '40'))}"> (list.asgnmAprvlCd eq '40' and list.userId eq '') or
(list.hstryUserId ne list.userId 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' and list.hstryCd eq ''}">
<c:set var="statCd" value="수락" /> <c:set var="statCd" value="수락" />
</c:when> </c:when>
</c:choose> </c:choose>