From 0823d8554469d3fe2542731e4ea4aa3b46b4f433 Mon Sep 17 00:00:00 2001 From: myname Date: Tue, 21 Nov 2023 17:08:43 +0900 Subject: [PATCH] =?UTF-8?q?2023-11-21=2017:08=20=EA=B5=90=EC=9C=A1?= =?UTF-8?q?=EB=B0=B0=EC=B9=98=ED=99=95=EC=A0=95=EA=B4=80=EB=A6=AC=20?= =?UTF-8?q?=EC=9E=91=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eduInfo/service/VEEduAplctVO.java | 17 ++ .../web/EduAsgnmCnfrmMngTngrController.java | 4 + .../sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml | 149 +++++++++++++++++- .../tngrVisitEdu/eduAsgnmCnfrmMngList.jsp | 86 +++++++++- .../tngrVisitEdu/eduAplct/eduAplctDetail.jsp | 43 +++-- .../tngrVisitEdu/eduAplct/eduAplctReg.jsp | 31 ++++ .../tngrVisitEdu/eduEnd/eduEndDetail.jsp | 41 +++-- 7 files changed, 313 insertions(+), 58 deletions(-) diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java index c37489a7..9681d29b 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java @@ -145,6 +145,11 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable { private String cnclAtchFileId; // private String cnclCn; // + + private String acmdtAplctOrd; //숙박신청 순번 + private String acmdtSbmtYn; //숙박신청 제출여부 + + public int getChasi() { return chasi; } @@ -1731,6 +1736,18 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable { public void setTable(String table) { this.table = table; } + public String getAcmdtAplctOrd() { + return acmdtAplctOrd; + } + public void setAcmdtAplctOrd(String acmdtAplctOrd) { + this.acmdtAplctOrd = acmdtAplctOrd; + } + public String getAcmdtSbmtYn() { + return acmdtSbmtYn; + } + public void setAcmdtSbmtYn(String acmdtSbmtYn) { + this.acmdtSbmtYn = acmdtSbmtYn; + } } diff --git a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAsgnmCnfrmMng/web/EduAsgnmCnfrmMngTngrController.java b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAsgnmCnfrmMng/web/EduAsgnmCnfrmMngTngrController.java index 13c19775..72f21bec 100644 --- a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAsgnmCnfrmMng/web/EduAsgnmCnfrmMngTngrController.java +++ b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAsgnmCnfrmMng/web/EduAsgnmCnfrmMngTngrController.java @@ -204,6 +204,9 @@ public class EduAsgnmCnfrmMngTngrController { vEEduAplctVO = this.setPagingStep2(vEEduAplctVO, paginationInfo); vEEduAplctVO.setNotiUserId(user.getUniqId()); vEEduAplctVO.setMenuNo(session.getAttribute("menuNo").toString()); + + vEEduAplctVO.setSearchAsgnmAprvlCd("30"); + List vEEduAplctVOList = vEEduMIXService.selectPagingList(vEEduAplctVO); //이름 복호화 VEEduAplctVO vo = new VEEduAplctVO(); @@ -719,6 +722,7 @@ public class EduAsgnmCnfrmMngTngrController { // 청소년 vEEduAplctVO.setLctrDivCd(VeConstants.LCTR_DIV_CD_10); vEEduAplctVO.setMode(VeConstants.MODE_EXCEL); + vEEduAplctVO.setSearchAsgnmAprvlCd("30"); List list = vEEduMIXService.selectExcelList(vEEduAplctVO); //list = egovCryptoUtil.decryptVEEduExcelVOList(list); 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 5d9b4525..2aaf30bc 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 @@ -494,6 +494,14 @@ , '' ) AS eduDt */ + + , i.instr_nm AS instrNm + , i.asgnm_aprvl_cd AS asgnmAprvlCd + , i.user_id AS userId + + , j.acmdt_aplct_ord AS acmdtAplctOrd + , j.sbmt_yn AS acmdtSbmtYn + , j.aprvl_cd AS acmdtAprvlCd FROM VE_EDU_APLCT A LEFT OUTER JOIN ( SELECT @@ -565,6 +573,52 @@ ON A.EDU_APLCT_ORD = G.EDU_APLCT_ORD LEFT OUTER JOIN ve_edu_rslt_rprt H ON A.EDU_APLCT_ORD = H.EDU_APLCT_ORD + + /* 청소년 교육배치확정 목록에서 사용 */ + LEFT OUTER JOIN ( + + SELECT a.edu_aplct_ord + , a.edu_chasi_ord + , b.instr_nm + , a.asgnm_aprvl_cd + , a.user_id + FROM ve_edu_chasi_instr_asgnm a + , ve_instr_detail b + WHERE a.user_id=b.user_id + AND b.use_yn='Y' + + ) I + ON ( + CC.EDU_APLCT_ORD = I.EDU_APLCT_ORD + AND CC.EDU_CHASI_ORD = I.EDU_CHASI_ORD + ) + + LEFT OUTER JOIN ( + + SELECT bb.edu_aplct_ord + , bb.edu_chasi_ord + , bb.acmdt_aplct_ord + , bb.sbmt_yn + , bb.aprvl_cd + FROM ( + SELECT a.edu_aplct_ord + , a.edu_chasi_ord + , max(acmdt_aplct_ord) AS acmdt_aplct_ord + FROM ve_acmdt_aplct a + WHERE a.use_yn='Y' + GROUP BY a.edu_aplct_ord + , a.edu_chasi_ord + )aa + , ve_acmdt_aplct bb + WHERE aa.edu_aplct_ord=bb.edu_aplct_ord + AND aa.edu_chasi_ord=bb.edu_chasi_ord + AND aa.acmdt_aplct_ord=bb.acmdt_aplct_ord + + )J + ON ( + CC.EDU_APLCT_ORD = J.EDU_APLCT_ORD + AND CC.EDU_CHASI_ORD = J.EDU_CHASI_ORD + ) WHERE 1=1 /* @@ -581,6 +635,24 @@ + + + AND J.sbmt_yn='Y' + AND J.aprvl_cd is null + + + AND NVL(J.sbmt_yn,'N')='N' + + + AND J.sbmt_yn='Y' + AND J.aprvl_cd ='40' + + + AND J.sbmt_yn='Y' + AND J.aprvl_cd ='50' + + + /* AND ( SELECT @@ -592,6 +664,7 @@ AND ZZ.sbmt_yn = 'Y' ) > 0 + */ @@ -602,6 +675,15 @@ AND A.APRVL_CD=#aprvlCd# + + + AND I.asgnm_aprvl_cd is null + + + AND I.asgnm_aprvl_cd = #searchAsgnmAprvlCd# + + + AND CC.EDU_HOPE_DT = ]]> REPLACE(#searchStartDt#, '.' , '') @@ -702,13 +784,16 @@ + + AND (A.SCHOL_INSTT_NM LIKE '%' || #searchKeyword# || '%' OR A.CHRG_NM LIKE '%' || #searchKeyword# || '%') + AND A.SCHOL_INSTT_NM LIKE '%' || #searchKeyword# || '%' AND A.CHRG_NM LIKE '%' || #searchKeyword# || '%' - + AND A.CHRG_NM LIKE '%' || #searchChrgNm# , '%') @@ -3978,7 +4063,11 @@ a.aprvl_cd AS aprvlCd */ (SELECT a0.code_nm FROM LETTCCMMNDETAILCODE a0 WHERE a0.code_id='VE0003' AND a0.code=a.aprvl_cd) AS aprvlCd + /* , DATE_FORMAT(a.aprvl_pnttm,'%Y-%m-%d') AS aprvlPnttm + */ + + , TO_CHAR(a.aprvl_pnttm,'YYYY-MM-DD') AS aprvlPnttm /* , a.edu_slct_area_cd AS eduSlctAreaCd @@ -3993,8 +4082,10 @@ /* , DATE_FORMAT(TO_DATE(b.edu_hope_dt, 'YYYYMMDD'),'%Y-%m-%d') AS eduHopeDt */ - + /* , DATE_FORMAT(STR_TO_DATE(b.edu_hope_dt, '%Y%m%d'),'%Y-%m-%d') AS eduHopeDt + */ + , b.edu_hope_dt AS eduHopeDt , a.schol_instt_nm AS scholInsttNm , a.edu_cn AS eduCn @@ -4010,7 +4101,10 @@ , a.chrg_nm AS chrgNm , NVL(b.instr_cnfrm_cd, 'N') AS instrCnfrmCd , d.asgnm_aprvl_cd AS asgnmAprvlCd + /* , DATE_FORMAT(d.asgnm_aprvl_pnttm,'%Y-%m-%d') AS asgnmAprvlPnttm + */ + , TO_CHAR(d.asgnm_aprvl_pnttm,'YYYY-MM-DD') AS asgnmAprvlPnttm , b.div_cd AS lctrDivCd , NVL(b.chasi, 0) AS chasi @@ -4020,10 +4114,16 @@ , a.addr AS addr , a.addr_detail AS addrDetail , e.instr_nm AS instrNm + /* , IF(e.user_id IS NOT NULL , '('||SUBSTRING(e.user_id,INSTR(e.user_id,'_')+1)*1||')' ,'' ) AS userIdNum + */ + , CASE + WHEN e.user_id IS NOT NULL THEN '('||SUBSTRING(e.user_id,INSTR(e.user_id,'_')+1)*1||')' + ELSE '' + END AS userIdNum , e.instr_div AS instrDiv , e.email AS instrEmail , e.phone AS instrPhone @@ -4125,8 +4225,51 @@ ) + + + + AND d.asgnm_aprvl_cd is null + + + AND d.asgnm_aprvl_cd = #searchAsgnmAprvlCd# + + + + + + + AND d.sbmt_yn='Y' + AND d.aprvl_cd is null + + + AND NVL(d.sbmt_yn,'N')='N' + + + AND d.sbmt_yn='Y' + AND d.aprvl_cd ='40' + + + AND d.sbmt_yn='Y' + AND d.aprvl_cd ='50' + + + /* + AND + ( + SELECT + COUNT(1) + FROM + ve_acmdt_aplct ZZ + WHERE + A.edu_aplct_ord = ZZ.edu_aplct_ord + AND + ZZ.sbmt_yn = 'Y' + ) > 0 + */ + + ORDER BY - 1=1 + 1 , b.edu_chasi_ord diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAsgnmCnfrmMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAsgnmCnfrmMngList.jsp index 52a7cfde..bce5f939 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAsgnmCnfrmMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAsgnmCnfrmMngList.jsp @@ -98,6 +98,18 @@ form.submit(); form.target = "_self"; } + + // 숙박신청내용보기 + function fncEduAcmdtAplctDetailInfo(userId,p_eduAplctOrd,p_eduChasiOrd) { //메뉴생성 화면 호출 + document.createForm.frstRegisterId.value = userId; + document.createForm.eduAplctOrd.value = p_eduAplctOrd; + document.createForm.eduChasiOrd.value = p_eduChasiOrd; + + document.createForm.action = ""; + window.open("#", "_eduAcmdtAplctDetailPop", "scrollbars = no, top=100px, left=100px, height=550px, width=750px"); + document.createForm.target = "_eduAcmdtAplctDetailPop"; + document.createForm.submit(); + } 교육확정관리 @@ -138,7 +150,13 @@ selectedValue="${vEEduAplctVO.searchEduSlctAreaCd}" defaultValue='' defaultText='전체' /> -   학교(기관)명 :  + + + @@ -158,6 +176,25 @@ + + +
+
+

숙박필터

+
+
+ + + +
+
+ @@ -221,27 +259,27 @@ - +<%-- --%> - +<%-- --%> 번호 교육일자 - 확정일자 + 지역 학교(기관)명 학교구분 도서벽지여부 - 신청자 - 확정수 - 숙박신청수 + 강사명 + + 숙박신청여부 @@ -270,11 +308,13 @@ + @@ -305,14 +345,37 @@ - + + + + + + + 확정 + + + 미확정 + + + + + + + 미신청 + + + + @@ -333,5 +396,12 @@ + +
+ + + + +
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctDetail.jsp index ea39e44a..6110eb9c 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctDetail.jsp @@ -789,32 +789,27 @@

학교구분

- - - + -

도서학교구분

+

도서벽지구분

- ${info.isltnYn eq 'Y' ? '예' : '아니오'} - - - -

벽지학교구분

- - ${info.isltn2Yn eq 'Y' ? '예' : '아니오'} - - - -

접적학교구분

- - ${info.isltn3Yn eq 'Y' ? '예' : '아니오'} - - - -

인구감소지역여부

- - ${info.ppltnReducAreaYn eq 'Y' ? '예' : '아니오'} - + + + + 예 + + + 예 + + + 예 + + + 아니오 + + + +

주소

diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp index b80f2caa..d4599ddf 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp @@ -931,6 +931,37 @@ var psblFlag = "Y";//학생 신청가능기간여부 체크 + + +

필수입력 항목*

+

도서벽지학교여부

+ + + + + checked + + + checked + + + checked + + + + + + + disabled> + + + + +

필수입력 항목*

diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp index a1d8b952..18d012a1 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp @@ -843,31 +843,26 @@

학교구분

- - - + -

도서학교구분

+

도서벽지구분

- ${info.isltnYn eq 'Y' ? '예' : '아니오'} - - - -

벽지학교구분

- - ${info.isltn2Yn eq 'Y' ? '예' : '아니오'} - - - -

접적학교구분

- - ${info.isltn3Yn eq 'Y' ? '예' : '아니오'} - - - -

인구감소지역여부

- - ${info.ppltnReducAreaYn eq 'Y' ? '예' : '아니오'} + + + + 예 + + + 예 + + + 예 + + + 아니오 + + +