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/VEEduAplctVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java
index 8febb5b7..30e1ed34 100644
--- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java
+++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java
@@ -86,6 +86,7 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable {
private String mngNmbrSbjct; //관리번호주제,
private String mngNmbrOrd; //관리번호순번
private String eduMd; //교육매체
+ private String eduMdCd; //교육매체코드
private String oathAtchFileId; //서약서첨부파일아이디
private String planAtchFileId; //계획서첨부파일아이디
@@ -101,6 +102,7 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable {
private String rndsOrd; //회차순번(해당 신청이 속하는 회차 고유 순번)
private String rsltAtchFileId; //결과보고첨부파일아이디
+ private String feeInsttCd; //강의료지급기관코드
@@ -1857,6 +1859,18 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable {
public void setCmmNotifyOrd(String cmmNotifyOrd) {
this.cmmNotifyOrd = cmmNotifyOrd;
}
+ public String getEduMdCd() {
+ return eduMdCd;
+ }
+ public void setEduMdCd(String eduMdCd) {
+ this.eduMdCd = eduMdCd;
+ }
+ public String getFeeInsttCd() {
+ return feeInsttCd;
+ }
+ public void setFeeInsttCd(String feeInsttCd) {
+ this.feeInsttCd = feeInsttCd;
+ }
}
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 591e3f9c..ff6015e8 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#
)
@@ -983,6 +990,12 @@
교육매체
교육대상
+교육인원
+신청내용
@@ -196,6 +213,12 @@강의료지급기관
+신청상태
@@ -260,19 +283,19 @@| 교육희망일 | 시간 | -대상 | +배정강사 | -인원 | +${list.trgt} | + <%--${list.trgt} | --%>
|
- ${list.prsnl} | + <%--${list.prsnl} | --%>
|---|---|---|---|---|---|---|---|
|
+ |
@@ -463,7 +507,25 @@
-
+ |||||||
|
+ 필수입력 항목* +교육대상 + |
+ + + | +||||||
|
+ 필수입력 항목* +교육인원 + |
+ + + | +||||||
|
필수입력 항목* @@ -499,6 +561,17 @@ |
|||||||
|
+ 필수입력 항목* +강의료지급기관 + |
+
+
+ |
+ ||||||
필수입력 항목*
교육희망일필수입력 항목*
시간필수입력 항목*
대상필수입력 항목*
인원명
교육매체
교육대상
+교육인원
+신청내용
@@ -474,6 +491,12 @@강의료지급기관
+신청상태
@@ -540,17 +563,17 @@필수입력 항목*
+교육대상
+필수입력 항목*
+교육인원
+필수입력 항목*
@@ -475,6 +511,17 @@필수입력 항목*
+강의료 지급 기관
+필수입력 항목*
교육희망일필수입력 항목*
시간필수입력 항목*
대상필수입력 항목*
인원명
명
명
교육매체
교육대상
+교육인원
+신청내용
@@ -402,6 +420,13 @@강의료지급기관
+