diff --git a/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java b/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java
index 84ae87d5..d286000c 100644
--- a/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java
+++ b/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java
@@ -1004,6 +1004,8 @@ public class CommonWebController {
vEEduChasiVO.setEduChasiOrd(p_step01_list.get(i).getEduChasiOrd());
vEEduChasiVO.setInstrDiv("20");
vEEduChasiVO = vVEEduChasiService.selectDetail(vEEduChasiVO);
+ vEEduChasiVO.setAplctPhone(egovCryptoUtil.decrypt(vEEduChasiVO.getAplctPhone()));
+ vEEduChasiVO.setAplctMail(egovCryptoUtil.decrypt(vEEduChasiVO.getAplctMail()));
vEEduChasiVO.setStrtTm(vEEduChasiVO.getStrtTm().substring(0,2) + ":" + vEEduChasiVO.getStrtTm().substring(2));
vEEduChasiVO.setEndTm(vEEduChasiVO.getEndTm().substring(0,2) + ":" + vEEduChasiVO.getEndTm().substring(2));
vEEduChasiVOList.add(vEEduChasiVO);
diff --git a/src/main/java/kcc/ve/cmm/VeSendMail.java b/src/main/java/kcc/ve/cmm/VeSendMail.java
index b046f4c1..e40ee244 100644
--- a/src/main/java/kcc/ve/cmm/VeSendMail.java
+++ b/src/main/java/kcc/ve/cmm/VeSendMail.java
@@ -123,6 +123,7 @@ public class VeSendMail {
if(!"".equals(Cn)
&& Cn != null
&& !"SS".equals(sndFlag)
+ && !"SSS".equals(sndFlag)
) {
Cn = Cn.replaceAll("\n", "
");
}
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 b4a9f6cc..240ba7b2 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
@@ -359,6 +359,8 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable {
private String qestnrId10;
private String qustnrTmplatId;
+ private String trgtSex; //대상자 성별
+
public String getPrcsAplctPrdOrd() {
return prcsAplctPrdOrd;
@@ -474,6 +476,7 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable {
private List rsltList; //결과보고 타겟ORD 목록
private String prfsnFld; //강사 전문분야
private String mberId; //사용자 로그인 ID
+ private String aplctUserId; //사용자 ID
public String getSpecialWorkAllow() {
@@ -2066,6 +2069,18 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable {
public void setSiteIdCd(String siteIdCd) {
this.siteIdCd = siteIdCd;
}
+ public String getTrgtSex() {
+ return trgtSex;
+ }
+ public void setTrgtSex(String trgtSex) {
+ this.trgtSex = trgtSex;
+ }
+ public String getAplctUserId() {
+ return aplctUserId;
+ }
+ public void setAplctUserId(String aplctUserId) {
+ this.aplctUserId = aplctUserId;
+ }
}
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 846e0815..3209b124 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
@@ -145,6 +145,12 @@ public class VEEduChasiVO extends ComDefaultVO implements Serializable {
private String eduPlaceCd; //교육장소 코드
+ private String aplctPhone; //신청자 연락처
+ private String aplctUserId; //신청자 ID
+ private String aplctMail; //신청자 메일
+ private String aplctAddr; //신청자 주소
+ private String aplctaddrDetail;//신청자 상세주소
+
public String getQustnrQesitmId10Cnt() {
return qustnrQesitmId10Cnt;
}
@@ -754,4 +760,35 @@ public class VEEduChasiVO extends ComDefaultVO implements Serializable {
this.eduPlaceCd = eduPlaceCd;
}
+ public String getAplctPhone() {
+ return aplctPhone;
+ }
+ public void setAplctPhone(String aplctPhone) {
+ this.aplctPhone = aplctPhone;
+ }
+ public String getAplctUserId() {
+ return aplctUserId;
+ }
+ public void setAplctUserId(String aplctUserId) {
+ this.aplctUserId = aplctUserId;
+ }
+ public String getAplctMail() {
+ return aplctMail;
+ }
+ public void setAplctMail(String aplctMail) {
+ this.aplctMail = aplctMail;
+ }
+ public String getAplctAddr() {
+ return aplctAddr;
+ }
+ public void setAplctAddr(String aplctAddr) {
+ this.aplctAddr = aplctAddr;
+ }
+ public String getAplctaddrDetail() {
+ return aplctaddrDetail;
+ }
+ public void setAplctaddrDetail(String aplctaddrDetail) {
+ this.aplctaddrDetail = aplctaddrDetail;
+ }
+
}
diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java
index 1a39c4e8..6bdf267f 100644
--- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java
+++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java
@@ -775,6 +775,9 @@ public class CndtnPrcsInfoMngController {
excelVO.setEmail(vo.getEmail());
excelVO.setPhone(vo.getPhone());
excelVO.setSbmtPnttm(vo.getSbmtPnttm());
+ excelVO.setTrgtSex(vo.getTrgtSex());
+ excelVO.setDBirth(vo.getDBirth());
+ excelVO.setTrgtNm(vo.getTrgtNm());
ComDefaultCodeVO codeParam = new ComDefaultCodeVO();
codeParam.setCodeId("VE0003");
@@ -793,15 +796,15 @@ public class CndtnPrcsInfoMngController {
// 세팅값
String title = "조건부 기소유예 - 교육신청 목록";
int[] width = {
- 4000, 4000, 4000, 4000, 4000
+ 4000, 4000, 4000, 4000, 4000, 4000, 4000
}; // 너비
String[] header = {
- "신청자", "이메일", "핸드폰", "신청일", "상태"
+ "신청자", "이메일", "핸드폰", "생년월일", "성별", "신청일", "상태"
};
String[] order = {
- "UserNm", "Email", "Phone", "SbmtPnttm", "AprvlCd"
+ "TrgtNm", "Email", "Phone", "DBirth", "TrgtSex", "SbmtPnttm", "AprvlCd"
};
// 호출
diff --git a/src/main/java/kcc/ve/oprtn/fndtnEnhanceTrn/prcsAplctPrdMng/service/ExcelVO.java b/src/main/java/kcc/ve/oprtn/fndtnEnhanceTrn/prcsAplctPrdMng/service/ExcelVO.java
index 5a1160d1..7aa6f414 100644
--- a/src/main/java/kcc/ve/oprtn/fndtnEnhanceTrn/prcsAplctPrdMng/service/ExcelVO.java
+++ b/src/main/java/kcc/ve/oprtn/fndtnEnhanceTrn/prcsAplctPrdMng/service/ExcelVO.java
@@ -30,6 +30,8 @@ public class ExcelVO extends ComDefaultVO implements Serializable {
private String email;
private String phone;
private String prvsQs;
+ private String trgtSex;
+ private String trgtNm;
public String getUserNm() {
return userNm;
}
@@ -96,6 +98,18 @@ public class ExcelVO extends ComDefaultVO implements Serializable {
public void setPrvsQs(String prvsQs) {
this.prvsQs = prvsQs;
}
+ public String getTrgtSex() {
+ return trgtSex;
+ }
+ public void setTrgtSex(String trgtSex) {
+ this.trgtSex = trgtSex;
+ }
+ public String getTrgtNm() {
+ return trgtNm;
+ }
+ public void setTrgtNm(String trgtNm) {
+ this.trgtNm = trgtNm;
+ }
diff --git a/src/main/java/kcc/ve/oprtn/pblc/sndMng/web/SndMngController.java b/src/main/java/kcc/ve/oprtn/pblc/sndMng/web/SndMngController.java
index 7213c1cd..f7938927 100644
--- a/src/main/java/kcc/ve/oprtn/pblc/sndMng/web/SndMngController.java
+++ b/src/main/java/kcc/ve/oprtn/pblc/sndMng/web/SndMngController.java
@@ -509,6 +509,21 @@ public class SndMngController {
.replace("[[_EduYear_]]", vEEduAplctVO.getEduYear())
;
+ //성인 - 강사배정 확정 시 신청자에게 가는 메일. 메일 템플릿에 강사,소속 추가
+ if("SSS".equals(vEEduAplctVO.getSndFlag())){
+ cn = this.getTemplateWithInstr()
+ .replace("[[_InsttNm_]]", vEEduAplctVO.getInsttNm())
+ .replace("[[_Addr_]]", vEEduAplctVO.getAddr())
+ .replace("[[_HopeSbjct_]]", vEEduAplctVO.getHopeSbjct())
+ .replace("[[_EduTrgt_]]", vEEduAplctVO.getEduTrgt())
+ .replace("[[_EduPrsnl_]]", vEEduAplctVO.getEduPrsnl())
+ .replace("[[_EduHopeDt_]]", vEEduAplctVO.getEduHopeDt())
+ .replace("[[_EduYear_]]", vEEduAplctVO.getEduYear())
+ .replace("[[_InstrNm_]]", vEEduAplctVO.getInstrNm())
+ .replace("[[_Blng_]]", vEEduAplctVO.getBlng())
+ ;
+
+ }
vEEduAplctVO.setSndCn(cn);
@@ -799,7 +814,112 @@ public class SndMngController {
" 3. 강사참석확인서: 저작권배움터 완료목록에서 양식을 다운로드 받으신 후,
강사서명 날인후 스캔본 업로드 요청
\n" +
" ※ 교육 시 강의 녹화, 재사용, 배포 등은 저작권법 위반이므로 사전에 강사와 협의가 필요합니다.
\n" +
" 1~3의 요청사항은 교육 완료 후 일주일 이내 시스템 반영 부탁드립니다.
\n" +
- " 기타 문의사항은 한국저작권위원회 교육운영팀 055-792-0224 으로 연락하여 주시기 바랍니다.
\n" +
+ " 기타 문의사항은 한국저작권위원회 교육운영팀 055-792-0233 으로 연락하여 주시기 바랍니다.
\n" +
+ " 감사합니다. \n" +
+ "
\n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " | \n" +
+ " \n" +
+ " 본 메일은 발신전용으로 회신하지 않습니다. \n" +
+ " 진주 [우 52852] 경상남도 진주시 소호로 117, 1/2/5층. 대표번호 : 055.792.0000 서울 [우 04323] 서울특별시 용산구 후암로 107, 5/16층. 대표번호 : 02.2669.0010 \n" +
+ " | \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " | \n" +
+ "
\n" +
+ " \n" +
+ " \n" +
+ "