diff --git a/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java b/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java index 9f8bbed2..57e8254e 100644 --- a/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java +++ b/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java @@ -1,6 +1,9 @@ package kcc.ve.aplct.comweb; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.List; +import java.util.Locale; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; @@ -21,6 +24,8 @@ import kcc.let.utl.fcc.service.EgovCryptoUtil; import kcc.ve.adv.tngr.stngInfo.service.VEACmpltCrtfcMixService; import kcc.ve.adv.tngr.stngInfo.service.VEACmpltCrtfcVO; import kcc.ve.aplct.fndtnEnhanceTrn.service.FndtnEnhanceTrnService; +import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; +import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduMIXService; import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailService; import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO; import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrMixService; @@ -140,6 +145,10 @@ public class CrownixAjaxController { @Resource(name = "vEACmpltCrtfcMixService") private VEACmpltCrtfcMixService vEACmpltCrtfcMixService; + //MIX + @Resource(name = "vEEduMIXService") + private VEEduMIXService vEEduMIXService; + //강사MIX 정보 @Resource(name="vEInstrMixService") private VEInstrMixService vEInstrMixService; @@ -944,4 +953,66 @@ public class CrownixAjaxController { return p_modelAndView; } + + /** + * 성인강사 결과보고 출력 + * + */ + @RequestMapping("/ve/aplct/adultVisitEdu/eduAplct/adultRsltRprtListAjax.do") + public ModelAndView adultRsltRprtListAjax( + VEEduAplctVO vEEduAplctVO + , ModelMap model + , HttpServletRequest request + ) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + System.out.println(" vEInstrDetailVO.getRsltlist().toString() :: "+vEEduAplctVO.getRsltList().toString()); + List vEEduAplctVOList = vEEduMIXService.selectAdultRsltRprtList(vEEduAplctVO); + //복호화 + vEEduAplctVOList = egovCryptoUtil.decryptVEEduAplctVOList(vEEduAplctVOList); + + JSONArray jsReqInfo = new JSONArray(); //신청인 정보 + + for (int i=0;i rsltList; //결과보고 타겟ORD 목록 + private String prfsnFld; //강사 전문분야 public String getSpecialWorkAllow() { @@ -2037,6 +2039,19 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable { this.qustnrTmplatId = qustnrTmplatId; } + public List getRsltList() { + return rsltList; + } + public void setRsltList(List rsltList) { + this.rsltList = rsltList; + } + public String getPrfsnFld() { + return prfsnFld; + } + public void setPrfsnFld(String prfsnFld) { + this.prfsnFld = prfsnFld; + } + } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduMIXService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduMIXService.java index 1d39dfd4..0abc0de3 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduMIXService.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduMIXService.java @@ -103,4 +103,6 @@ public interface VEEduMIXService { List selectEduCmpltCrtfcNmbrList(VEEduAplctVO vEEduAplctVO) throws Exception; List selectCndtnList(VEEduAplctVO paramVO); + + List selectAdultRsltRprtList(VEEduAplctVO paramVO) throws Exception; } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXDAO.java index a8aef157..dcf3b791 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXDAO.java @@ -254,5 +254,12 @@ public class VEEduMIXDAO extends EgovAbstractDAO { public List selectCndtnList(VEEduAplctVO paramVO) { return (List) list("VEEduMIXDAO.selectCndtnList", paramVO); } + + public List selectAdultRsltRprtList(VEEduAplctVO paramVO) { + @SuppressWarnings("unchecked") + List tlist = (List) list("VEEduMIXDAO.selectAdultRsltRprtList", paramVO); + return tlist; + } + } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXServiceImpl.java index 315d109c..dfd4f861 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXServiceImpl.java @@ -226,5 +226,10 @@ public class VEEduMIXServiceImpl implements VEEduMIXService { @Override public List selectCndtnList(VEEduAplctVO paramVO) { return vEEduMIXDAO.selectCndtnList(paramVO); - } + } + + @Override + public List selectAdultRsltRprtList(VEEduAplctVO paramVO) throws Exception{ + return vEEduMIXDAO.selectAdultRsltRprtList(paramVO); + } } 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 31b24d36..173719aa 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 @@ -2610,7 +2610,7 @@ GROUP BY i.edu_aplct_ord , i.edu_chasi_ord ),0) AS rowNo , e.rsdne as rsdne - + , o.vea_rslt_rprt_ord AS veaRsltRprtOrd FROM ve_edu_aplct a , ve_edu_chasi b @@ -2660,7 +2660,9 @@ AND b.edu_chasi_ord=g.edu_chasi_ord ) LEFT OUTER JOIN ve_edu_instr_dstnc h - ON b.edu_aplct_ord = h.edu_aplct_ord AND d.user_id = h.user_id + ON b.edu_aplct_ord = h.edu_aplct_ord AND d.user_id = h.user_id + LEFT OUTER JOIN vea_rslt_rprt o + ON b.edu_aplct_ord = o.edu_aplct_ord WHERE 1=1 AND a.edu_aplct_ord=b.edu_aplct_ord AND NVL(A.USE_YN, 'Y') ]]> 'N' @@ -7986,4 +7988,47 @@ VALUES AND vad.EDU_CMPLT_CRTFC_NMBR LIKE TO_CHAR(SYSDATE, 'YYYY') || '%'; /* 현재연도로 시작하는지 확인 */ + + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngList.jsp index ff0ff248..cfd6257e 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngList.jsp @@ -314,6 +314,7 @@ + @@ -324,6 +325,7 @@ 신청유형 기관(단체)명 강사이름 + 결과보고
제출여부 강의만족도
제출여부 @@ -341,7 +343,7 @@ + data-eduaplctord="" title="Check" type="checkbox"/> @@ -364,6 +366,9 @@ + + 미제출제출 + 미제출제출 @@ -390,6 +395,7 @@
+ <%-- <%-- selectedValue="" --%> @@ -404,5 +410,48 @@ + + + + + + + + + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngList.jsp index e64cf9ff..71a34f42 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngList.jsp @@ -381,7 +381,7 @@ viewer.showToolbarItem(["print_pdf"]); //viewer.openFile('adult_instrs_20231107.mrd', '/rf [http://119.193.215.98:9989/offedu/ve/aplct/adultVisitEdu/eduAplct/instrDetailListAjax_v2.do?userIdList='+userIdList+']'); - viewer.openFile('adult_instrs_20231107.mrd', '/rf [http://192.168.0.32:3080/offedu/ve/aplct/adultVisitEdu/eduAplct/instrDetailListAjax_v2.do?userIdList='+userIdList+']'); + viewer.openFile('adult_instrs_20231107.mrd', '/rf [http://192.168.0.12:8086/offedu/ve/aplct/adultVisitEdu/eduAplct/instrDetailListAjax_v2.do?userIdList='+userIdList+']'); } \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtCmpltList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtCmpltList.jsp index 4a8916b5..95f27518 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtCmpltList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtCmpltList.jsp @@ -89,7 +89,7 @@ function linkPage(pageNo){ var listForm = document.listForm ; listForm.pageIndex.value = pageNo ; - listForm.searchKeyword.value = $('#searchKeyword').val(); + //listForm.searchKeyword.value = $('#searchKeyword').val(); listForm.action = ""; listForm.submit(); } @@ -177,6 +177,13 @@ } + function fncReset(thisObj){ + var targetObj = $(thisObj).closest('.list_top').find('select,input'); + $.each(targetObj, function(){ + $(this).val(''); + }); + } + 교육과정관리 @@ -218,15 +225,31 @@

수료자 목록

-
+
+
+

구분1

+
- - + + + +
+
+
+
+

구분2

+
+
+ +
+
+
+
+

구분3

+
+
+ 의뢰일:
@@ -236,9 +259,6 @@
- - -
@@ -334,7 +354,7 @@ - +