diff --git a/src/main/java/kcc/ve/aplct/adultVisitEdu/eduEnd/web/EduEndAdultController.java b/src/main/java/kcc/ve/aplct/adultVisitEdu/eduEnd/web/EduEndAdultController.java
index 625aae8f..61765aea 100644
--- a/src/main/java/kcc/ve/aplct/adultVisitEdu/eduEnd/web/EduEndAdultController.java
+++ b/src/main/java/kcc/ve/aplct/adultVisitEdu/eduEnd/web/EduEndAdultController.java
@@ -856,6 +856,31 @@ public class EduEndAdultController {
}
+
+ @RequestMapping("eduEndQustnrNoLoginDetail.do")
+ public String eduEndQustnrNoLoginDetail(
+ ModelMap model
+ , HttpServletRequest request
+ ) throws Exception {
+
+ //설문 정보
+ try {
+ model = qustnrCommonUtil._qustnrQesItm(
+ model
+ , VeConstants.LCTR_DIV_CD_20 //청소년 -10, 성인-20, ...VE0012
+ , "10" //10-기본설문, 20-신청자설문, 30-강사설문 VEA012
+ , "QTMPLA_0000000000001"
+ , vEALettnQestnrMIXService
+ , egovQustnrRespondInfoService
+ );
+
+ }catch(Exception ex) {
+ ex.printStackTrace();
+ }
+
+ return "/web/ve/comm/eduEndQustnrNoLoginDetail";
+ }
+
//////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
diff --git a/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java b/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java
index d0d6699a..c91ed9d9 100644
--- a/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java
+++ b/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java
@@ -954,6 +954,30 @@ public class EduEndTngrController {
}
+ @RequestMapping("eduEndQustnrNoLoginDetail.do")
+ public String eduEndQustnrNoLoginDetail(
+ ModelMap model
+ , HttpServletRequest request
+ ) throws Exception {
+
+ //설문 정보
+ try {
+ model = qustnrCommonUtil._qustnrQesItm(
+ model
+ , VeConstants.LCTR_DIV_CD_10 //청소년 -10, 성인-20, ...VE0012
+ , "10" //10-기본설문, 20-신청자설문, 30-강사설문 VEA012
+ , "QTMPLA_0000000000001"
+ , vEALettnQestnrMIXService
+ , egovQustnrRespondInfoService
+ );
+
+ }catch(Exception ex) {
+ ex.printStackTrace();
+ }
+
+ return "/web/ve/comm/eduEndQustnrNoLoginDetail";
+ }
+
//////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduAplctServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduAplctServiceImpl.java
index 2c0fedc7..d5054f9c 100644
--- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduAplctServiceImpl.java
+++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduAplctServiceImpl.java
@@ -11,6 +11,7 @@ import org.springframework.stereotype.Service;
import kcc.com.cmm.ComDefaultCodeVO;
import kcc.com.cmm.service.CmmnDetailCode;
import kcc.com.cmm.service.impl.CmmUseDAO;
+import kcc.let.utl.fcc.service.EgovCryptoUtil;
import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctService;
import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO;
@@ -23,6 +24,9 @@ public class VEEduAplctServiceImpl implements VEEduAplctService {
//과정
@Resource(name="cmmUseDAO")
private CmmUseDAO cmmUseDAO;
+ //암복호화 유틸
+ @Resource(name = "egovCryptoUtil")
+ EgovCryptoUtil egovCryptoUtil;
//C
@@ -86,6 +90,8 @@ public class VEEduAplctServiceImpl implements VEEduAplctService {
VEEduAplctVO vo = new VEEduAplctVO();
vo = vEEduAplctDAO.selectDetail(vEEduAplctVO);
+ decryptVEEduAplctVO(vo);
+
//교육확정 시 관리번호 추가
if("60".equals(vEEduAplctVO.getAprvlCd())) {
String mngNmbrDigits = "00000"; //관리번호 5자릿수로 만들기 변수
@@ -135,6 +141,7 @@ public class VEEduAplctServiceImpl implements VEEduAplctService {
vEEduAplctVO.setMngNmbrOrd(vo.getMngNmbrOrd());
}
+ if(true) return 0;
return vEEduAplctDAO.statusUpdate(vEEduAplctVO);
}
@@ -180,4 +187,10 @@ public class VEEduAplctServiceImpl implements VEEduAplctService {
public void updateSbmtAtchFileId(VEEduAplctVO paramVO) throws Exception {
vEEduAplctDAO.updateSbmtAtchFileId(paramVO);
}
+
+ private void decryptVEEduAplctVO(VEEduAplctVO vo) {
+
+ vo.setClphone(egovCryptoUtil.decrypt(vo.getClphone()));
+ vo.setEmail(egovCryptoUtil.decrypt(vo.getEmail()));
+ }
}
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 87bd3b38..e766ad8d 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
@@ -160,8 +160,8 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable {
private String chrgNm;
private String insttNm;
- private String instrNm;
-
+ private String instrNm;
+
private String lctrPlanRsltAtchFileId; //강의계획서 첨부파일 아이디
@@ -794,12 +794,12 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable {
}
public void setInstrNm(String instrNm) {
this.instrNm = instrNm;
- }
- public String getLctrPlanRsltAtchFileId() {
- return lctrPlanRsltAtchFileId;
- }
- public void setLctrPlanRsltAtchFileId(String lctrPlanRsltAtchFileId) {
- this.lctrPlanRsltAtchFileId = lctrPlanRsltAtchFileId;
+ }
+ public String getLctrPlanRsltAtchFileId() {
+ return lctrPlanRsltAtchFileId;
+ }
+ public void setLctrPlanRsltAtchFileId(String lctrPlanRsltAtchFileId) {
+ this.lctrPlanRsltAtchFileId = lctrPlanRsltAtchFileId;
}
diff --git a/src/main/webapp/WEB-INF/decorators.xml b/src/main/webapp/WEB-INF/decorators.xml
index 0ea25b6d..0d87820d 100644
--- a/src/main/webapp/WEB-INF/decorators.xml
+++ b/src/main/webapp/WEB-INF/decorators.xml
@@ -17,6 +17,7 @@