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

2024-03-06 16:16 추가강의요청 상세 내용 수정

Browse Source
This commit is contained in:
myname 2024-03-06 16:27:42 +09:00
parent e422e6b3c5
commit 437f09c49e
5 changed files with 104 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java
View File

@ -478,7 +478,7 @@ public class FndtnEnhanceTrnController {
, HttpServletRequest request ) throws Exception {
try {
// 확인 체크
if(StringUtils.isNotEmpty(vEPrcsDetailVO.getCmmNotifyOrd()))
{
@ -530,6 +530,11 @@ public class FndtnEnhanceTrnController {
vEPrcsDetailVODetail.setPrcsAplctPrdEtcOrd(vEPrcsEtcDetail.getPrcsAplctPrdEtcOrd());
}
model.addAttribute("info", vEPrcsDetailVODetail);
}catch(Exception ex) {
ex.printStackTrace();
}
return "/web/ve/aplct/fndtnEnhanceTrn/eduAplctDetail";

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

@ -19,6 +19,7 @@ public class VEInstrAsgnmVO extends ComDefaultVO implements Serializable {
private String eduChasiOrd; //교육차시순번
private String userId; //사용자아이디
private String euserId; //사용자아이디(강의요청자 ID)
private String userNm; //사용자명(강사)
private String pnltyCd; //패널티코드
private String pnltyPnttm; //패널티일시
@ -866,5 +867,11 @@ public class VEInstrAsgnmVO extends ComDefaultVO implements Serializable {
public void setFoodExpenses(String foodExpenses) {
this.foodExpenses = foodExpenses;
}
public String getEuserId() {
return euserId;
}
public void setEuserId(String euserId) {
this.euserId = euserId;
}
}

20
src/main/resources/egovframework/sqlmap/let/cmm/fms/EgovFile_SQL_Tibero.xml
View File

@ -42,6 +42,10 @@
SELECT
a.ATCH_FILE_ID, b.FILE_CN, b.FILE_SN, b.FILE_STRE_COURS, b.STRE_FILE_NM,
b.FILE_EXTSN, b.ORIGNL_FILE_NM, b.FILE_SIZE, TO_CHAR(a.CREAT_DT, 'YYYY-MM-DD HH24:MI:SS' ) AS CREAT_DT
, '' AS scholInsttNm
, '' AS chrgNm
FROM
LETTNFILE a, LETTNFILEDETAIL b
WHERE 1=1
@ -60,6 +64,10 @@
SELECT
a.ATCH_FILE_ID, b.FILE_CN, b.FILE_SN, b.FILE_STRE_COURS, b.STRE_FILE_NM,
b.FILE_EXTSN, b.ORIGNL_FILE_NM, b.FILE_SIZE, TO_CHAR(a.CREAT_DT, 'YYYY-MM-DD HH24:MI:SS' ) AS CREAT_DT
, '' AS scholInsttNm
, '' AS chrgNm
FROM
LETTNFILE a, LETTNFILEDETAIL b
WHERE
@ -220,6 +228,10 @@
SELECT
a.ATCH_FILE_ID, b.FILE_CN, b.FILE_SN, b.FILE_STRE_COURS, b.STRE_FILE_NM,
b.FILE_EXTSN, b.ORIGNL_FILE_NM, b.FILE_SIZE, TO_CHAR(a.CREAT_DT, 'YYYY-MM-DD HH24:MI:SS' ) AS CREAT_DT
, '' AS scholInsttNm
, '' AS chrgNm
FROM
LETTNFILE a, LETTNFILEDETAIL b
WHERE
@ -268,6 +280,10 @@
SELECT
a.ATCH_FILE_ID, b.FILE_CN, b.FILE_SN, b.FILE_STRE_COURS, b.STRE_FILE_NM,
b.FILE_EXTSN, b.ORIGNL_FILE_NM, b.FILE_SIZE, a.CREAT_DT
, '' AS scholInsttNm
, '' AS chrgNm
FROM
LETTNFILE a, LETTNFILEDETAIL b
WHERE
@ -324,6 +340,10 @@
SELECT
a.ATCH_FILE_ID, b.FILE_CN, b.FILE_SN, b.FILE_STRE_COURS, b.STRE_FILE_NM,
b.FILE_EXTSN, b.ORIGNL_FILE_NM, b.FILE_SIZE, TO_CHAR(a.CREAT_DT, 'YYYY-MM-DD HH24:MI:SS' ) AS CREAT_DT
, '' AS scholInsttNm
, '' AS chrgNm
FROM
LETTNFILE a, LETTNFILEDETAIL b
WHERE

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

@ -875,6 +875,7 @@
, a.trgt AS trgt
, a.prsnl AS prsnl
, b.user_id AS userId
, e.user_id AS euserId
, b.schol_instt_nm AS scholInsttNm
, b.edu_slct_cd AS eduSlctCd
, b.edu_slct_area_cd AS eduSlctAreaCd
@ -906,10 +907,12 @@
LEFT OUTER JOIN ve_edu_chasi_instr_asgnm d
ON (a.edu_aplct_ord = d.edu_aplct_ord
AND a.edu_chasi_ord = d.edu_chasi_ord)
/*강의신청한 정보가 있는지?*/
LEFT OUTER JOIN ve_edu_chasi_instr_asgnm_hstry e
ON (a.edu_aplct_ord = e.edu_aplct_ord
AND a.edu_chasi_ord = e.edu_chasi_ord
AND e.user_id = #userId#
AND e.hstry_cd='50'
)
WHERE a.edu_aplct_ord = #eduAplctOrd#
AND a.edu_chasi_ord = #eduChasiOrd#

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

@ -130,7 +130,8 @@
<th scope="row">
<p>교육일시</p>
</th>
<td>${fn:substring(info.eduHopeDt,0,4)}년 ${fn:substring(info.eduHopeDt,4,6)}월 ${fn:substring(info.eduHopeDt,6,8)}일</td>
<%-- <td>${fn:substring(info.eduHopeDt,0,4)}년 ${fn:substring(info.eduHopeDt,4,6)}월 ${fn:substring(info.eduHopeDt,6,8)}일</td> --%>
<td>${info.eduHopeDt}</td>
<th scope="row">
<p>차시</p>
</th>
@ -144,7 +145,7 @@
<th scope="row">
<p>교육일시</p>
</th>
<td colspan="3">${fn:substring(info.eduHopeDt,0,4)}년 ${fn:substring(info.eduHopeDt,4,6)}월 ${fn:substring(info.eduHopeDt,6,8)}일</td>
<td colspan="3">${info.eduHopeDt}</td>
</tr>
<tr class="trLength2">
<th scope="row">
@ -186,14 +187,15 @@
</tr>
<tr>
<th scope="row">
<p>교육내용</p>
<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 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>
</c:forEach>
</td>
</tr>
<tr class="trLength4">
@ -252,12 +254,6 @@
</th>
<td colspan="3">${info.email}</td>
</tr>
<tr>
<th scope="row">
<p>신청마감일</p>
</th>
<td colspan="3">-</td>
</tr>
</tbody>
</table>
</div>
@ -270,8 +266,10 @@
</div>
<div class="btn_center">
<c:if test="${info.asgnmAprvlCd eq '50' and (empty info.hstryCd or info.hstryCd eq '10')}">
<c:if test="${info.euserId eq null}">
<button type="button" class="btnType04 m_btn_block" onclick="fncRqst(); return false;">강의신청</button>
</c:if>
</c:if>
</div>
<div class="btn_right">
<button type="button" class="btnType02 m_btn_block" onclick="fncGoList(); return false;">목록</button>