diff --git a/src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java b/src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java index f03fab7c..4b2f67d5 100644 --- a/src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java +++ b/src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java @@ -22,6 +22,7 @@ import kcc.kccadr.sch.service.SchduleManageVO; import kcc.let.uat.uia.service.SsoLoginVO; import kcc.let.uss.umt.service.UserManageVO; import kcc.let.utl.sim.service.AES256Util; +import kcc.ve.adv.tngr.stngInfo.service.VEAStngVO; import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEEduExcelVO; import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEEduSatisfactionExcelVO; import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEInstrAsgnmVO; @@ -776,4 +777,15 @@ public class EgovCryptoUtil { return vEPrcsDetailVOList; } + //강사 이력관리 복호화 + public List decryptVEAStngVOList(List vEAStngVOOList) { + + for(VEAStngVO vo : vEAStngVOOList) { + vo.setUserNm(this.decrypt(vo.getUserNm())); + } + + // TODO Auto-generated method stub + return vEAStngVOOList; + } + } \ No newline at end of file diff --git a/src/main/java/kcc/ve/oprtn/instr/adultVisitEdu/instrInfo/web/OprtnInstrAdultPrflContoller.java b/src/main/java/kcc/ve/oprtn/instr/adultVisitEdu/instrInfo/web/OprtnInstrAdultPrflContoller.java index fd86665e..84215d59 100644 --- a/src/main/java/kcc/ve/oprtn/instr/adultVisitEdu/instrInfo/web/OprtnInstrAdultPrflContoller.java +++ b/src/main/java/kcc/ve/oprtn/instr/adultVisitEdu/instrInfo/web/OprtnInstrAdultPrflContoller.java @@ -248,13 +248,13 @@ public class OprtnInstrAdultPrflContoller { comDefaultVO = egovCryptoUtil.decryptComDefaultVO(comDefaultVO); vEInstrDetailVO.setSearchKeyword(comDefaultVO.getSearchKeyword()); } - //3.4 요청일 시작일 검색 시 + //3.4 등록일 시작일 검색 시 if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchStartDt())){ - selectCondition += "AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') >= REPLACE('"+vEInstrDetailVO.getSearchStartDt()+"', '.', '')"; + selectCondition += "AND TO_CHAR(a.frst_regist_pnttm, 'YYYYMMDD') >= REPLACE('"+vEInstrDetailVO.getSearchStartDt()+"', '.', '')"; } - //3.5 요청일 종료일 검색 시 + //3.5 등록일 종료일 검색 시 if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchEndDt())){ - selectCondition += "AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') <= REPLACE('"+vEInstrDetailVO.getSearchEndDt()+"', '.', '')"; + selectCondition += "AND TO_CHAR(a.frst_regist_pnttm, 'YYYYMMDD') <= REPLACE('"+vEInstrDetailVO.getSearchEndDt()+"', '.', '')"; } vEInstrDetailVO.setSelectPagingListQuery(selectCondition); @@ -1074,13 +1074,13 @@ public class OprtnInstrAdultPrflContoller { vEInstrDetailVO.setSearchKeyword(comDefaultVO.getSearchKeyword()); } //3.4 요청일 시작일 검색 시 - if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchStartDt())){ - selectCondition += "AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') >= REPLACE('"+vEInstrDetailVO.getSearchStartDt()+"', '.', '')"; - } + //if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchStartDt())){ + // selectCondition += "AND TO_CHAR(a.frst_regist_pnttm, 'YYYYMMDD') >= REPLACE('"+vEInstrDetailVO.getSearchStartDt()+"', '.', '')"; + //} //3.5 요청일 종료일 검색 시 - if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchEndDt())){ - selectCondition += "AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') <= REPLACE('"+vEInstrDetailVO.getSearchEndDt()+"', '.', '')"; - } + //if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchEndDt())){ + // selectCondition += "AND TO_CHAR(a.frst_regist_pnttm, 'YYYYMMDD') <= REPLACE('"+vEInstrDetailVO.getSearchEndDt()+"', '.', '')"; + //} vEInstrDetailVO.setInstrDiv(p_s_instr_div); vEInstrDetailVO.setSelectPagingListQuery(selectCondition); @@ -1298,6 +1298,7 @@ public class OprtnInstrAdultPrflContoller { VEAStngVO vEAStngVO = new VEAStngVO(); vEAStngVO.setUserId(vEInstrDetailVO.getUserId()); List selectList_VEAIHM = vEAStngService.selectList_VEAIHM(vEAStngVO); + selectList_VEAIHM = egovCryptoUtil.decryptVEAStngVOList(selectList_VEAIHM); model.addAttribute("selectListVEAIHM",selectList_VEAIHM); @@ -1978,7 +1979,7 @@ public class OprtnInstrAdultPrflContoller { p_vEInstrDetailVO.setRecordCountPerPage(p_paginationInfo.getRecordCountPerPage()); if("".equals(p_vEInstrDetailVO.getSearchSortCnd())){ //최초조회시 최신것 조회List - p_vEInstrDetailVO.setSearchSortCnd("sbmt_pnttm"); + p_vEInstrDetailVO.setSearchSortCnd("frst_regist_pnttm"); p_vEInstrDetailVO.setSearchSortOrd("desc"); } diff --git a/src/main/java/kcc/ve/oprtn/instr/cmdTrgtEdu/instrInfo/web/CmdTrgtInstrContoller.java b/src/main/java/kcc/ve/oprtn/instr/cmdTrgtEdu/instrInfo/web/CmdTrgtInstrContoller.java index 6b2b148f..b04a840a 100644 --- a/src/main/java/kcc/ve/oprtn/instr/cmdTrgtEdu/instrInfo/web/CmdTrgtInstrContoller.java +++ b/src/main/java/kcc/ve/oprtn/instr/cmdTrgtEdu/instrInfo/web/CmdTrgtInstrContoller.java @@ -247,13 +247,13 @@ public class CmdTrgtInstrContoller { comDefaultVO = egovCryptoUtil.decryptComDefaultVO(comDefaultVO); vEInstrDetailVO.setSearchKeyword(comDefaultVO.getSearchKeyword()); } - //3.4 요청일 시작일 검색 시 + //3.4 등록일 시작일 검색 시 if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchStartDt())){ - selectCondition += "AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') >= REPLACE('"+vEInstrDetailVO.getSearchStartDt()+"', '.', '')"; + selectCondition += "AND TO_CHAR(a.frst_regist_pnttm, 'YYYYMMDD') >= REPLACE('"+vEInstrDetailVO.getSearchStartDt()+"', '.', '')"; } - //3.5 요청일 종료일 검색 시 + //3.5 등록일 종료일 검색 시 if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchEndDt())){ - selectCondition += "AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') <= REPLACE('"+vEInstrDetailVO.getSearchEndDt()+"', '.', '')"; + selectCondition += "AND TO_CHAR(a.frst_regist_pnttm, 'YYYYMMDD') <= REPLACE('"+vEInstrDetailVO.getSearchEndDt()+"', '.', '')"; } vEInstrDetailVO.setSelectPagingListQuery(selectCondition); @@ -1073,13 +1073,13 @@ public class CmdTrgtInstrContoller { vEInstrDetailVO.setSearchKeyword(comDefaultVO.getSearchKeyword()); } //3.4 요청일 시작일 검색 시 - if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchStartDt())){ - selectCondition += "AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') >= REPLACE('"+vEInstrDetailVO.getSearchStartDt()+"', '.', '')"; - } + //if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchStartDt())){ + // selectCondition += "AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') >= REPLACE('"+vEInstrDetailVO.getSearchStartDt()+"', '.', '')"; + //} //3.5 요청일 종료일 검색 시 - if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchEndDt())){ - selectCondition += "AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') <= REPLACE('"+vEInstrDetailVO.getSearchEndDt()+"', '.', '')"; - } + //if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchEndDt())){ + // selectCondition += "AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') <= REPLACE('"+vEInstrDetailVO.getSearchEndDt()+"', '.', '')"; + //} vEInstrDetailVO.setInstrDiv(p_s_instr_div); vEInstrDetailVO.setSelectPagingListQuery(selectCondition); @@ -1297,6 +1297,7 @@ public class CmdTrgtInstrContoller { VEAStngVO vEAStngVO = new VEAStngVO(); vEAStngVO.setUserId(vEInstrDetailVO.getUserId()); List selectList_VEAIHM = vEAStngService.selectList_VEAIHM(vEAStngVO); + selectList_VEAIHM = egovCryptoUtil.decryptVEAStngVOList(selectList_VEAIHM); model.addAttribute("selectListVEAIHM",selectList_VEAIHM); @@ -1977,7 +1978,7 @@ public class CmdTrgtInstrContoller { p_vEInstrDetailVO.setRecordCountPerPage(p_paginationInfo.getRecordCountPerPage()); if("".equals(p_vEInstrDetailVO.getSearchSortCnd())){ //최초조회시 최신것 조회List - p_vEInstrDetailVO.setSearchSortCnd("sbmt_pnttm"); + p_vEInstrDetailVO.setSearchSortCnd("frst_regist_pnttm"); p_vEInstrDetailVO.setSearchSortOrd("desc"); } diff --git a/src/main/java/kcc/ve/oprtn/instr/preventEdu/instrInfo/web/PreventInstrContoller.java b/src/main/java/kcc/ve/oprtn/instr/preventEdu/instrInfo/web/PreventInstrContoller.java index be42b01a..bb6a96c4 100644 --- a/src/main/java/kcc/ve/oprtn/instr/preventEdu/instrInfo/web/PreventInstrContoller.java +++ b/src/main/java/kcc/ve/oprtn/instr/preventEdu/instrInfo/web/PreventInstrContoller.java @@ -247,13 +247,13 @@ public class PreventInstrContoller { comDefaultVO = egovCryptoUtil.decryptComDefaultVO(comDefaultVO); vEInstrDetailVO.setSearchKeyword(comDefaultVO.getSearchKeyword()); } - //3.4 요청일 시작일 검색 시 + //3.4 등록일 시작일 검색 시 if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchStartDt())){ - selectCondition += "AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') >= REPLACE('"+vEInstrDetailVO.getSearchStartDt()+"', '.', '')"; + selectCondition += "AND TO_CHAR(a.frst_regist_pnttm, 'YYYYMMDD') >= REPLACE('"+vEInstrDetailVO.getSearchStartDt()+"', '.', '')"; } - //3.5 요청일 종료일 검색 시 + //3.5 등록일 종료일 검색 시 if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchEndDt())){ - selectCondition += "AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') <= REPLACE('"+vEInstrDetailVO.getSearchEndDt()+"', '.', '')"; + selectCondition += "AND TO_CHAR(a.frst_regist_pnttm, 'YYYYMMDD') <= REPLACE('"+vEInstrDetailVO.getSearchEndDt()+"', '.', '')"; } vEInstrDetailVO.setSelectPagingListQuery(selectCondition); @@ -1073,13 +1073,13 @@ public class PreventInstrContoller { vEInstrDetailVO.setSearchKeyword(comDefaultVO.getSearchKeyword()); } //3.4 요청일 시작일 검색 시 - if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchStartDt())){ - selectCondition += "AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') >= REPLACE('"+vEInstrDetailVO.getSearchStartDt()+"', '.', '')"; - } + //if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchStartDt())){ + // selectCondition += "AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') >= REPLACE('"+vEInstrDetailVO.getSearchStartDt()+"', '.', '')"; + //} //3.5 요청일 종료일 검색 시 - if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchEndDt())){ - selectCondition += "AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') <= REPLACE('"+vEInstrDetailVO.getSearchEndDt()+"', '.', '')"; - } + //if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchEndDt())){ + // selectCondition += "AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') <= REPLACE('"+vEInstrDetailVO.getSearchEndDt()+"', '.', '')"; + //} vEInstrDetailVO.setInstrDiv(p_s_instr_div); vEInstrDetailVO.setSelectPagingListQuery(selectCondition); @@ -1297,6 +1297,7 @@ public class PreventInstrContoller { VEAStngVO vEAStngVO = new VEAStngVO(); vEAStngVO.setUserId(vEInstrDetailVO.getUserId()); List selectList_VEAIHM = vEAStngService.selectList_VEAIHM(vEAStngVO); + selectList_VEAIHM = egovCryptoUtil.decryptVEAStngVOList(selectList_VEAIHM); model.addAttribute("selectListVEAIHM",selectList_VEAIHM); @@ -1977,7 +1978,7 @@ public class PreventInstrContoller { p_vEInstrDetailVO.setRecordCountPerPage(p_paginationInfo.getRecordCountPerPage()); if("".equals(p_vEInstrDetailVO.getSearchSortCnd())){ //최초조회시 최신것 조회List - p_vEInstrDetailVO.setSearchSortCnd("sbmt_pnttm"); + p_vEInstrDetailVO.setSearchSortCnd("frst_regist_pnttm"); p_vEInstrDetailVO.setSearchSortOrd("desc"); } diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrAplctMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrAplctMngList.jsp index 239921bf..46ce19de 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrAplctMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrAplctMngList.jsp @@ -129,7 +129,7 @@
-

