diff --git a/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java
index 60f71b76..f45253a3 100644
--- a/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java
+++ b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java
@@ -504,6 +504,11 @@ public class FndtnEnhanceTrnController {
vEEduAplctVO.setUserId(loginVO.getUniqId());
vEEduAplctVO.setPrcsOrd(vEPrcsDetailVO.getPrcsAplctPrdOrd());
+ vEEduAplctVO.setChrgNm(vEPrcsDetailVO.getChrgNm());
+ vEEduAplctVO.setInsttNm(vEPrcsDetailVO.getInsttNm());
+ vEEduAplctVO.setdBirth(vEPrcsDetailVO.getdBirth());
+
+
fndtnEnhanceTrnService.insertVeEduAplct(vEEduAplctVO);
diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java
index 87d360f5..91daf2dd 100644
--- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java
+++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java
@@ -156,6 +156,8 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable {
private String instrNm; //강사명
+ private String chrgNm;
+ private String insttNm;
@@ -757,6 +759,19 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable {
public void setInstrNm(String instrNm) {
this.instrNm = instrNm;
}
+ public String getChrgNm() {
+ return chrgNm;
+ }
+ public void setChrgNm(String chrgNm) {
+ this.chrgNm = chrgNm;
+ }
+ public String getInsttNm() {
+ return insttNm;
+ }
+ public void setInsttNm(String insttNm) {
+ this.insttNm = insttNm;
+ }
+
}
diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml
index 61e276f2..58f5f09e 100644
--- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml
@@ -270,7 +270,10 @@
FRST_REGIST_PNTTM,
FRST_REGISTER_ID,
- USE_YN
+ USE_YN,
+ CHRG_NM,
+ INSTT_NM,
+ D_BIRTH
)VALUES(
#eduAplctOrd#,
#lctrDivCd#,
@@ -285,7 +288,10 @@
SYSDATE,
#frstRegisterId#,
- 'Y'
+ 'Y',
+ #chrgNm#,
+ #insttNm#,
+ #dBirth#
)
diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml
index 8e0b36fd..8be63a39 100644
--- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml
@@ -4188,10 +4188,10 @@
AND a.aprvl_cd = '60'
AND NVL(A.USE_YN, 'Y') ]]> 'N'
- AND b.EDU_HOPE_DT = ]]> REPLACE(#searchStartDt#, '.' , '')
+ AND REPLACE(b.EDU_HOPE_DT, '.' , '') = ]]> REPLACE(#searchStartDt#, '.' , '')
- AND b.EDU_HOPE_DT REPLACE(#searchEndDt#, '.' , '')
+ AND REPLACE(b.EDU_HOPE_DT, '.' , '') REPLACE(#searchEndDt#, '.' , '')
AND TO_CHAR(A.APRVL_PNTTM, 'YYYYMMDD') = ]]> REPLACE(#searchStratAprvlPnttm#, '.' , '')
@@ -4217,14 +4217,14 @@
)
)
-
+
AND (
A.SCHOL_INSTT_NM LIKE '%'||#searchKeyword#||'%' OR
A.INSTT_NM LIKE '%'||#searchKeyword#||'%'
)
-
+
@@ -4267,7 +4267,14 @@
) > 0
*/
-
+
+
+ AND c.sbmt_yn = 'Y'
+
+
+ AND (c.sbmt_yn != 'Y' or c.sbmt_yn is null)
+
+
ORDER BY
1
, b.edu_chasi_ord
diff --git a/src/main/resources/egovframework/sqlmap/ve/rprt/VEEduRsltRprt_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/rprt/VEEduRsltRprt_SQL_Tibero.xml
index a225182e..fbc0d043 100644
--- a/src/main/resources/egovframework/sqlmap/ve/rprt/VEEduRsltRprt_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/rprt/VEEduRsltRprt_SQL_Tibero.xml
@@ -70,12 +70,12 @@
- MERGE INTO T1 USING DB_ROOT
+ MERGE INTO T1 USING DUAL
ON (T1.EDU_APLCT_ORD = #eduAplctOrd# AND T1.EDU_CHASI_ORD = #eduChasiOrd#)
WHEN MATCHED THEN
UPDATE SET
- edu_aplct_ord = #eduAplctOrd#,
- edu_chasi_ord = #eduChasiOrd#,
+
sbmt_yn = #sbmtYn#,
sbmt_pnttm = #sbmtPnttm#,
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp
index 2b554295..ccbe2631 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp
@@ -11,6 +11,9 @@
교육신청 목록 > 성인 찾아가는 저작권 교육 > 한국저작권위원회 저작권 교육 시스템
+