From ec91eef8c67aa7fe017850c507cf1961550f3519 Mon Sep 17 00:00:00 2001 From: myname Date: Wed, 27 Dec 2023 09:36:37 +0900 Subject: [PATCH 1/6] =?UTF-8?q?2023-12-27=2009:36=20=EA=B8=B0=EB=B0=98?= =?UTF-8?q?=EA=B0=95=ED=99=94=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/ScholInfoController.java | 69 +++ .../web/FndtnEnhanceTrnController.java | 1 + .../service/VEInstrDetailActvtHstryVO.java | 16 + .../VEInstrDetailActvtHstry_SQL_Tibero.xml | 25 +- .../ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml | 6 +- .../oprtn/cmm/instrActvtHstrySignMngList.jsp | 69 +-- .../popup/qustnrFndtnPopList.jsp | 531 ++++++++++++++++++ .../fndtnEnhanceTrn/fndtnEduAplctList.jsp | 69 ++- .../jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp | 41 +- 9 files changed, 777 insertions(+), 50 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrFndtnPopList.jsp diff --git a/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ScholInfoController.java b/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ScholInfoController.java index 46b7be66..0e271025 100644 --- a/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ScholInfoController.java +++ b/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ScholInfoController.java @@ -356,6 +356,75 @@ public class ScholInfoController { return "/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrPopList"; } + /** + * 설문 팝업 리스트 - 실무, 기소 + */ + @RequestMapping("popup/qustnrFndtnPopList.do") + public String qustnrFndtnPopList( + @ModelAttribute("vEEduChasiVO") VEEduChasiVO vEEduChasiVO + , QustnrRespondInfoVO qustnrRespondInfoVO + , ModelMap model + , HttpServletRequest request + ) throws Exception { + + String s_action = request.getParameter("action"); //insert or select + System.out.println("s_action"); + System.out.println(s_action); + System.out.println(vEEduChasiVO.getQustnrTmplatId()); + System.out.println(vEEduChasiVO.getQestnrId()); + System.out.println(vEEduChasiVO.getQustnrRespondId()); + + System.out.println(qustnrRespondInfoVO.getQustnrTmplatId()); + System.out.println(qustnrRespondInfoVO.getQestnrId()); + System.out.println(qustnrRespondInfoVO.getQustnrRespondId()); + //차시 정보 + /* + try { + vEEduChasiVO.setInstrDiv(VeConstants.LCTR_DIV_CD_10); //10-청소년 강사, 20-성인강사 VE0001 + + VEEduChasiVO ChasiInfo = vEEduMIXService.selectChasiInfo(vEEduChasiVO); + ChasiInfo.setInstrNm(egovCryptoUtil.decrypt(ChasiInfo.getInstrNm())); + + ChasiInfo.setStrtTm(ChasiInfo.getStrtTm().substring(0,2)+":"+ChasiInfo.getStrtTm().substring(2,4)); + ChasiInfo.setEndTm(ChasiInfo.getEndTm().substring(0,2)+":"+ChasiInfo.getEndTm().substring(2,4)); + + model.addAttribute("chasiInfo", ChasiInfo); + + }catch(Exception ex) { + System.out.println("Exception vEEduAplctOnlnService.updateBulk"); + } +*/ + //참석 답변 정보 + try { + List chasiSrvyList = egovQustnrRespondInfoService.selectChasiSrvyList202312(qustnrRespondInfoVO); + model.addAttribute("qestnrRespondent", chasiSrvyList.get(0).getQestnrRespondent()); + model.addAttribute("qestnrParticipant", chasiSrvyList.get(0).getQestnrParticipant()); + model.addAttribute("chasiSrvyList", chasiSrvyList); + }catch(Exception ex) { + System.out.println("Exception vEEduAplctOnlnService.updateBulk"); + } + + + //설문 참여 정보 + /* + 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/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrFndtnPopList"; + } + /** * 설문 출력 팝업 리스트 */ diff --git a/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java index 7a589d85..caa70c81 100644 --- a/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java +++ b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java @@ -420,6 +420,7 @@ public class FndtnEnhanceTrnController { if(StringUtil.isEmpty(vEPrcsDetailVO.getPrcsDiv())) { //vEPrcsDetailVO.setPrcsDiv("10");// 과정구분 VE0015 10-산업종사자, 20-대학생, 30-공무원, 40-일반인, 50-청소년, 60-학부모 + vEPrcsDetailVO.setSiteId("50"); } List vEPrcsDetailVOList = vEPrcsAplctPrdService.findByAprvlList(vEPrcsDetailVO); diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailActvtHstryVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailActvtHstryVO.java index 8d8a78e4..a87ea799 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailActvtHstryVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailActvtHstryVO.java @@ -57,6 +57,10 @@ public class VEInstrDetailActvtHstryVO extends ComDefaultVO implements Serializa private String docuNmbrDp = ""; //문서번호-표시용 + private String cnt = ""; //횟수 + private String chasiSum = ""; //차시 합계 + + public String getInstrDetailActvtHstryOrd() { return instrDetailActvtHstryOrd; @@ -208,6 +212,18 @@ public class VEInstrDetailActvtHstryVO extends ComDefaultVO implements Serializa public void setDocuNmbrDp(String docuNmbrDp) { this.docuNmbrDp = docuNmbrDp; } + public String getCnt() { + return cnt; + } + public void setCnt(String cnt) { + this.cnt = cnt; + } + public String getChasiSum() { + return chasiSum; + } + public void setChasiSum(String chasiSum) { + this.chasiSum = chasiSum; + } diff --git a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetailActvtHstry_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetailActvtHstry_SQL_Tibero.xml index 6168c758..5fe96e69 100644 --- a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetailActvtHstry_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetailActvtHstry_SQL_Tibero.xml @@ -133,15 +133,38 @@ TO_CHAR(a.state_pnttm, 'YYYY') ||'-'||a.docu_nmbr||'호' AS docuNmbrDp , b.INSTR_NM AS instrNm , + + , c.cnt + , c.chasiSum FROM a JOIN ve_instr_detail b ON a.user_id = b.user_id AND a.instr_detail_ord = b.instr_detail_ord - + left outer join + ( + + SELECT c.USER_ID AS userId + , count(*) AS cnt + , sum(b.chasi) AS chasiSum + FROM ve_edu_aplct a + , ve_edu_chasi b + , ve_edu_chasi_instr_asgnm c + WHERE a.EDU_APLCT_ORD =b.EDU_APLCT_ORD + AND b.EDU_APLCT_ORD =c.EDU_APLCT_ORD + AND b.EDU_CHASI_ORD =c.EDU_CHASI_ORD + AND a.aprvl_cd='60' + AND c.asgnm_aprvl_Cd='30' + GROUP BY c.USER_ID + + )c + on( + a.user_id=c.userId + ) WHERE 1=1 AND a.docu_nmbr IS not null + b.INSTR_NM = #searchKeyword# diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml index 7c7d5019..5a3ee940 100644 --- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml @@ -649,7 +649,9 @@ LETTNQESTNRRSLTDETAIL lersltD WHERE lersltD.respond_id = a.USER_ID - AND a.edu_aplct_ord = lersltD.edu_aplct_ord ) THEN 1 + AND a.edu_aplct_ord = lersltD.edu_aplct_ord + AND i.qestnr_id_10 = lersltD.qestnr_id + ) THEN 1 ELSE 0 END AS qestRsltExists @@ -726,7 +728,7 @@ FROM LETTNQESTNRINFO a WHERE - a.SITE_ID = '10' + a.SITE_ID = #siteId# AND a.SITE_ID_CD IN ('10', '20', '30') AND TO_CHAR(SYSDATE, 'YYYY.MM.DD') BETWEEN NVL(a.qustnr_bgnde, diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cmm/instrActvtHstrySignMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cmm/instrActvtHstrySignMngList.jsp index 17b2173a..f9522ff4 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cmm/instrActvtHstrySignMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cmm/instrActvtHstrySignMngList.jsp @@ -172,13 +172,12 @@ - + + + + + - - - - - <%-- --%> <%-- --%> @@ -187,14 +186,14 @@ 번호 - 강사명 - 성별 - 용도 - 사업자명
사업자등록번호 - 신청일 - 처리일 + 항목 문서번호 - 발급상태 + 횟수 + 차시 + 성명 + 발급일자 + 비고 + @@ -204,35 +203,9 @@ - + 강사활동확인서 - - - - - - - -
- () - - - - - - - - - - - - - - - - - - @@ -242,8 +215,22 @@ + + + + + + + + + + - + + + + + - diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrFndtnPopList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrFndtnPopList.jsp new file mode 100644 index 00000000..a6c032cd --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrFndtnPopList.jsp @@ -0,0 +1,531 @@ +<%-- + + Class Name : qustnrFndtnPopList.jsp + Description : 설문팝업 + Modification Information + + 1.강의 종류(청소년, 성인 ... VE0011) 및 설문 종류 (10-기본, 20-신청자, 30-강사) 및 상태(등록, 완료) 에 맞는 설문 레이어 팝업을 만든다. + + 수정일 수정자 수정내용 + ------- -------- --------------------------- + 2021.12.02 조용준 내용 + + author : 조용준 + since : 2021.12.02 + +--%> +<%@ page contentType="text/html; charset=utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> + + + + +
+ + + + + + +
+
+

강의만족도 결과 등록

+
+ +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
교육일, 차시, 구분, 대상, 배정강사, 인원, 설문완료 여부 등의 정보제공
교육일차시구분대상배정강사인원설문완료 여부
+ + + ~ + + + + + + + + + + + + 설문진행중 + + + 설문완료 + + +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
참석자, 응답율, 응답자, 무응답에 대한 정보를 제공/입력
+

참석자

+ 		+ + "> + +

응답율

+ 		-
+

응답자

+ 		+ + " onblur="replyCalculation(); return false;"> + +

무응답

+ 		-
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
평가문항, 매우만족, 만족, 보통, 불만족, 매우 불만족 입력
평가문항매우만족만족보통불만족매우불만족
+ ${status1.count}) + + (최대선택건수 ${QestmInfo.mxmmChoiseCo}) + + + + + + + + + + + + + + + + + + + +
+ +
+
+ + + + + +
+
+
+
+ + + + +
+
+
+
+ + + + + + + +
+
+
+
+ + +
+
+
+
+ + + + + + + + + +
+
+
+
+
+
+
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.jsp index df73014e..2411d164 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.jsp @@ -49,7 +49,7 @@ $(document).ready(function(){ } } - function linkPage(pageNo){ + function linkPageTop(pageNo){ var listForm = document.listForm ; listForm.pageIndex.value = pageNo ; listForm.action = ""; @@ -65,7 +65,7 @@ $(document).ready(function(){ function fncGoList(){ - linkPage(1); + linkPageTop(1); } function fncReset(thisObj){ @@ -277,7 +277,38 @@ $(document).ready(function(){ }); } - + //설문 팝업 + function fncQustnrList( + id //aplctOrd + , chId //chasiOrd + , p_site_id_cd //10,20,30 + , p_action //select, insert + , p_qustnrTmplatId //select, insert + , p_qestnrId //select, insert + , p_qustnrRespondId //select, insert + ) { + + paramObj = { + "eduAplctOrd" : id + ,"eduChasiOrd" : chId + ,"siteIdCd" : p_site_id_cd + + ,"action" : p_action + + ,"qustnrTmplatId" : p_qustnrTmplatId + ,"qestnrId" : p_qestnrId + ,"qustnrRespondId" : p_qustnrRespondId + }; + + commonPopLayeropen( + "${pageContext.request.contextPath}/web/ve/aplct/cpyrgExprnClsrm/scholInfo/popup/qustnrFndtnPopList.do" + , 800 + , 700 + , paramObj + , "Y" + , "QustnrList" + ); + } @@ -388,6 +419,36 @@ $(document).ready(function(){ - + + + + + + + + + + + - + + + @@ -426,7 +487,7 @@ $(document).ready(function(){
- +
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp index 64e825d4..a138dca2 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp @@ -185,6 +185,40 @@ }); } + + + //설문 팝업 + function fncQustnrList( + id //aplctOrd + , chId //chasiOrd + , p_site_id_cd //10,20,30 + , p_action //select, insert + , p_qustnrTmplatId //select, insert + , p_qestnrId //select, insert + , p_qustnrRespondId //select, insert + ) { + + paramObj = { + "eduAplctOrd" : id + ,"eduChasiOrd" : chId + ,"siteIdCd" : p_site_id_cd + + ,"action" : p_action + + ,"qustnrTmplatId" : p_qustnrTmplatId + ,"qestnrId" : p_qestnrId + ,"qustnrRespondId" : p_qustnrRespondId + }; + + commonPopLayeropen( + "${pageContext.request.contextPath}/web/ve/aplct/cpyrgExprnClsrm/scholInfo/popup/qustnrPopList.do" + , 800 + , 700 + , paramObj + , "Y" + , "scholPop" + ); + } @@ -470,8 +504,7 @@ - - +
@@ -485,7 +518,11 @@
+ + + + From 8bb5511c0b555f4bfe1614ce8f90d4e3d4e0abc2 Mon Sep 17 00:00:00 2001 From: myname Date: Thu, 28 Dec 2023 10:25:10 +0900 Subject: [PATCH 2/6] =?UTF-8?q?2023-12-28=2010:24=20=EC=8B=A4=EB=AC=B4?= =?UTF-8?q?=EC=97=AD=EB=9F=89=EA=B0=95=ED=99=94=20=EC=84=A4=EB=AC=B8=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/EgovQustnrRespondInfoService.java | 5 +- .../olp/qri/service/QustnrRespondInfoVO.java | 79 +++++ .../EgovQustnrRespondInfoServiceImpl.java | 5 + .../service/impl/QustnrRespondInfoDao.java | 5 + .../web/ScholInfoController.java | 11 +- .../web/FndtnEnhanceTrnController.java | 4 +- .../eduEnd/web/EduEndTngrController.java | 233 +++++++++++++ .../service/VEPrcsAplctPrdService.java | 136 ++++---- .../prcsInfo/service/VEPrcsDetailVO.java | 23 +- .../service/impl/VEPrcsAplctPrdDAO.java | 278 +++++++-------- .../impl/VEPrcsAplctPrdServiceImpl.java | 302 ++++++++-------- .../web/CndtnPrcsInfoMngController.java | 2 + .../qri/EgovQustnrRespondInfo_SQL_Tibero.xml | 96 ++++++ .../sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml | 24 +- .../ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml | 325 ++++++++++++++++++ .../qustnr/VEALettnQestnrMIX_SQL_Tibero.xml | 5 +- .../jsp/uss/olp/qmc/UserQustnrManageList.jsp | 21 +- .../qqm/UserItnQustnrQestnManageRegist.jsp | 6 + .../popup/qustnrFndtnPopList.jsp | 207 ++++++++--- .../fndtnEnhanceTrn/fndtnEduAplctList.jsp | 89 +++-- 20 files changed, 1402 insertions(+), 454 deletions(-) diff --git a/src/main/java/kcc/let/uss/olp/qri/service/EgovQustnrRespondInfoService.java b/src/main/java/kcc/let/uss/olp/qri/service/EgovQustnrRespondInfoService.java index 05854aee..6c0d17e5 100644 --- a/src/main/java/kcc/let/uss/olp/qri/service/EgovQustnrRespondInfoService.java +++ b/src/main/java/kcc/let/uss/olp/qri/service/EgovQustnrRespondInfoService.java @@ -165,8 +165,11 @@ public interface EgovQustnrRespondInfoService { // 차수별 설문 조회 public List selectChasiSrvyList(QustnrRespondInfoVO qustnrRespondInfoVO) throws Exception; - // 차수별 설문 조회 + // 차수별 설문 조회 - 상세 답변 정보 public List selectChasiSrvyList202312(QustnrRespondInfoVO qustnrRespondInfoVO) throws Exception; + + // 차수별 설문 조회 - 상세 답변 정보(기반, 기소 용) + public List selectChasiSrvyFndtnList202312(QustnrRespondInfoVO qustnrRespondInfoVO) throws Exception; public List selectChasiSrvyExcelList(QustnrRespondInfoVO qustnrRespondInfoVO) throws Exception; diff --git a/src/main/java/kcc/let/uss/olp/qri/service/QustnrRespondInfoVO.java b/src/main/java/kcc/let/uss/olp/qri/service/QustnrRespondInfoVO.java index c82bdda5..a09afc5e 100644 --- a/src/main/java/kcc/let/uss/olp/qri/service/QustnrRespondInfoVO.java +++ b/src/main/java/kcc/let/uss/olp/qri/service/QustnrRespondInfoVO.java @@ -124,6 +124,13 @@ public class QustnrRespondInfoVO implements Serializable { private String qustnrNm = ""; //등록자명 private String qustnrBirth = ""; //등록자생년월일 + private String answer5 = ""; + private String answer4 = ""; + private String answer3 = ""; + private String answer2 = ""; + private String answer1 = ""; + + private String prcsAplctPrdOrd = ""; // 20231124 이호영 @@ -567,6 +574,78 @@ public class QustnrRespondInfoVO implements Serializable { public void setQustnrBirth(String qustnrBirth) { this.qustnrBirth = qustnrBirth; } + + + + public String getAnswer5() { + return answer5; + } + + + + public void setAnswer5(String answer5) { + this.answer5 = answer5; + } + + + + public String getAnswer4() { + return answer4; + } + + + + public void setAnswer4(String answer4) { + this.answer4 = answer4; + } + + + + public String getAnswer3() { + return answer3; + } + + + + public void setAnswer3(String answer3) { + this.answer3 = answer3; + } + + + + public String getAnswer2() { + return answer2; + } + + + + public void setAnswer2(String answer2) { + this.answer2 = answer2; + } + + + + public String getAnswer1() { + return answer1; + } + + + + public void setAnswer1(String answer1) { + this.answer1 = answer1; + } + + + + public String getPrcsAplctPrdOrd() { + return prcsAplctPrdOrd; + } + + + + public void setPrcsAplctPrdOrd(String prcsAplctPrdOrd) { + this.prcsAplctPrdOrd = prcsAplctPrdOrd; + } } diff --git a/src/main/java/kcc/let/uss/olp/qri/service/impl/EgovQustnrRespondInfoServiceImpl.java b/src/main/java/kcc/let/uss/olp/qri/service/impl/EgovQustnrRespondInfoServiceImpl.java index db012e95..c619b597 100644 --- a/src/main/java/kcc/let/uss/olp/qri/service/impl/EgovQustnrRespondInfoServiceImpl.java +++ b/src/main/java/kcc/let/uss/olp/qri/service/impl/EgovQustnrRespondInfoServiceImpl.java @@ -253,6 +253,11 @@ public class EgovQustnrRespondInfoServiceImpl extends EgovAbstractServiceImpl im return dao.selectChasiSrvyList202312(qustnrRespondInfoVO); } + @Override + public List selectChasiSrvyFndtnList202312(QustnrRespondInfoVO qustnrRespondInfoVO) throws Exception { + return dao.selectChasiSrvyFndtnList202312(qustnrRespondInfoVO); + } + @Override public QustnrRespondInfoVO selectSiteIdQustnrTmplat(QustnrRespondInfoVO qustnrRespondInfoVO) throws Exception { return dao.selectSiteIdQustnrTmplat(qustnrRespondInfoVO); diff --git a/src/main/java/kcc/let/uss/olp/qri/service/impl/QustnrRespondInfoDao.java b/src/main/java/kcc/let/uss/olp/qri/service/impl/QustnrRespondInfoDao.java index a0aa903e..b0c997df 100644 --- a/src/main/java/kcc/let/uss/olp/qri/service/impl/QustnrRespondInfoDao.java +++ b/src/main/java/kcc/let/uss/olp/qri/service/impl/QustnrRespondInfoDao.java @@ -207,6 +207,11 @@ public class QustnrRespondInfoDao extends EgovAbstractDAO { return (List) list("QustnrRespondInfo.selectChasiSrvyList202312", qustnrRespondInfoVO); } + @SuppressWarnings("unchecked") + public List selectChasiSrvyFndtnList202312(QustnrRespondInfoVO qustnrRespondInfoVO) throws Exception{ + return (List) list("QustnrRespondInfo.selectChasiSrvyFndtnList202312", qustnrRespondInfoVO); + } + public QustnrRespondInfoVO selectSiteIdQustnrTmplat(QustnrRespondInfoVO qustnrRespondInfoVO) throws Exception{ return (QustnrRespondInfoVO) select("QustnrRespondInfo.selectSiteIdQustnrTmplat", qustnrRespondInfoVO); } diff --git a/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ScholInfoController.java b/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ScholInfoController.java index 0e271025..543af111 100644 --- a/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ScholInfoController.java +++ b/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ScholInfoController.java @@ -373,6 +373,7 @@ public class ScholInfoController { System.out.println(vEEduChasiVO.getQustnrTmplatId()); System.out.println(vEEduChasiVO.getQestnrId()); System.out.println(vEEduChasiVO.getQustnrRespondId()); + System.out.println(qustnrRespondInfoVO.getQustnrTmplatId()); System.out.println(qustnrRespondInfoVO.getQestnrId()); @@ -396,10 +397,14 @@ public class ScholInfoController { */ //참석 답변 정보 try { - List chasiSrvyList = egovQustnrRespondInfoService.selectChasiSrvyList202312(qustnrRespondInfoVO); - model.addAttribute("qestnrRespondent", chasiSrvyList.get(0).getQestnrRespondent()); - model.addAttribute("qestnrParticipant", chasiSrvyList.get(0).getQestnrParticipant()); + List chasiSrvyList = egovQustnrRespondInfoService.selectChasiSrvyFndtnList202312(qustnrRespondInfoVO); + //model.addAttribute("qestnrRespondent", chasiSrvyList.get(0).getQestnrRespondent()); + //model.addAttribute("qestnrParticipant", chasiSrvyList.get(0).getQestnrParticipant()); + System.out.println("chasiSrvyList.get(0).getPrcsAplctPrdOrd()"); + System.out.println(chasiSrvyList.get(0).getPrcsAplctPrdOrd()); + System.out.println(chasiSrvyList.get(0).getPrcsAplctPrdOrd()); model.addAttribute("chasiSrvyList", chasiSrvyList); + model.addAttribute("chasiSrvyListCnt", chasiSrvyList.size()); }catch(Exception ex) { System.out.println("Exception vEEduAplctOnlnService.updateBulk"); } diff --git a/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java index 564c536f..e6c0b233 100644 --- a/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java +++ b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java @@ -232,7 +232,7 @@ public class FndtnEnhanceTrnController { vEPrcsDetailVO.setPrcsDiv("10");// 과정구분 VE0015 10-산업종사자, 20-대학생, 30-공무원, 40-일반인, 50-청소년, 60-학부모 } */ - List vEPrcsDetailVOList = vEPrcsAplctPrdService.findByAprvlList(vEPrcsDetailVO); + List vEPrcsDetailVOList = vEPrcsAplctPrdService.findByAprvlQustnrList(vEPrcsDetailVO); // 현재 날짜를 가져옵니다. LocalDate currentDate = LocalDate.now(); @@ -423,7 +423,7 @@ public class FndtnEnhanceTrnController { vEPrcsDetailVO.setSiteId("50"); } - List vEPrcsDetailVOList = vEPrcsAplctPrdService.findByAprvlList(vEPrcsDetailVO); + List vEPrcsDetailVOList = vEPrcsAplctPrdService.findByAprvlQustnrList(vEPrcsDetailVO); // 현재 날짜를 가져옵니다. 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 47e1c39e..ba7ac518 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 @@ -1,5 +1,7 @@ package kcc.ve.aplct.tngrVisitEdu.eduEnd.web; +import java.util.ArrayList; +import java.util.Comparator; import java.util.List; import javax.annotation.Resource; @@ -25,6 +27,7 @@ import kcc.com.utl.user.service.CheckFileUtil; import kcc.com.utl.user.service.CheckLoginUtil; import kcc.com.utl.user.service.QustnrCommonUtil; import kcc.let.uat.uia.service.SsoLoginVO; +import kcc.let.uss.notify.service.NotifyManageService; import kcc.let.uss.olp.qri.service.EgovQustnrRespondInfoService; import kcc.let.uss.olp.qri.service.QustnrRespondInfoVO; import kcc.let.uss.olp.qrm.service.EgovQustnrRespondManageService; @@ -39,6 +42,7 @@ import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduChasiVO; 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.prcsInfo.service.VEPrcsAplctPrdService; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsCntntVO; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsMIXService; @@ -147,6 +151,14 @@ public class EduEndTngrController { @Resource(name = "qustnrCommonUtil") private QustnrCommonUtil qustnrCommonUtil; + //과정차시 관리 + @Resource(name = "vEPrcsAplctPrdService") + private VEPrcsAplctPrdService vEPrcsAplctPrdService; + + //알림 서비스 + @Resource(name = "NotifyManageService") + private NotifyManageService notifyManageService; + /* // 교육신청 서비스단 @@ -846,6 +858,205 @@ public class EduEndTngrController { return modelAndView; } + /** + * 교육설문 등록 - 기반, 기소 - 개별 등록 + */ + @RequestMapping(value="/insertNewSrvyFndtnInfoEAAjax.do") + public ModelAndView insertNewSrvyFndtnInfoEAAjax( HttpServletRequest request + , ModelMap model + , VEEduAplctVO veEduAplctVO + , QustnrRespondInfoVO qustnrRespondInfoVO) throws Exception { + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + try { + // + /* 로그인 체크는 하지 않는다. + + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); + if (loginVO == null) { + modelAndView.addObject("result", "fail"); + modelAndView.addObject("msg", "로그인 해주세요."); + return modelAndView; + } + */ + + //로그인 처리==================================== + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 + + //step1.응답결과가 저장되어 있는지 확인 한다. + //없는 경우만 개별 설문 저장이 가능하다. + + //차시 정보 + + try { + + VEPrcsDetailVO vEPrcsDetailVO = new VEPrcsDetailVO(); + vEPrcsDetailVO.setLctrDivCd(veEduAplctVO.getSiteId()); + vEPrcsDetailVO.setSiteId(veEduAplctVO.getSiteId()); + + vEPrcsDetailVO.setEduAplctOrd(veEduAplctVO.getEduAplctOrd()); + + vEPrcsDetailVO.setUserId(loginVO.getUniqId()); + + List vEPrcsDetailVOList = vEPrcsAplctPrdService.findByAprvlQustnrDetailList(vEPrcsDetailVO); + + if (vEPrcsDetailVOList.size()<=0) { + //해당 설문 차시가 없으면 오류 발생 후 정지 + modelAndView.addObject("result", "fail1"); + return modelAndView; + } + + vEPrcsDetailVO = vEPrcsDetailVOList.get(0); + + if (vEPrcsDetailVO.getQestnrId10Cnt()!=null) { + //해당 설문 결과값이 있으면 오류 발생 후 정지 + modelAndView.addObject("result", "fail2"); + return modelAndView; + + } + + + }catch(Exception ex) { + ex.printStackTrace(); + System.out.println("Exception vEEduAplctOnlnService.updateBulk1"); + } + + //step2.응답결과값을 저장한다. + try { + int i_chasiSrvyListSize = Integer.parseInt(request.getParameter("qestmInfoSize")); + String[] a_qustnrQesitmId = request.getParameterValues("qustnrQesitmId"); + + qustnrRespondInfoVO.setFrstRegisterId(loginVO.getUniqId()); + + + System.out.println("a_qustnrQesitmId.length"); + System.out.println(a_qustnrQesitmId.length); + System.out.println(a_qustnrQesitmId.length); + + for (int i=0;i eduAplctOrdList = new ArrayList(); + eduAplctOrdList.add(vEEduAplctVO.getEduAplctOrd()); + vEEduAplctVO.setEduAplctOrdList(eduAplctOrdList); + notifyManageService.insertNotifyAprvlCd5060CmpltForUser( + loginVO + , vEEduAplctVO.getPrcsAplctPrdOrd() + , vEEduAplctVO.getLctrDivCd() + , vEEduAplctVO.getEduAplctOrdList() + , vEEduAplctVO.getAplctStateCd() + ); + + + + modelAndView.addObject("result", "success"); + } catch (Exception e) { + modelAndView.addObject("result", ""); + } + + + + + return modelAndView; + } + /** * 교육설문조사 등록 로직 */ @@ -1314,4 +1525,26 @@ public class EduEndTngrController { return p_paginationInfo; } + + private String cmpltChkAndMakeNmber(String lctrDivCd) throws Exception { + // 현재 년도 + String currentYear = String.valueOf(java.time.Year.now()); + + VEEduAplctVO vEEduAplctVO = new VEEduAplctVO(); + + vEEduAplctVO.setLctrDivCd(lctrDivCd); + + List vEEduAplctVOList = vEEduMIXService.selectEduCmpltCrtfcNmbrList(vEEduAplctVO); + + // 값이 있으면 있는 값에 최대값 구하고 + // 값이 없으면 초기값 설정 + String maxCrtfcNmbr = vEEduAplctVOList.stream() + .map(VEEduAplctVO::getEduCmpltCrtfcNmbr) + .max(Comparator.comparingInt(item -> Integer.parseInt(item.split("-")[1]))) + .orElse( currentYear + "-00000"); // 기본값 설정 + + int nextNumber = Integer.parseInt(maxCrtfcNmbr.split("-")[1]) + 1; + + return currentYear + "-" + String.format("%05d", nextNumber); + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsAplctPrdService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsAplctPrdService.java index d779eea6..8e8e72ef 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsAplctPrdService.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsAplctPrdService.java @@ -1,65 +1,71 @@ -package kcc.ve.instr.tngrVisitEdu.prcsInfo.service; - -import java.util.List; -import java.util.Map; - -import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; -import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO; - -public interface VEPrcsAplctPrdService { - - //C - void insert(VEPrcsDetailVO paramVO) throws Exception; - - //R - VEPrcsDetailVO selectDetail(VEPrcsDetailVO paramVO) throws Exception; - - //U - int update(VEPrcsDetailVO paramVO) throws Exception; - - //D - int delete(VEPrcsDetailVO paramVO) throws Exception; - - //L - List selectList(VEPrcsDetailVO paramVO) throws Exception; - - - List selectList4Fndth(VEPrcsDetailVO paramVO) throws Exception; - - - //Page List - List selectPagingList(VEPrcsDetailVO paramVO) throws Exception; - - //기반강화, 기소유예 - List selectPagingList4Fndth(VEPrcsDetailVO paramVO) throws Exception; - - //R - VEPrcsDetailVO selectDetailNewOne(VEPrcsDetailVO paramVO) throws Exception; - - VEPrcsDetailVO selectDetailNewOne4Fndth(VEPrcsDetailVO paramVO) throws Exception; - - List selectinstrAsgnmPopupPagingList(VEPrcsDetailVO vEPrcsDetailVO); - - List findByAprvlList(VEPrcsDetailVO vEPrcsDetailVO); - - Map findAllDashboardCnt(VEPrcsDetailVO vEPrcsDetailVO); - - VEPrcsDetailVO selectDetailByOrd(VEPrcsDetailVO vEPrcsDetailVO) throws Exception; - - void updateOneColumn(VEPrcsDetailVO vEPrcsDetailVO) throws Exception; - - VEPrcsDetailVO findByCnclInfo(VEPrcsDetailVO vEPrcsDetailVO); - - void etcInsert(VEPrcsDetailVO vEPrcsDetailVO); - - VEPrcsDetailVO selectEtc(String prcsAplctPrdOrd); - - void updateEtc(VEPrcsDetailVO vEPrcsDetailVO); - - List selectSchduleManagerList(VEPrcsDetailVO vEPrcsDetailVO); - - Map findAllSspnldtmtDashboardCnt(VEPrcsDetailVO vEPrcsDetailVO); - - List selectOneDayBeforeTrainingStartDate(VEPrcsDetailVO vEPrcsDetailVO); - -} +package kcc.ve.instr.tngrVisitEdu.prcsInfo.service; + +import java.util.List; +import java.util.Map; + +import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO; + +public interface VEPrcsAplctPrdService { + + //C + void insert(VEPrcsDetailVO paramVO) throws Exception; + + //R + VEPrcsDetailVO selectDetail(VEPrcsDetailVO paramVO) throws Exception; + + //U + int update(VEPrcsDetailVO paramVO) throws Exception; + + //D + int delete(VEPrcsDetailVO paramVO) throws Exception; + + //L + List selectList(VEPrcsDetailVO paramVO) throws Exception; + + + List selectList4Fndth(VEPrcsDetailVO paramVO) throws Exception; + + + //Page List + List selectPagingList(VEPrcsDetailVO paramVO) throws Exception; + + //기반강화, 기소유예 + List selectPagingList4Fndth(VEPrcsDetailVO paramVO) throws Exception; + + //R + VEPrcsDetailVO selectDetailNewOne(VEPrcsDetailVO paramVO) throws Exception; + + VEPrcsDetailVO selectDetailNewOne4Fndth(VEPrcsDetailVO paramVO) throws Exception; + + List selectinstrAsgnmPopupPagingList(VEPrcsDetailVO vEPrcsDetailVO); + + //신청목록-실무역량강화, 기소유예 old + List findByAprvlList(VEPrcsDetailVO vEPrcsDetailVO); + + //신청목록-실무역량강화, 기소유예 new -설문조사, 이수증 처리용 + List findByAprvlQustnrList(VEPrcsDetailVO vEPrcsDetailVO); + + //신청목록-실무역량강화, 기소유예 new -설문조사, 이수증 처리용 - 상세찾기용 + List findByAprvlQustnrDetailList(VEPrcsDetailVO vEPrcsDetailVO); + + Map findAllDashboardCnt(VEPrcsDetailVO vEPrcsDetailVO); + + VEPrcsDetailVO selectDetailByOrd(VEPrcsDetailVO vEPrcsDetailVO) throws Exception; + + void updateOneColumn(VEPrcsDetailVO vEPrcsDetailVO) throws Exception; + + VEPrcsDetailVO findByCnclInfo(VEPrcsDetailVO vEPrcsDetailVO); + + void etcInsert(VEPrcsDetailVO vEPrcsDetailVO); + + VEPrcsDetailVO selectEtc(String prcsAplctPrdOrd); + + void updateEtc(VEPrcsDetailVO vEPrcsDetailVO); + + List selectSchduleManagerList(VEPrcsDetailVO vEPrcsDetailVO); + + Map findAllSspnldtmtDashboardCnt(VEPrcsDetailVO vEPrcsDetailVO); + + List selectOneDayBeforeTrainingStartDate(VEPrcsDetailVO vEPrcsDetailVO); + +} 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 b3268882..ece5ee21 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 @@ -204,7 +204,10 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable { private String eduPrcsOrd; private String cmmNotifyOrd; // - + private String qestnrId10Cnt; + private String qestnrId20Cnt; + private String qestnrId30Cnt; + public String getEduPrcsOrd() { return eduPrcsOrd; @@ -992,6 +995,24 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable { public void setPhone(String phone) { this.phone = phone; } + public String getQestnrId10Cnt() { + return qestnrId10Cnt; + } + public void setQestnrId10Cnt(String qestnrId10Cnt) { + this.qestnrId10Cnt = qestnrId10Cnt; + } + public String getQestnrId20Cnt() { + return qestnrId20Cnt; + } + public void setQestnrId20Cnt(String qestnrId20Cnt) { + this.qestnrId20Cnt = qestnrId20Cnt; + } + public String getQestnrId30Cnt() { + return qestnrId30Cnt; + } + public void setQestnrId30Cnt(String qestnrId30Cnt) { + this.qestnrId30Cnt = qestnrId30Cnt; + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdDAO.java index cf136268..97f2030b 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdDAO.java @@ -1,136 +1,142 @@ -package kcc.ve.instr.tngrVisitEdu.prcsInfo.service.impl; - -import java.util.List; -import java.util.Map; - -import org.springframework.stereotype.Repository; - -import egovframework.rte.psl.dataaccess.EgovAbstractDAO; -import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; -import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO; -import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEAPrcsAplctPrdInstrAsgnmVO; -import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; - -@Repository("vEPrcsAplctPrdDAO") -public class VEPrcsAplctPrdDAO extends EgovAbstractDAO { - - /** - * 등록 - C - * @param VELctrDetailVO - * @throws Exception - */ - public void insert(VEPrcsDetailVO paramVO) throws Exception { - insert("VEPrcsAplctPrdDAO.insert", paramVO); - } - - /** - * 상세보기 - R - * @param CndtnTrgtInfoMngVO - * @return - * @throws Exception - */ - public VEPrcsDetailVO selectDetail(VEPrcsDetailVO paramVO) throws Exception { - return (VEPrcsDetailVO) select("VEPrcsAplctPrdDAO.selectDetail", paramVO); - } - - /** - * 수정 - U - * @param CndtnTrgtInfoMngVO - * @return - * @throws Exception - */ - public int update(VEPrcsDetailVO paramVO) throws Exception { - return update("VEPrcsAplctPrdDAO.update", paramVO); - } - - /** - * 삭제 - D - * @param addrAgencyVO - * @return - * @throws Exception - */ - public int delete(VEPrcsDetailVO paramVO) throws Exception { - return delete("VEPrcsAplctPrdDAO.delete", paramVO); - } - - //L - public List selectList(VEPrcsDetailVO paramVO) throws Exception { - List tlist = (List) list("VEPrcsAplctPrdDAO.selectList", paramVO); - return tlist; - } - - public List selectList4Fndth(VEPrcsDetailVO paramVO) throws Exception { - List tlist = (List) list("VEPrcsAplctPrdDAO.selectList4Fndth", paramVO); - return tlist; - } - - - /** - * L - Page - * @param addrVO - * @return - * @throws Exception - */ - public List selectPagingList(VEPrcsDetailVO paramVO) throws Exception { - List tlist = (List) list("VEPrcsAplctPrdDAO.selectPagingList", paramVO); - return tlist; - } - - public List selectPagingList4Fndth(VEPrcsDetailVO paramVO) throws Exception { - List tlist = (List) list("VEPrcsAplctPrdDAO.selectPagingList4Fndth", paramVO); - return tlist; - } - - public VEPrcsDetailVO selectDetailNewOne(VEPrcsDetailVO paramVO) throws Exception { - return (VEPrcsDetailVO) select("VEPrcsAplctPrdDAO.selectDetailNewOne", paramVO); - } - - public VEPrcsDetailVO selectDetailNewOne4Fndth(VEPrcsDetailVO paramVO) throws Exception { - return (VEPrcsDetailVO) select("VEPrcsAplctPrdDAO.selectDetailNewOne4Fndth", paramVO); - } - - public List selectinstrAsgnmPopupPagingList(VEPrcsDetailVO vEPrcsDetailVO) { - return (List) list("VEPrcsAplctPrdDAO.selectinstrAsgnmPopupPagingList", vEPrcsDetailVO); - } - - public List findByAprvlList(VEPrcsDetailVO vEPrcsDetailVO) { - return (List) list("VEPrcsAplctPrdDAO.findByAprvlList", vEPrcsDetailVO); - } - - public Map findAllDashboardCnt(VEPrcsDetailVO vEPrcsDetailVO) { - return (Map) select("VEPrcsAplctPrdDAO.findAllDashboardCnt", vEPrcsDetailVO); - } - - public Map findAllSspnldtmtDashboardCnt(VEPrcsDetailVO vEPrcsDetailVO) { - return (Map) select("VEPrcsAplctPrdDAO.findAllSspnldtmtDashboardCnt", vEPrcsDetailVO); - } - - public VEPrcsDetailVO selectDetailByOrd(VEPrcsDetailVO vEPrcsDetailVO) throws Exception { - return (VEPrcsDetailVO) select("VEPrcsAplctPrdDAO.selectDetailByOrd", vEPrcsDetailVO); - } - - public VEPrcsDetailVO findByCnclInfo(VEPrcsDetailVO paramVO) { - return (VEPrcsDetailVO) select("VEPrcsAplctPrdDAO.findByCnclInfo", paramVO); - } - - public void etcInsert(VEPrcsDetailVO vEPrcsDetailVO) { - insert("VEPrcsAplctPrdDAO.etcInsert", vEPrcsDetailVO); - } - - public VEPrcsDetailVO selectEtc(String prcsAplctPrdOrd) { - return (VEPrcsDetailVO) select("VEPrcsAplctPrdDAO.selectEtc", prcsAplctPrdOrd); - } - - public void updateEtc(VEPrcsDetailVO vEPrcsDetailVO) { - update("VEPrcsAplctPrdDAO.updateEtc", vEPrcsDetailVO); - } - - public List selectSchduleManagerList(VEPrcsDetailVO vEPrcsDetailVO) { - return (List) list("VEPrcsAplctPrdDAO.selectSchduleManagerList", vEPrcsDetailVO); - } - - public List selectOneDayBeforeTrainingStartDate(VEPrcsDetailVO vEPrcsDetailVO) { - return (List) list("VEPrcsAplctPrdDAO.selectOneDayBeforeTrainingStartDate", vEPrcsDetailVO); - } - -} +package kcc.ve.instr.tngrVisitEdu.prcsInfo.service.impl; + +import java.util.List; +import java.util.Map; + +import org.springframework.stereotype.Repository; + +import egovframework.rte.psl.dataaccess.EgovAbstractDAO; +import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; + +@Repository("vEPrcsAplctPrdDAO") +public class VEPrcsAplctPrdDAO extends EgovAbstractDAO { + + /** + * 등록 - C + * @param VELctrDetailVO + * @throws Exception + */ + public void insert(VEPrcsDetailVO paramVO) throws Exception { + insert("VEPrcsAplctPrdDAO.insert", paramVO); + } + + /** + * 상세보기 - R + * @param CndtnTrgtInfoMngVO + * @return + * @throws Exception + */ + public VEPrcsDetailVO selectDetail(VEPrcsDetailVO paramVO) throws Exception { + return (VEPrcsDetailVO) select("VEPrcsAplctPrdDAO.selectDetail", paramVO); + } + + /** + * 수정 - U + * @param CndtnTrgtInfoMngVO + * @return + * @throws Exception + */ + public int update(VEPrcsDetailVO paramVO) throws Exception { + return update("VEPrcsAplctPrdDAO.update", paramVO); + } + + /** + * 삭제 - D + * @param addrAgencyVO + * @return + * @throws Exception + */ + public int delete(VEPrcsDetailVO paramVO) throws Exception { + return delete("VEPrcsAplctPrdDAO.delete", paramVO); + } + + //L + public List selectList(VEPrcsDetailVO paramVO) throws Exception { + List tlist = (List) list("VEPrcsAplctPrdDAO.selectList", paramVO); + return tlist; + } + + public List selectList4Fndth(VEPrcsDetailVO paramVO) throws Exception { + List tlist = (List) list("VEPrcsAplctPrdDAO.selectList4Fndth", paramVO); + return tlist; + } + + + /** + * L - Page + * @param addrVO + * @return + * @throws Exception + */ + public List selectPagingList(VEPrcsDetailVO paramVO) throws Exception { + List tlist = (List) list("VEPrcsAplctPrdDAO.selectPagingList", paramVO); + return tlist; + } + + public List selectPagingList4Fndth(VEPrcsDetailVO paramVO) throws Exception { + List tlist = (List) list("VEPrcsAplctPrdDAO.selectPagingList4Fndth", paramVO); + return tlist; + } + + public VEPrcsDetailVO selectDetailNewOne(VEPrcsDetailVO paramVO) throws Exception { + return (VEPrcsDetailVO) select("VEPrcsAplctPrdDAO.selectDetailNewOne", paramVO); + } + + public VEPrcsDetailVO selectDetailNewOne4Fndth(VEPrcsDetailVO paramVO) throws Exception { + return (VEPrcsDetailVO) select("VEPrcsAplctPrdDAO.selectDetailNewOne4Fndth", paramVO); + } + + public List selectinstrAsgnmPopupPagingList(VEPrcsDetailVO vEPrcsDetailVO) { + return (List) list("VEPrcsAplctPrdDAO.selectinstrAsgnmPopupPagingList", vEPrcsDetailVO); + } + + public List findByAprvlList(VEPrcsDetailVO vEPrcsDetailVO) { + return (List) list("VEPrcsAplctPrdDAO.findByAprvlList", vEPrcsDetailVO); + } + + public List findByAprvlQustnrList(VEPrcsDetailVO vEPrcsDetailVO) { + return (List) list("VEPrcsAplctPrdDAO.findByAprvlQustnrList", vEPrcsDetailVO); + } + + public List findByAprvlQustnrDetailList(VEPrcsDetailVO vEPrcsDetailVO) { + return (List) list("VEPrcsAplctPrdDAO.findByAprvlQustnrDetailList", vEPrcsDetailVO); + } + + public Map findAllDashboardCnt(VEPrcsDetailVO vEPrcsDetailVO) { + return (Map) select("VEPrcsAplctPrdDAO.findAllDashboardCnt", vEPrcsDetailVO); + } + + public Map findAllSspnldtmtDashboardCnt(VEPrcsDetailVO vEPrcsDetailVO) { + return (Map) select("VEPrcsAplctPrdDAO.findAllSspnldtmtDashboardCnt", vEPrcsDetailVO); + } + + public VEPrcsDetailVO selectDetailByOrd(VEPrcsDetailVO vEPrcsDetailVO) throws Exception { + return (VEPrcsDetailVO) select("VEPrcsAplctPrdDAO.selectDetailByOrd", vEPrcsDetailVO); + } + + public VEPrcsDetailVO findByCnclInfo(VEPrcsDetailVO paramVO) { + return (VEPrcsDetailVO) select("VEPrcsAplctPrdDAO.findByCnclInfo", paramVO); + } + + public void etcInsert(VEPrcsDetailVO vEPrcsDetailVO) { + insert("VEPrcsAplctPrdDAO.etcInsert", vEPrcsDetailVO); + } + + public VEPrcsDetailVO selectEtc(String prcsAplctPrdOrd) { + return (VEPrcsDetailVO) select("VEPrcsAplctPrdDAO.selectEtc", prcsAplctPrdOrd); + } + + public void updateEtc(VEPrcsDetailVO vEPrcsDetailVO) { + update("VEPrcsAplctPrdDAO.updateEtc", vEPrcsDetailVO); + } + + public List selectSchduleManagerList(VEPrcsDetailVO vEPrcsDetailVO) { + return (List) list("VEPrcsAplctPrdDAO.selectSchduleManagerList", vEPrcsDetailVO); + } + + public List selectOneDayBeforeTrainingStartDate(VEPrcsDetailVO vEPrcsDetailVO) { + return (List) list("VEPrcsAplctPrdDAO.selectOneDayBeforeTrainingStartDate", vEPrcsDetailVO); + } + +} diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdServiceImpl.java index 90f5bb97..b3456fdc 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdServiceImpl.java @@ -1,147 +1,155 @@ -package kcc.ve.instr.tngrVisitEdu.prcsInfo.service.impl; - - -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - -import egovframework.rte.fdl.idgnr.EgovIdGnrService; -import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; -import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO; -import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEAPrcsAplctPrdInstrAsgnmVO; -import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsAplctPrdService; -import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; - -@Service("vEPrcsAplctPrdService") -public class VEPrcsAplctPrdServiceImpl implements VEPrcsAplctPrdService { - - - //과정신청기간순번 - @Resource(name="prcsAplctPrdGnrService") - private EgovIdGnrService prcsAplctPrdGnrService; - - //과정 - @Resource(name="vEPrcsAplctPrdDAO") - private VEPrcsAplctPrdDAO vEPrcsAplctPrdDAO; - - //과정 - @Resource(name="vEPrcsDAO") - private VEPrcsDAO vEPrcsDAO; - - - //C - public void insert(VEPrcsDetailVO vEPrcsDetailVO) throws Exception { - - vEPrcsAplctPrdDAO.insert(vEPrcsDetailVO); - } - - //R - public VEPrcsDetailVO selectDetail(VEPrcsDetailVO paramVO) throws Exception { - return vEPrcsAplctPrdDAO.selectDetail(paramVO); - } - - //U - public int update(VEPrcsDetailVO paramVO) throws Exception{ -// vEPrcsAplctPrdDAO.update(paramVO); -// return vEPrcsDAO.update(paramVO); - return vEPrcsAplctPrdDAO.update(paramVO); - } - - //D - public int delete(VEPrcsDetailVO paramVO) throws Exception{ - return vEPrcsAplctPrdDAO.delete(paramVO); - } - - //List - public List selectList(VEPrcsDetailVO paramVO) throws Exception{ - return vEPrcsAplctPrdDAO.selectList(paramVO); - } - - public List selectList4Fndth(VEPrcsDetailVO paramVO) throws Exception{ - return vEPrcsAplctPrdDAO.selectList4Fndth(paramVO); - } - - //paging List - public List selectPagingList(VEPrcsDetailVO paramVO) throws Exception{ - return vEPrcsAplctPrdDAO.selectPagingList(paramVO); - } - - public List selectPagingList4Fndth(VEPrcsDetailVO paramVO) throws Exception{ - return vEPrcsAplctPrdDAO.selectPagingList4Fndth(paramVO); - } - - //R - public VEPrcsDetailVO selectDetailNewOne(VEPrcsDetailVO paramVO) throws Exception { - return vEPrcsAplctPrdDAO.selectDetailNewOne(paramVO); - } - - public VEPrcsDetailVO selectDetailNewOne4Fndth(VEPrcsDetailVO paramVO) throws Exception { - return vEPrcsAplctPrdDAO.selectDetailNewOne4Fndth(paramVO); - } - - public VEPrcsDetailVO findByCnclInfo(VEPrcsDetailVO paramVO) { - return vEPrcsAplctPrdDAO.findByCnclInfo(paramVO); - } - - @Override - public List selectinstrAsgnmPopupPagingList(VEPrcsDetailVO vEPrcsDetailVO) { - return vEPrcsAplctPrdDAO.selectinstrAsgnmPopupPagingList(vEPrcsDetailVO); - } - - @Override - public List findByAprvlList(VEPrcsDetailVO vEPrcsDetailVO) { - return vEPrcsAplctPrdDAO.findByAprvlList(vEPrcsDetailVO); - } - - @Override - public Map findAllDashboardCnt(VEPrcsDetailVO vEPrcsDetailVO) { - return vEPrcsAplctPrdDAO.findAllDashboardCnt(vEPrcsDetailVO); - } - - @Override - public Map findAllSspnldtmtDashboardCnt(VEPrcsDetailVO vEPrcsDetailVO) { - return vEPrcsAplctPrdDAO.findAllSspnldtmtDashboardCnt(vEPrcsDetailVO); - } - - public VEPrcsDetailVO selectDetailByOrd(VEPrcsDetailVO vEPrcsDetailVO) throws Exception { - return vEPrcsAplctPrdDAO.selectDetailByOrd(vEPrcsDetailVO); - } - - public void updateOneColumn(VEPrcsDetailVO vEPrcsDetailVO) throws Exception { - vEPrcsAplctPrdDAO.update(vEPrcsDetailVO); - } - - @Override - public void etcInsert(VEPrcsDetailVO vEPrcsDetailVO) { - vEPrcsAplctPrdDAO.etcInsert(vEPrcsDetailVO); - } - - @Override - public VEPrcsDetailVO selectEtc(String prcsAplctPrdOrd) { - return vEPrcsAplctPrdDAO.selectEtc(prcsAplctPrdOrd); - } - - @Override - public void updateEtc(VEPrcsDetailVO vEPrcsDetailVO) { - System.out.println(vEPrcsDetailVO.getPrpsCn()); -// System.out.println(vEPrcsDetailVO.getChrctCn()); -// System.out.println(vEPrcsDetailVO.getPrcsAplctPrdOrd()); - - vEPrcsAplctPrdDAO.updateEtc(vEPrcsDetailVO); - } - - @Override - public List selectSchduleManagerList(VEPrcsDetailVO vEPrcsDetailVO) { - return vEPrcsAplctPrdDAO.selectSchduleManagerList(vEPrcsDetailVO); - } - - @Override - public List selectOneDayBeforeTrainingStartDate(VEPrcsDetailVO vEPrcsDetailVO) { - return vEPrcsAplctPrdDAO.selectOneDayBeforeTrainingStartDate(vEPrcsDetailVO); - - } - -} +package kcc.ve.instr.tngrVisitEdu.prcsInfo.service.impl; + + +import java.util.List; +import java.util.Map; + +import javax.annotation.Resource; + +import org.springframework.stereotype.Service; + +import egovframework.rte.fdl.idgnr.EgovIdGnrService; +import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsAplctPrdService; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; + +@Service("vEPrcsAplctPrdService") +public class VEPrcsAplctPrdServiceImpl implements VEPrcsAplctPrdService { + + + //과정신청기간순번 + @Resource(name="prcsAplctPrdGnrService") + private EgovIdGnrService prcsAplctPrdGnrService; + + //과정 + @Resource(name="vEPrcsAplctPrdDAO") + private VEPrcsAplctPrdDAO vEPrcsAplctPrdDAO; + + //과정 + @Resource(name="vEPrcsDAO") + private VEPrcsDAO vEPrcsDAO; + + + //C + public void insert(VEPrcsDetailVO vEPrcsDetailVO) throws Exception { + + vEPrcsAplctPrdDAO.insert(vEPrcsDetailVO); + } + + //R + public VEPrcsDetailVO selectDetail(VEPrcsDetailVO paramVO) throws Exception { + return vEPrcsAplctPrdDAO.selectDetail(paramVO); + } + + //U + public int update(VEPrcsDetailVO paramVO) throws Exception{ +// vEPrcsAplctPrdDAO.update(paramVO); +// return vEPrcsDAO.update(paramVO); + return vEPrcsAplctPrdDAO.update(paramVO); + } + + //D + public int delete(VEPrcsDetailVO paramVO) throws Exception{ + return vEPrcsAplctPrdDAO.delete(paramVO); + } + + //List + public List selectList(VEPrcsDetailVO paramVO) throws Exception{ + return vEPrcsAplctPrdDAO.selectList(paramVO); + } + + public List selectList4Fndth(VEPrcsDetailVO paramVO) throws Exception{ + return vEPrcsAplctPrdDAO.selectList4Fndth(paramVO); + } + + //paging List + public List selectPagingList(VEPrcsDetailVO paramVO) throws Exception{ + return vEPrcsAplctPrdDAO.selectPagingList(paramVO); + } + + public List selectPagingList4Fndth(VEPrcsDetailVO paramVO) throws Exception{ + return vEPrcsAplctPrdDAO.selectPagingList4Fndth(paramVO); + } + + //R + public VEPrcsDetailVO selectDetailNewOne(VEPrcsDetailVO paramVO) throws Exception { + return vEPrcsAplctPrdDAO.selectDetailNewOne(paramVO); + } + + public VEPrcsDetailVO selectDetailNewOne4Fndth(VEPrcsDetailVO paramVO) throws Exception { + return vEPrcsAplctPrdDAO.selectDetailNewOne4Fndth(paramVO); + } + + public VEPrcsDetailVO findByCnclInfo(VEPrcsDetailVO paramVO) { + return vEPrcsAplctPrdDAO.findByCnclInfo(paramVO); + } + + @Override + public List selectinstrAsgnmPopupPagingList(VEPrcsDetailVO vEPrcsDetailVO) { + return vEPrcsAplctPrdDAO.selectinstrAsgnmPopupPagingList(vEPrcsDetailVO); + } + + @Override + public List findByAprvlList(VEPrcsDetailVO vEPrcsDetailVO) { + return vEPrcsAplctPrdDAO.findByAprvlList(vEPrcsDetailVO); + } + + @Override + public List findByAprvlQustnrList(VEPrcsDetailVO vEPrcsDetailVO) { + return vEPrcsAplctPrdDAO.findByAprvlQustnrList(vEPrcsDetailVO); + } + + @Override + public List findByAprvlQustnrDetailList(VEPrcsDetailVO vEPrcsDetailVO) { + return vEPrcsAplctPrdDAO.findByAprvlQustnrDetailList(vEPrcsDetailVO); + } + + @Override + public Map findAllDashboardCnt(VEPrcsDetailVO vEPrcsDetailVO) { + return vEPrcsAplctPrdDAO.findAllDashboardCnt(vEPrcsDetailVO); + } + + @Override + public Map findAllSspnldtmtDashboardCnt(VEPrcsDetailVO vEPrcsDetailVO) { + return vEPrcsAplctPrdDAO.findAllSspnldtmtDashboardCnt(vEPrcsDetailVO); + } + + public VEPrcsDetailVO selectDetailByOrd(VEPrcsDetailVO vEPrcsDetailVO) throws Exception { + return vEPrcsAplctPrdDAO.selectDetailByOrd(vEPrcsDetailVO); + } + + public void updateOneColumn(VEPrcsDetailVO vEPrcsDetailVO) throws Exception { + vEPrcsAplctPrdDAO.update(vEPrcsDetailVO); + } + + @Override + public void etcInsert(VEPrcsDetailVO vEPrcsDetailVO) { + vEPrcsAplctPrdDAO.etcInsert(vEPrcsDetailVO); + } + + @Override + public VEPrcsDetailVO selectEtc(String prcsAplctPrdOrd) { + return vEPrcsAplctPrdDAO.selectEtc(prcsAplctPrdOrd); + } + + @Override + public void updateEtc(VEPrcsDetailVO vEPrcsDetailVO) { + System.out.println(vEPrcsDetailVO.getPrpsCn()); +// System.out.println(vEPrcsDetailVO.getChrctCn()); +// System.out.println(vEPrcsDetailVO.getPrcsAplctPrdOrd()); + + vEPrcsAplctPrdDAO.updateEtc(vEPrcsDetailVO); + } + + @Override + public List selectSchduleManagerList(VEPrcsDetailVO vEPrcsDetailVO) { + return vEPrcsAplctPrdDAO.selectSchduleManagerList(vEPrcsDetailVO); + } + + @Override + public List selectOneDayBeforeTrainingStartDate(VEPrcsDetailVO vEPrcsDetailVO) { + return vEPrcsAplctPrdDAO.selectOneDayBeforeTrainingStartDate(vEPrcsDetailVO); + + } + +} 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 f7d2380c..91732f62 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java @@ -994,6 +994,8 @@ public class CndtnPrcsInfoMngController { // 이수 상태라면 if("20".equals(vEEduAplctVO.getAplctStateCd())) { vEEduAplctVO.setEduCmpltCrtfcNmbr(this.cmpltChkAndMakeNmber(vEEduAplctVO.getLctrDivCd())); + }else if("10".equals(vEEduAplctVO.getAplctStateCd())) { + vEEduAplctVO.setEduCmpltCrtfcNmbr("DEL"); } // 신청상세정보 상태값 update diff --git a/src/main/resources/egovframework/sqlmap/let/uss/olp/qri/EgovQustnrRespondInfo_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/let/uss/olp/qri/EgovQustnrRespondInfo_SQL_Tibero.xml index 250d7284..1ce6a9d6 100644 --- a/src/main/resources/egovframework/sqlmap/let/uss/olp/qri/EgovQustnrRespondInfo_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/let/uss/olp/qri/EgovQustnrRespondInfo_SQL_Tibero.xml @@ -728,6 +728,102 @@ ORDER BY a.qestn_sn, A.QUSTNR_QESITM_ID + + + + + + + + @@ -207,13 +207,18 @@ - + - + --%> @@ -304,6 +312,7 @@ + ${resultInfo.frstRegistPnttm} (${resultInfo.siteIdCd}) diff --git a/src/main/webapp/WEB-INF/jsp/uss/olp/qqm/UserItnQustnrQestnManageRegist.jsp b/src/main/webapp/WEB-INF/jsp/uss/olp/qqm/UserItnQustnrQestnManageRegist.jsp index 36d1967c..ae8e6c42 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/olp/qqm/UserItnQustnrQestnManageRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/olp/qqm/UserItnQustnrQestnManageRegist.jsp @@ -120,6 +120,12 @@ function addRow(){ alert("질문유형이 만족도 평가에서는 문항을 추가 할 수 없습니다."); return ; } + + if (itemTable.rows.length*1>=5){ + alert("5문항까지만 추가가 가능합니다."); + return; + } + var oRow = itemTable.insertRow(); th = document.createElement('th'); th.innerHTML = itemTable.rows.length;; diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrFndtnPopList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrFndtnPopList.jsp index a6c032cd..044fe766 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrFndtnPopList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrFndtnPopList.jsp @@ -84,6 +84,7 @@ } function replyCalculation(){ + /* var qestnrParticipant = $("#qestnrParticipant").val(); //참석자 수량 var qestnrRespondent = $("#qestnrRespondent").val(); //응답자 수량 @@ -108,14 +109,19 @@ var responseRateTxt = (Number(qestnrRespondent) / Number(qestnrParticipant)*Number(100)).toFixed(1); $("#responseRate").text(responseRateTxt + "%"); $("#noResponse").text(Number(qestnrParticipant) - Number(qestnrRespondent)); + */ } function popupSrvySendSubmit(){ + - var qestmSize = parseInt($("#qestmInfoSize").val()); //평가문항 수량 - var qestnrParticipant = parseInt($("#qestnrParticipant").val()); //참석자 수량 - var qestnrRespondent = parseInt($("#qestnrRespondent").val()); //응답자 수량 + var v_qestmSize = parseInt('${chasiSrvyListCnt}'); //평가문항 수량 + var v_sum = 0; + //var qestmSize = parseInt($("#qestmInfoSize").val()); //평가문항 수량 + //var qestnrParticipant = parseInt($("#qestnrParticipant").val()); //참석자 수량 + //var qestnrRespondent = parseInt($("#qestnrRespondent").val()); //응답자 수량 + /* if(qestnrParticipant == null || qestnrParticipant == ""){ alert("참석자 수량을 넣어주세요"); $("#qestnrParticipant").focus(); @@ -133,14 +139,21 @@ $("#qestnrRespondent").focus(); return } + */ - for(var i=0; i < qestmSize; i++){ - var verySatisfied = $("#verySatisfied_"+i).val(); - var satisfied = $("#satisfied_"+i).val(); - var neither = $("#neither_"+i).val(); - var dissatisfied = $("#dissatisfied_"+i).val(); - var veryDissatisfied = $("#veryDissatisfied_"+i).val(); + for(var i=0; i < v_qestmSize; i++){ + //var verySatisfied = $("#verySatisfied_"+i).val(); + //var satisfied = $("#satisfied_"+i).val(); + //var neither = $("#neither_"+i).val(); + //var dissatisfied = $("#dissatisfied_"+i).val(); + //var veryDissatisfied = $("#veryDissatisfied_"+i).val(); + + + var radioNumber = $("input:radio[name='resultList["+i+"].responseRadio']:checked").val(); // 체크된 value + + //alert(radioNumber); + /* if(verySatisfied == null || verySatisfied == ""){ alert((i+1)+"번 [매우만족] 만족도를 정확히 넣어주세요"); $("#verySatisfied_"+i).focus(); @@ -166,14 +179,28 @@ $("#veryDissatisfied_"+i).focus(); return } + */ - var sum = Number(verySatisfied) + Number(satisfied) + Number(neither) + Number(dissatisfied) + Number(veryDissatisfied); - - if(qestnrRespondent != sum ){ - alert((i+1)+"문항의 합계가 응답수량과 맞지 않습니다."); - $("#verySatisfied_"+i).focus(); - return + //var sum = Number(verySatisfied) + Number(satisfied) + Number(neither) + Number(dissatisfied) + Number(veryDissatisfied); + + radioNumber = Number(radioNumber); + + if (radioNumber){ + v_sum = v_sum + 1; } + + + } + + //alert(v_sum); + //alert(v_qestmSize); + + + + if(v_qestmSize != v_sum ){ + alert("문항의 합계가 응답수량과 맞지 않습니다."); + $("#verySatisfied_"+i).focus(); + return } if(confirm("설문결과를 등록 하시겠습니까?")){ @@ -182,7 +209,9 @@ $.ajax({ type:"POST" - ,url:"${pageContext.request.contextPath}/web/ve/aplct/tngrVisitEdu/eduEnd/insertNewSrvyInfoAjax.do" + //,url:"${pageContext.request.contextPath}/web/ve/aplct/tngrVisitEdu/eduEnd/insertNewSrvyInfoAjax.do" + ,url:"${pageContext.request.contextPath}/web/ve/aplct/tngrVisitEdu/eduEnd/insertNewSrvyFndtnInfoEAAjax.do" + ,data: data ,dataType:'json' ,async: false @@ -191,8 +220,9 @@ ,cache: false ,success:function(returnData){ if(returnData.result == 'success'){ - alert("설문결과가 등록 되었습니다."); - window.location.reload(); + //alert("설문결과가 등록 되었습니다."); + fn_statusChg(); + //window.location.reload(); }else if(returnData.result == 'fail'){ alert(returnData.msg); location.href="/web/user/login/ssoLogin.do?test=test"; @@ -204,6 +234,37 @@ }); } } + + // 기반 / 기소 공통 + function fn_statusChg(){ + var data = new FormData(document.getElementById("statusChgForm")); + + var url = "${pageContext.request.contextPath}/web/ve/aplct/tngrVisitEdu/eduEnd/updateAplctStateCdAjax.do"; + $.ajax({ + type:"POST", + url: url, + data: data, + dataType:'json', + async: false, + processData: false, + contentType: false, + cache: false, + success:function(returnData){ + if(returnData.result == "success"){ + alert("설문결과가 등록 되었습니다."); + //alert("변경되었습니다."); + // 새로고침 + window.location.reload(); + } + }, + error:function(request , status, error){ + alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error); + } + }); + + //event.stopImmediatePropagation(); + + } $(document).ready(function(){ /* @@ -225,22 +286,31 @@ $(document).ready(function(){ }) +
+ + + + +
+
- - + + +
-

강의만족도 결과 등록

+

설문 결과 등록

+ - + + - - - - - + - - - - - + @@ -382,30 +447,68 @@ $(document).ready(function(){ - - - - - @@ -416,7 +519,7 @@ $(document).ready(function(){
- +
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.jsp index 2411d164..43ba2bf2 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.jsp @@ -406,57 +406,72 @@ $(document).ready(function(){
- + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp index c2bf5504..5aa470bb 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp @@ -107,6 +107,41 @@ form.submit(); } + + //설문 팝업 + function fncQustnrList( + id //aplctOrd + , chId //chasiOrd + , p_site_id_cd //10,20,30 + , p_action //select, insert + , p_qustnrTmplatId //select, insert + , p_qestnrId //select, insert + , p_qustnrRespondId //select, insert + ) { + + paramObj = { + "eduAplctOrd" : id + ,"eduChasiOrd" : chId + ,"siteIdCd" : p_site_id_cd + ,"siteId" : "60" //설문정보를 위해서 설문지의 대상값을 넣는다. VE0011 10-청소년, 20-성인,30-체험, 40-외부, 50-기반, 60-기소 + + ,"action" : p_action + + ,"qustnrTmplatId" : p_qustnrTmplatId + ,"qestnrId" : p_qestnrId + ,"qustnrRespondId" : p_qustnrRespondId + }; + + commonPopLayeropen( + //"${pageContext.request.contextPath}/web/ve/aplct/cpyrgExprnClsrm/scholInfo/popup/qustnrPopList.do" + "${pageContext.request.contextPath}/web/ve/aplct/cpyrgExprnClsrm/scholInfo/popup/qustnrFndtnPopList.do" + , 800 + , 700 + , paramObj + , "Y" + , "QustnrList" + ); + } @@ -149,7 +184,7 @@ - +<%-- --%> @@ -157,7 +192,7 @@ - + @@ -174,18 +209,59 @@ + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp index 8aa09fdb..a98aa357 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp @@ -371,7 +371,40 @@ $(document).ready(function(){ } }); } - + + //설문 팝업 + function fncQustnrList( + id //aplctOrd + , chId //chasiOrd + , p_site_id_cd //10,20,30 + , p_action //select, insert + , p_qustnrTmplatId //select, insert + , p_qestnrId //select, insert + , p_qustnrRespondId //select, insert + ) { + + paramObj = { + "eduAplctOrd" : id + ,"eduChasiOrd" : chId + ,"siteIdCd" : p_site_id_cd + ,"siteId" : "60" //설문정보를 위해서 설문지의 대상값을 넣는다. VE0011 10-청소년, 20-성인,30-체험, 40-외부, 50-기반, 60-기소 + + ,"action" : p_action + + ,"qustnrTmplatId" : p_qustnrTmplatId + ,"qestnrId" : p_qestnrId + ,"qustnrRespondId" : p_qustnrRespondId + }; + + commonPopLayeropen( + "${pageContext.request.contextPath}/web/ve/aplct/cpyrgExprnClsrm/scholInfo/popup/qustnrFndtnPopList.do" + , 800 + , 700 + , paramObj + , "Y" + , "QustnrList" + ); + } @@ -514,49 +547,62 @@ $(document).ready(function(){ list.aplctStateCd ne 30 list.aprvlCd ne 40 --> - - - - - - - - - - - - - - - - <%-- - - - - - 교육완료 - - - - - - --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> + +<%-- --%> +<%-- --%> -<%-- --%> - - - + + + + + + + + + + + + + + 대상설문없음 + + + + + + + + + - + + + + + + + - + + + From aa2a61bda6d32459cd6652ee6e3edcd6083bd7fb Mon Sep 17 00:00:00 2001 From: myname Date: Thu, 28 Dec 2023 14:30:19 +0900 Subject: [PATCH 6/6] =?UTF-8?q?2023-12-28=2014:30=20=EC=84=B1=EC=9D=B8?= =?UTF-8?q?=EA=B0=95=EC=82=AC=20=EC=B6=9C=EB=A0=A5=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ve/instr/tngrVisitEdu/eduInfo/service/VEEduChasiVO.java | 6 ++++++ .../sqlmap/ve/instr/VEInstr_MIX_SQL_Tibero.xml | 6 ++++-- .../webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngList.jsp | 4 ++-- 3 files changed, 12 insertions(+), 4 deletions(-) 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 b3c13f71..e705ce90 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 @@ -724,5 +724,11 @@ public class VEEduChasiVO extends ComDefaultVO implements Serializable { public void setSiteId(String siteId) { this.siteId = siteId; } + public String getEduAprvlCd() { + return eduAprvlCd; + } + public void setEduAprvlCd(String eduAprvlCd) { + this.eduAprvlCd = eduAprvlCd; + } } diff --git a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Tibero.xml index 680bc235..fcf76093 100644 --- a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Tibero.xml @@ -1063,10 +1063,12 @@ AND d.use_yn='Y' ) WHERE 1=1 + AND a.use_yn='Y' + AND a00.instrDiv =a.instr_div AND a00.userId =a.user_id - AND a00.instrDetailOrd=a.instr_detail_ord - AND userId IN + AND a00.instrDetailOrd=a.instr_detail_ord + AND a00.userId IN #userIdList[]# 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 c94725f5..9a8813dc 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngList.jsp @@ -364,8 +364,8 @@ viewer.hideToolbarItem(["save"]); 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://119.193.215.98:9989/offedu/ve/aplct/adultVisitEdu/eduAplct/instrDetailListAjax.do?p_searchQlfctEndYn='+v_searchQlfctEndYn+'&p_searcDivCd='+v_searcDivCd+'&p_searchKeyword='+v_searchKeyword+']'); + //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+']'); } \ No newline at end of file
평가문항, 매우만족, 만족, 보통, 불만족, 매우 불만족 입력
평가문항매우만족만족보통불만족매우불만족
+ +
- - 		+ + checked + + + > + ${QestmInfo.answer5} +
+ - - 		+ + checked + + + > + ${QestmInfo.answer4} +
+ - - 		+ + checked + + + > + ${QestmInfo.answer3} +
+ - - 		+ + checked + + + > + ${QestmInfo.answer2} +
+ - + + checked + + + > + ${QestmInfo.answer1} +
+
- - - - + + +<%-- --%> +<%-- --%> +<%-- --%> - - - +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> + +<%-- --%> +<%-- --%> + + + + + + + + + + + + + + + + 대상설문없음 + + + + + + + + + - + + + + - - - - - - - - - - - - - - + + - + - 교육완료 + 설문등록 후 발급 - From 0cae9576f327f2b52d02dbc45cb1fab10a43d89d Mon Sep 17 00:00:00 2001 From: myname Date: Thu, 28 Dec 2023 10:30:26 +0900 Subject: [PATCH 3/6] =?UTF-8?q?2023-12-28=2010:30=20=EC=8B=A4=EB=AC=B4?= =?UTF-8?q?=EC=97=AD=EB=9F=89=EA=B0=95=ED=99=94=20=EC=A0=84=EC=B2=B4=20?= =?UTF-8?q?=EB=AA=A9=EB=A1=9D=20=EC=BF=BC=EB=A6=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml | 3 +++ 1 file changed, 3 insertions(+) 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 ce353b9b..aec75fbc 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 @@ -485,6 +485,9 @@ , A.RNDS_ORD , A.APLCT_CN , A.RSLT_ATCH_FILE_ID + + , A.EDU_MD_CD + , A.FEE_INSTT_CD From 0dc40cc265135c112a514e42d7de37c27119e124 Mon Sep 17 00:00:00 2001 From: jiwoo Date: Thu, 28 Dec 2023 12:06:32 +0900 Subject: [PATCH 4/6] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=EC=9E=90=20=EB=A7=88=EC=9D=B4=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=20=EC=B2=AD=EC=86=8C=EB=85=84/=EC=84=B1=EC=9D=B8=20?= =?UTF-8?q?=EC=B9=B4=EC=9A=B4=ED=8A=B8=20=EB=B0=8F=20=EB=AA=A9=EB=A1=9D=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/kcc/let/my/web/MyPageController.java | 67 +++++++++++++++++-- .../eduInfo/service/VEEduChasiVO.java | 7 ++ .../sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml | 5 +- .../WEB-INF/jsp/web/my/myPageDashBoard.jsp | 56 ++++++++-------- .../aplct/adultVisitEdu/eduEnd/eduEndList.jsp | 2 +- 5 files changed, 103 insertions(+), 34 deletions(-) diff --git a/src/main/java/kcc/let/my/web/MyPageController.java b/src/main/java/kcc/let/my/web/MyPageController.java index 75020404..9edb1c16 100644 --- a/src/main/java/kcc/let/my/web/MyPageController.java +++ b/src/main/java/kcc/let/my/web/MyPageController.java @@ -102,7 +102,8 @@ public class MyPageController { * 청소년 진행목록 */ { - VEEduAplctVO vEEduAplctVO = new VEEduAplctVO(); + /*진행/종료 건수에서 신청/완료 건수로 변경 > 진행/종료는 차시 기준. 신청은 신청 기준이라 조회쿼리 변경*/ + /*VEEduAplctVO vEEduAplctVO = new VEEduAplctVO(); // 청소년 // 사용자 교육신청 차시 리스트 @@ -138,14 +139,45 @@ public class MyPageController { model.addAttribute("tngrMap", tngrMap); - model.addAttribute("tngrList", tngrList); + model.addAttribute("tngrList", tngrList);*/ + + //신청목록 + VEEduAplctVO vEEduAplctVO = new VEEduAplctVO(); + vEEduAplctVO.setUserId(loginVO.getUniqId()); + vEEduAplctVO.setLctrDivCd(VeConstants.LCTR_DIV_CD_10); + vEEduAplctVO.setRecordCountPerPage(10); + vEEduAplctVO.setFirstIndex(0); + List vEEduAplctVOList = vEEduMIXService.selectPagingApplyList(vEEduAplctVO); + int tngrAplctCnt = 0; + if(vEEduAplctVOList != null && !vEEduAplctVOList.isEmpty()) { + tngrAplctCnt = vEEduAplctVOList.get(0).getTotCnt(); + } + model.addAttribute("tngrAplctCnt", tngrAplctCnt); + + //완료목록 + VEEduChasiVO vEEduChasiVO = new VEEduChasiVO(); + vEEduChasiVO.setLctrDivCd(VeConstants.LCTR_DIV_CD_10); + vEEduChasiVO.setAprvlCd(VeConstants.STATUS_CD_EDU_SELCT); + vEEduChasiVO.setUserId(loginVO.getUniqId()); + vEEduChasiVO.setSearchStartDt(vEEduAplctVO.getSearchStartDt()); + vEEduChasiVO.setSearchEndDt(vEEduAplctVO.getSearchEndDt()); + vEEduChasiVO.setRecordCountPerPage(10); + vEEduChasiVO.setFirstIndex(0); + List vEEduChasiVOList = vEEduMIXService.selectChasiList(vEEduChasiVO); + int tngrEndCnt = 0; + if(vEEduChasiVOList != null && !vEEduChasiVOList.isEmpty()) { + tngrEndCnt = vEEduChasiVOList.get(0).getTotCnt(); + } + model.addAttribute("tngrEndCnt", tngrEndCnt); + model.addAttribute("tngrList", vEEduChasiVOList); } /* * 성인 진행목록 */ { - VEEduAplctVO vEEduAplctVO = new VEEduAplctVO(); + /*진행/종료 건수에서 신청/완료 건수로 변경 > 진행/종료는 차시 기준. 신청은 신청 기준이라 조회쿼리 변경*/ + /*VEEduAplctVO vEEduAplctVO = new VEEduAplctVO(); // 청소년 // 사용자 교육신청 차시 리스트 @@ -176,7 +208,34 @@ public class MyPageController { ); model.addAttribute("adultMap", adultMap); - model.addAttribute("adultList", adultList); + model.addAttribute("adultList", adultList);*/ + //신청목록 + VEEduAplctVO vEEduAplctVO = new VEEduAplctVO(); + vEEduAplctVO.setUserId(loginVO.getUniqId()); + vEEduAplctVO.setLctrDivCd(VeConstants.LCTR_DIV_CD_20); + vEEduAplctVO.setRecordCountPerPage(10); + vEEduAplctVO.setFirstIndex(0); + List vEEduAplctVOList = vEEduMIXService.selectPagingList(vEEduAplctVO); + int adultAplctCnt = 0; + if(vEEduAplctVOList != null && !vEEduAplctVOList.isEmpty()) { + adultAplctCnt = vEEduAplctVOList.get(0).getTotCnt(); + } + model.addAttribute("adultAplctCnt", adultAplctCnt); + + //완료목록 + VEEduChasiVO vEEduChasiVO = new VEEduChasiVO(); + vEEduChasiVO.setLctrDivCd(VeConstants.LCTR_DIV_CD_20); + vEEduChasiVO.setAprvlCd(VeConstants.STATUS_CD_EDU_SELCT); + vEEduChasiVO.setUserId(loginVO.getUniqId()); + vEEduChasiVO.setRecordCountPerPage(10); + vEEduChasiVO.setFirstIndex(0); + List vEEduChasiVOList = vEEduMIXService.selectChasiList(vEEduChasiVO); + int adultEndCnt = 0; + if(vEEduChasiVOList != null && !vEEduChasiVOList.isEmpty()) { + adultEndCnt = vEEduChasiVOList.get(0).getTotCnt(); + } + model.addAttribute("adultEndCnt", adultEndCnt); + model.addAttribute("adultList", vEEduChasiVOList); } /* * 체험교실 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 f0676dc3..d06fd879 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 @@ -135,6 +135,7 @@ public class VEEduChasiVO extends ComDefaultVO implements Serializable { private String prcsAplctPrdOrd; //기간과정신청정보 private String eduTrgt; //대상 + private String eduAprvlCd; //교육 신청상태 public String getQustnrQesitmId10Cnt() { @@ -715,5 +716,11 @@ public class VEEduChasiVO extends ComDefaultVO implements Serializable { public void setEduTrgt(String eduTrgt) { this.eduTrgt = eduTrgt; } + public String getEduAprvlCd() { + return eduAprvlCd; + } + public void setEduAprvlCd(String eduAprvlCd) { + this.eduAprvlCd = eduAprvlCd; + } } 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 be253a6a..d4654d3a 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 @@ -884,7 +884,7 @@ - AND A.CHRG_NM LIKE '%' || #searchChrgNm# , '%') + AND A.CHRG_NM LIKE '%' || #searchChrgNm# || '%' @@ -3804,7 +3804,8 @@ , A.INSTT_NM AS InsttNm , A.hope_sbjct AS hopeSbjct , A.INSTT_DIV_CD AS insttDivCd - , A.EDU_SLCT_CD AS eduSlctCd + , A.EDU_SLCT_CD AS eduSlctCd + , A.APRVL_CD AS eduAprvlCd , B.EDU_CHASI_ORD AS eduChasiOrd /* , TO_CHAR(B.EDU_HOPE_DT,'YYYY.MM.DD') AS eduHopeDt diff --git a/src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp b/src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp index 5ea4bc87..2d3c4b21 100644 --- a/src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp @@ -19,6 +19,8 @@ <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> <%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> <%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> + @@ -289,29 +291,31 @@ - - - - - - - - - - - 해당설문없음 - - + + +<%-- --%> +<%-- --%> + + + + + +<%-- --%> +<%-- --%> +<%-- --%> + + + + + +<%-- --%> +<%-- --%> +<%-- --%> + +<%-- --%> +<%-- --%> @@ -327,20 +331,73 @@ <%-- --%> <%-- --%> - - - - - - - 교육완료 + + + + + + + + + + + + + 대상설문없음 + + + + + + + + + - + + + + - + + +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> + +<%-- --%> +<%-- --%> + +<%-- --%> +<%-- --%> + + + + + + + 설문등록 후 발급 + + + - + + +
교육일자 신청결과 설문조사이수증
+<%-- --%> +<%-- --%> + +<%-- --%> +<%-- --%> + +<%-- --%> +<%-- --%> + +<%-- --%> +<%-- --%> + - - - - - 설문완료 + + + + + + + + + + + + + 대상설문없음 + + + + + + + + + - + + + + - - + +