요청일자

+

등록일자

@@ -141,43 +141,22 @@
- - <%--
- -
--%> - + +
+

총 건수 :

+
+ +
+
+
@@ -196,7 +175,7 @@ - + @@ -218,13 +197,12 @@ - +
직위 위촉년도 구분요청일등록일
- - +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngDetail.jsp index 64dc94ba..b5c3a4d7 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngDetail.jsp @@ -452,18 +452,6 @@ function getYears(getYear){ -
-
-
- - 이미지를 넣어주세요 - - - ${info.instrNm} 사진?atchFileId=' /> - -
-
-
@@ -531,7 +519,7 @@ function getYears(getYear){ - + <%--

강의희망 교육분야

@@ -548,7 +536,7 @@ function getYears(getYear){ - + --%> <%-- @@ -556,7 +544,7 @@ function getYears(getYear){ --%> - + <%--

강의설정

@@ -570,8 +558,8 @@ function getYears(getYear){ - - + --%> + <%--

요청사항

@@ -585,7 +573,7 @@ function getYears(getYear){ - + --%>
@@ -631,14 +619,6 @@ function getYears(getYear){ -
-
-
- 이미지를 넣어주세요 -
- -
-
@@ -775,7 +755,7 @@ function getYears(getYear){ - SW코딩, 사물인터넷,인공지능,인성, 비젼, 캠프, 인터넷중독, 가족치료, 저작권 개론 등"> - + <%--

필수입력 항목*

강의희망 교육분야

@@ -792,7 +772,7 @@ function getYears(getYear){ - + --%> 자격 종료 여부 - 요청 사항 @@ -266,19 +262,6 @@ - - - - - - - - ${list.lctrAreaNm} - - - ${list.lctrAreaNm} 외 ${list.lctrAreaCnt -1}개 지역 - - - @@ -293,26 +276,10 @@ 해촉 - - <%-- - - - - - - --%> - - - O - - - X - - - - + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgtEdu/instrAplctMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgtEdu/instrAplctMngList.jsp index 6d0b9a75..c23c1ca2 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgtEdu/instrAplctMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgtEdu/instrAplctMngList.jsp @@ -129,7 +129,7 @@
-

요청일자

+

등록일자

@@ -141,43 +141,22 @@
- - <%--
- -
--%> - + +
+

총 건수 :

+
+ +
+
+
@@ -196,7 +175,7 @@ - + @@ -218,13 +197,12 @@ - +
직위 위촉년도 구분요청일등록일
- - +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgtEdu/instrMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgtEdu/instrMngDetail.jsp index 050479c1..cae471e6 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgtEdu/instrMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgtEdu/instrMngDetail.jsp @@ -452,18 +452,6 @@ function getYears(getYear){ -
-
-
- - 이미지를 넣어주세요 - - - ${info.instrNm} 사진?atchFileId=' /> - -
-
-
@@ -531,7 +519,7 @@ function getYears(getYear){ - + <%--

강의희망 교육분야

@@ -548,7 +536,7 @@ function getYears(getYear){ - + --%> <%-- @@ -556,7 +544,7 @@ function getYears(getYear){ --%> - + <%--

강의설정

@@ -585,7 +573,7 @@ function getYears(getYear){ - + --%>
@@ -631,14 +619,6 @@ function getYears(getYear){ -
-
-
- 이미지를 넣어주세요 -
- -
-
@@ -775,7 +755,7 @@ function getYears(getYear){ - SW코딩, 사물인터넷,인공지능,인성, 비젼, 캠프, 인터넷중독, 가족치료, 저작권 개론 등"> - + <%--

필수입력 항목*

강의희망 교육분야

@@ -792,7 +772,7 @@ function getYears(getYear){ - + --%> 자격 종료 여부 - 요청 사항 @@ -266,19 +262,6 @@ - - - - - - - - ${list.lctrAreaNm} - - - ${list.lctrAreaNm} 외 ${list.lctrAreaCnt -1}개 지역 - - - @@ -293,26 +276,10 @@ 해촉 - - <%-- - - - - - - --%> - - - O - - - X - - - - + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/preventEdu/instrAplctMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/preventEdu/instrAplctMngList.jsp index df4108fe..65f2657f 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/preventEdu/instrAplctMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/preventEdu/instrAplctMngList.jsp @@ -129,7 +129,7 @@
-

요청일자

+

등록일자

@@ -141,43 +141,23 @@
- - <%--
- -
--%> + +
+

총 건수 :

+
+ +
+
+
@@ -196,7 +176,7 @@ - + @@ -218,13 +198,12 @@ - +
직위 위촉년도 구분요청일등록일
- - +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/preventEdu/instrMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/preventEdu/instrMngDetail.jsp index 1031306a..b3eade43 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/preventEdu/instrMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/preventEdu/instrMngDetail.jsp @@ -452,18 +452,6 @@ function getYears(getYear){ -
-
-
- - 이미지를 넣어주세요 - - - ${info.instrNm} 사진?atchFileId=' /> - -
-
-
@@ -531,7 +519,7 @@ function getYears(getYear){ - + <%--

강의희망 교육분야

@@ -548,7 +536,7 @@ function getYears(getYear){ - + --%> <%-- @@ -556,7 +544,7 @@ function getYears(getYear){ --%> - + <%--

강의설정

@@ -585,7 +573,7 @@ function getYears(getYear){ - + --%>
@@ -631,14 +619,6 @@ function getYears(getYear){ -
-
-
- 이미지를 넣어주세요 -
- -
-
@@ -775,7 +755,7 @@ function getYears(getYear){ - SW코딩, 사물인터넷,인공지능,인성, 비젼, 캠프, 인터넷중독, 가족치료, 저작권 개론 등"> - + <%--

필수입력 항목*

강의희망 교육분야

@@ -792,7 +772,7 @@ function getYears(getYear){ - + --%> 자격 종료 여부 - 요청 사항 @@ -266,19 +262,6 @@ - - - - - - - - ${list.lctrAreaNm} - - - ${list.lctrAreaNm} 외 ${list.lctrAreaCnt -1}개 지역 - - - @@ -293,26 +276,10 @@ 해촉 - - <%-- - - - - - - --%> - - - O - - - X - - - - +