diff --git a/src/main/java/kcc/let/uss/notify/service/impl/NotifyManageServiceImpl.java b/src/main/java/kcc/let/uss/notify/service/impl/NotifyManageServiceImpl.java
index 272cffab..414e07f7 100644
--- a/src/main/java/kcc/let/uss/notify/service/impl/NotifyManageServiceImpl.java
+++ b/src/main/java/kcc/let/uss/notify/service/impl/NotifyManageServiceImpl.java
@@ -110,7 +110,7 @@ public class NotifyManageServiceImpl extends EgovAbstractServiceImpl implements
notifyManageVO.setNotifyPath(notifyPath);
notifyManageVO.setNotifyChk("N");
notifyManageVO.setEduAplctOrd(eduAplctOrd);
- notifyManageVO.setEduChasiOrd(eduChasiOrdList.toString());
+ notifyManageVO.setEduChasiOrd(eduChasiOrdList.get(0).toString());
notifyManageVO.setFrstRegisterId(loginVO.getUniqId());
for(NotifyManageVO vo : notifyManageListVO) {
notifyManageVO.setToUserId(vo.getMngUserId());
diff --git a/src/main/java/kcc/ve/aplct/adultVisitEdu/eduAplct/service/impl/EduAplctAdultServiceImpl.java b/src/main/java/kcc/ve/aplct/adultVisitEdu/eduAplct/service/impl/EduAplctAdultServiceImpl.java
index 2a000e5b..33a22a6c 100644
--- a/src/main/java/kcc/ve/aplct/adultVisitEdu/eduAplct/service/impl/EduAplctAdultServiceImpl.java
+++ b/src/main/java/kcc/ve/aplct/adultVisitEdu/eduAplct/service/impl/EduAplctAdultServiceImpl.java
@@ -155,8 +155,12 @@ public class EduAplctAdultServiceImpl implements EduAplctAdultService {
vEEduChasiVO.setStrtTm(s_strtTm[i].replaceAll("[^0-9]",""));
vEEduChasiVO.setEndTm(s_endTm[i].replaceAll("[^0-9]",""));
vEEduChasiVO.setLrnTm(s_lrnTm[i]);
- vEEduChasiVO.setTrgt(s_trgt[i]);
- vEEduChasiVO.setPrsnl(s_prsnl[i]);
+ if(s_trgt != null && !s_trgt[i].isEmpty()) {
+ vEEduChasiVO.setTrgt(s_trgt[i]);
+ }
+ if(s_prsnl != null && !s_prsnl[i].isEmpty()) {
+ vEEduChasiVO.setPrsnl(s_prsnl[i]);
+ }
vVEEduChasiService.insert(vEEduChasiVO);
// 알림을 위한 LIST
@@ -243,8 +247,12 @@ public class EduAplctAdultServiceImpl implements EduAplctAdultService {
vEEduChasiVO.setStrtTm(s_strtTm[i].replaceAll("[^0-9]",""));
vEEduChasiVO.setEndTm(s_endTm[i].replaceAll("[^0-9]",""));
vEEduChasiVO.setLrnTm(s_lrnTm[i]);
- vEEduChasiVO.setTrgt(s_trgt[i]);
- vEEduChasiVO.setPrsnl(s_prsnl[i]);
+ if(s_trgt != null && !s_trgt[i].isEmpty()) {
+ vEEduChasiVO.setTrgt(s_trgt[i]);
+ }
+ if(s_prsnl != null && !s_prsnl[i].isEmpty()) {
+ vEEduChasiVO.setPrsnl(s_prsnl[i]);
+ }
vVEEduChasiService.insert(vEEduChasiVO);
}
return true;
diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduChasiVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduChasiVO.java
index c26638db..f0676dc3 100644
--- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduChasiVO.java
+++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduChasiVO.java
@@ -134,6 +134,7 @@ public class VEEduChasiVO extends ComDefaultVO implements Serializable {
private String prcsAplctPrdOrd; //기간과정신청정보
+ private String eduTrgt; //대상
public String getQustnrQesitmId10Cnt() {
@@ -708,5 +709,11 @@ public class VEEduChasiVO extends ComDefaultVO implements Serializable {
public void setPrcsAplctPrdOrd(String prcsAplctPrdOrd) {
this.prcsAplctPrdOrd = prcsAplctPrdOrd;
}
+ public String getEduTrgt() {
+ return eduTrgt;
+ }
+ public void setEduTrgt(String eduTrgt) {
+ this.eduTrgt = eduTrgt;
+ }
}
diff --git a/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduAplctMng/service/impl/EduAplctMngAdultServiceImpl.java b/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduAplctMng/service/impl/EduAplctMngAdultServiceImpl.java
index 976fc6f4..916c5cba 100644
--- a/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduAplctMng/service/impl/EduAplctMngAdultServiceImpl.java
+++ b/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduAplctMng/service/impl/EduAplctMngAdultServiceImpl.java
@@ -147,8 +147,12 @@ public class EduAplctMngAdultServiceImpl implements EduAplctMngAdultService {
vEEduChasiVO.setStrtTm(s_strtTm[i].replaceAll("[^0-9]",""));
vEEduChasiVO.setEndTm(s_endTm[i].replaceAll("[^0-9]",""));
vEEduChasiVO.setLrnTm(s_lrnTm[i]);
- vEEduChasiVO.setTrgt(s_trgt[i]);
- vEEduChasiVO.setPrsnl(s_prsnl[i]);
+ if(s_trgt != null && !s_trgt[i].isEmpty()) {
+ vEEduChasiVO.setTrgt(s_trgt[i]);
+ }
+ if(s_prsnl != null && !s_prsnl[i].isEmpty()) {
+ vEEduChasiVO.setPrsnl(s_prsnl[i]);
+ }
vVEEduChasiService.insert(vEEduChasiVO);
}
return true;
@@ -232,8 +236,12 @@ public class EduAplctMngAdultServiceImpl implements EduAplctMngAdultService {
vEEduChasiVO.setStrtTm(s_strtTm[i].replaceAll("[^0-9]",""));
vEEduChasiVO.setEndTm(s_endTm[i].replaceAll("[^0-9]",""));
vEEduChasiVO.setLrnTm(s_lrnTm[i]);
- vEEduChasiVO.setTrgt(s_trgt[i]);
- vEEduChasiVO.setPrsnl(s_prsnl[i]);
+ if(s_trgt != null && !s_trgt[i].isEmpty()) {
+ vEEduChasiVO.setTrgt(s_trgt[i]);
+ }
+ if(s_prsnl != null && !s_prsnl[i].isEmpty()) {
+ vEEduChasiVO.setPrsnl(s_prsnl[i]);
+ }
//vVEEduChasiService.insert(vEEduChasiVO);
vVEEduChasiService.update(vEEduChasiVO);
}
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 38a7d906..ce353b9b 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
@@ -91,6 +91,9 @@
, RNDS_ORD
, APLCT_CN
+
+ , EDU_MD_CD
+ , FEE_INSTT_CD
@@ -161,6 +164,8 @@
, A.RNDS_ORD AS rndsOrd
, A.APLCT_CN AS aplctCn
, A.RSLT_ATCH_FILE_ID AS rsltAtchFileId
+ , A.EDU_MD_CD AS eduMdCd
+ , A.FEE_INSTT_CD AS feeInsttCd
@@ -250,6 +255,8 @@
, #rndsOrd#
, #aplctCn#
+ , #eduMdCd#
+ , #feeInsttCd#
)
@@ -1007,6 +1014,12 @@
, RNDS_ORD = #rndsOrd#
+
+ , FEE_INSTT_CD = #feeInsttCd#
+
+
+ , EDU_MD_CD = #eduMdCd#
+
, APLCT_CN = #aplctCn#
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 163d34f6..39349554 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
@@ -2361,6 +2361,7 @@
a.chrg_nm AS chrgNm ,
a.schol_div_cd AS scholDivCd ,
a.stndrd_schol_cd AS stndrdScholCd ,
+ a.edu_trgt AS eduTrgt ,
a.clphone AS clphone ,
a.email AS email ,
b.edu_chasi_ord AS eduChasiOrd ,
@@ -3858,6 +3859,7 @@
, G.aprvl_cd AS acmdtAprvlCd
, H.oneway_dstnc AS onewayDstnc
, A.rslt_atch_file_id AS rsltAtchFileId
+ , A.edu_trgt AS eduTrgt
FROM
VE_EDU_APLCT A
, VE_EDU_CHASI B
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctCnfrmMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctCnfrmMngDetail.jsp
index 192d6963..f393f8d0 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctCnfrmMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctCnfrmMngDetail.jsp
@@ -123,7 +123,12 @@
교육매체
-
+
+
+
+
+
+
|
@@ -170,6 +175,18 @@
${info.email} |
+
+ |
+ 교육대상
+ |
+ ${info.eduTrgt} |
+
+
+ |
+ 교육인원
+ |
+ ${info.eduPrsnl} |
+
|
신청내용
@@ -196,6 +213,12 @@
|
|
+
+ |
+ 강의료지급기관
+ |
+ |
+
|
신청상태
@@ -260,19 +283,19 @@
-
+ <%-- --%>
-
+ <%-- --%>
| 교육희망일 |
시간 |
- 대상 |
+
배정강사 |
- 인원 |
+
@@ -298,19 +321,19 @@
(${list.lrnTm}분)
- ${list.trgt} |
+ <%-- ${list.trgt} | --%>
-
|
- ${list.prsnl} |
+ <%-- ${list.prsnl} | --%>
- |
+ |
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngCreate.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngCreate.jsp
index ddc82a56..23523398 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngCreate.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngCreate.jsp
@@ -8,6 +8,7 @@
<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %>
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%>
+<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%>
<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %>
@@ -20,6 +21,7 @@
$( document ).ready(function(){
//교육 선택에 따른 항목 노출
itemChg($("#eduSlctCd").val());
+ eduMdChg();
});
function fncGoList(){
@@ -197,7 +199,27 @@
alert('교육 주제 관련 상세 요청사항 및 사전 질의(자유기재)를 입력해주세요.');
$("#rqstCn").focus();
return false;
- };
+ };
+ if($("#eduTrgt").val() == ''){
+ alert('교육대상을 입력해주세요..');
+ $("#eduTrgt").focus();
+ return false;
+ };
+ if($("#eduPrsnl").val() == ''){
+ alert('교육인원을 입력해주세요.');
+ $("#eduPrsnl").focus();
+ return false;
+ };
+
+ if($("#eduSlctCd").val() == "10"){
+ if($("input[name='eduMdCd']:checked").val() == "99"){
+ if($("#eduMd").val() == ''){
+ alert('교육매체를 입력해주세요.');
+ $("#eduMd").focus();
+ return false;
+ };
+ }
+ }
var trObj = $('.addClassRow').find('tbody > tr').not('.calendar_wrap tr');
@@ -279,6 +301,22 @@
);
}
+ //교육 매체 따른 내용 변경
+ function eduMdChg(){
+
+ var v_eduMdCd = $("input[name='eduMdCd']:checked").val();
+ var v_eduMd = $('#eduMd');
+
+
+ if (v_eduMdCd=='99'){
+ v_eduMd.removeAttr('disabled');
+ }else{
+ v_eduMd.val('');
+ v_eduMd.attr('disabled', 'disabled');
+ }
+
+ }
+
@@ -304,6 +342,8 @@
+
+
@@ -391,6 +431,10 @@
+
|
@@ -463,7 +507,25 @@
-
+
+ |
+ 필수입력 항목*
+ 교육대상
+ |
+
+
+ |
+
+
+ |
+ 필수입력 항목*
+ 교육인원
+ |
+
+
+ |
+
+
|
필수입력 항목*
@@ -499,6 +561,17 @@
|
|
+
+ |
+ 필수입력 항목*
+ 강의료지급기관
+ |
+
+
+
+ |
+
@@ -513,17 +586,17 @@
-
-
-
-
+ <%--
+ --%>
+ <%--
+ --%>
필수입력 항목* 교육희망일 |
필수입력 항목* 시간 |
- 필수입력 항목* 대상 |
- 필수입력 항목* 인원 |
+
|
@@ -797,8 +870,8 @@
-->
- |
- 명 |
+
<%-- | --%>
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngDetail.jsp
index 14dcbc28..f41686eb 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngDetail.jsp
@@ -393,7 +393,12 @@
교육매체
-
+
+
+
+
+
+
|
@@ -448,6 +453,18 @@
${info.email} |
+
+ |
+ 교육대상
+ |
+ ${info.eduTrgt} |
+
+
+ |
+ 교육인원
+ |
+ ${info.eduPrsnl} |
+
|
신청내용
@@ -474,6 +491,12 @@
|
|
+
+ |
+ 강의료지급기관
+ |
+ |
+
|
신청상태
@@ -540,17 +563,17 @@
-
+ <%-- --%>
-
+ <%-- --%>
| 교육희망일 |
시간 |
- 대상 |
+
배정강사 |
- 인원 |
+
|
@@ -576,14 +599,14 @@
(${list.lrnTm}분)
- ${list.trgt} |
+ <%-- ${list.trgt} | --%>
${empty list.instrNm ? '-' : list.instrNm} |
- ${list.prsnl} |
+ <%-- ${list.prsnl} | --%>
- |
+ |
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngReg.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngReg.jsp
index aaa21f93..a2770acc 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngReg.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngReg.jsp
@@ -8,6 +8,7 @@
<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %>
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%>
+<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%>
<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %>
@@ -20,6 +21,7 @@
$( document ).ready(function(){
//교육 선택에 따른 항목 노출
itemChg($("#eduSlctCd").val());
+ eduMdChg();
});
function fncGoList(){
@@ -268,6 +270,21 @@
}
}
+ function eduMdChg(){
+
+ var v_eduMdCd = $("input[name='eduMdCd']:checked").val();
+ var v_eduMd = $('#eduMd');
+
+
+ if (v_eduMdCd=='99'){
+ v_eduMd.removeAttr('disabled');
+ }else{
+ v_eduMd.val('');
+ v_eduMd.attr('disabled', 'disabled');
+ }
+
+ }
+
@@ -367,6 +384,10 @@
+
|
@@ -440,6 +461,21 @@
+
+ |
+ 필수입력 항목*
+ 교육대상
+ |
+ |
+
+
+ |
+ 필수입력 항목*
+ 교육인원
+ |
+ |
+
+
|
필수입력 항목*
@@ -475,6 +511,17 @@
|
|
+
+ |
+ 필수입력 항목*
+ 강의료 지급 기관
+ |
+
+
+
+ |
+
@@ -489,15 +536,15 @@
-
-
+ <%--
+ --%>
필수입력 항목* 교육희망일 |
필수입력 항목* 시간 |
- 필수입력 항목* 대상 |
- 필수입력 항목* 인원 |
+
@@ -633,8 +680,8 @@
(분)
- |
- 명 |
+ <%-- |
+ 명 | --%>
@@ -769,8 +816,8 @@
|
- |
- 명 |
+
|
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAsgnmCnfrmMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAsgnmCnfrmMngDetail.jsp
index 5fb80df8..4a014ae6 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAsgnmCnfrmMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAsgnmCnfrmMngDetail.jsp
@@ -9,6 +9,7 @@
<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %>
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%>
+<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%>
<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %>
<%
@@ -310,7 +311,12 @@
교육매체
-
+
+
+
+
+
+
|
@@ -370,6 +376,18 @@
${info.email}
+
+ |
+ 교육대상
+ |
+ ${info.eduTrgt} |
+
+
+ |
+ 교육인원
+ |
+ ${info.eduPrsnl} |
+
|
신청내용
@@ -402,6 +420,13 @@
|
+
+
+ |
+ 강의료지급기관
+ |
+ |
+
@@ -415,10 +440,10 @@
-
-
+
+ <%-- --%>
<%-- --%>
<%-- --%>
@@ -426,9 +451,9 @@
| 교육희망일 |
시간 |
- 대상 |
+
배정강사 |
- 인원 |
+
@@ -456,18 +481,18 @@
(분)
-
+ <%-- |
- |
+ --%>
-
|
-
+ <%-- |
- |
+ --%>
배정강사 |
강의계획서 |
@@ -342,8 +364,8 @@
~
(분)
- |
- |
+ <%-- |
+ | --%>
|
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cmm/SchduleManagerPopDetailAdult.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cmm/SchduleManagerPopDetailAdult.jsp
index 3f54c326..81325188 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/cmm/SchduleManagerPopDetailAdult.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/cmm/SchduleManagerPopDetailAdult.jsp
@@ -139,7 +139,12 @@
교육매체
-
+
+
+
+
+
+
|
@@ -226,12 +231,12 @@
인원
|
- |
+ |
대상
|
- |
+ |
교육일정 정보
@@ -731,17 +806,17 @@
교육차시 정보 교육희망일, 시간, 대상, 배정강사, 인원, 삭제 을/를 입력하는 표
-
+
-
-
+ <%--
+ --%>
필수입력 항목* 교육희망일 |
필수입력 항목* 시간 |
- 필수입력 항목* 대상 |
- 필수입력 항목* 인원 |
+
@@ -756,7 +831,7 @@
- |
-
+ <%-- |
|
명
- |
+ --%>
@@ -899,7 +974,7 @@
- |
-
+
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp
index cef35c3a..ffa5c178 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp
@@ -20,6 +20,7 @@
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%>
+<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%>
@@ -1179,7 +1180,12 @@
교육매체
|
-
+
+
+
+
+
+
|
@@ -1244,6 +1250,18 @@
${info.email} |
+
+ |
+ 교육대상
+ |
+ ${info.eduTrgt} |
+
+
+ |
+ 교육인원
+ |
+ ${info.eduPrsnl} |
+
|
신청내용
@@ -1270,6 +1288,12 @@
|
|
+
+ |
+ 강의료지급기관
+ |
+ |
+
배정강사 |
- 인원 |
+
만족도조사(학생) |
만족도조사(신청인) |
@@ -1381,7 +1405,7 @@
(${list.lrnTm}분)
- ${list.trgt} |
+ <%-- ${list.trgt} | --%>
<%-- ${empty list.instrNm ? '-' : list.instrNm} --%>
@@ -1394,7 +1418,7 @@
|
- ${list.prsnl} |
+ <%-- ${list.prsnl} | --%>
|