diff --git a/src/main/java/kcc/kccadr/sch/service/SchduleManageVO.java b/src/main/java/kcc/kccadr/sch/service/SchduleManageVO.java index 0712abcd..87453af6 100644 --- a/src/main/java/kcc/kccadr/sch/service/SchduleManageVO.java +++ b/src/main/java/kcc/kccadr/sch/service/SchduleManageVO.java @@ -114,6 +114,10 @@ public class SchduleManageVO extends ComDefaultVO { private String trgt; //대상 private String prsnl; //인원 private String instrNm; //강사이름 + private String isltnScholYn; //도시벽지 여부 + private String divCd; //청소년 교육 구분 + private String eduPlace; //교육장소 + private String prcsNm; //온라인콘텐츠 신청 항목 @@ -445,6 +449,39 @@ public class SchduleManageVO extends ComDefaultVO { public void setInstrNm(String instrNm) { this.instrNm = instrNm; } + + public String getIsltnScholYn() { + return isltnScholYn; + } + + public void setIsltnScholYn(String isltnScholYn) { + this.isltnScholYn = isltnScholYn; + } + + public String getDivCd() { + return divCd; + } + + public void setDivCd(String divCd) { + this.divCd = divCd; + } + + public String getEduPlace() { + return eduPlace; + } + + public void setEduPlace(String eduPlace) { + this.eduPlace = eduPlace; + } + + public String getPrcsNm() { + return prcsNm; + } + + public void setPrcsNm(String prcsNm) { + this.prcsNm = prcsNm; + } + } diff --git a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAplctMng/web/EduAplctMngTngrController.java b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAplctMng/web/EduAplctMngTngrController.java index 88c3e8e9..d7230817 100644 --- a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAplctMng/web/EduAplctMngTngrController.java +++ b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAplctMng/web/EduAplctMngTngrController.java @@ -676,29 +676,69 @@ public class EduAplctMngTngrController { schduleManageVO.setSearchStartDt(schduleManageVO.getSearchStartDt().split("T")[0].replaceAll("-", "")); List list= schduleManageService.selectSchManageStatusList(schduleManageVO); - + list = egovCryptoUtil.decryptSchduleManageVOList(list); + List excelData = new ArrayList<>(); excelData.addAll(list); // 세팅값 String title = "청소년 찾아가는 저작권 교육 - 교육일정"; int[] width = { - 4000 - , 4000 - , 4000 - }; // 너비 - - String[] header = { - "교육일자" - , "학교(기관)명" - , "교육시간" - }; - - //VO name과 일치 시킨다. - String[] order = { - "DateTxt" - , "Title" - , "TimeTxt" - }; + 8000 + , 4000 + , 4000 + , 4000 + , 4000 + , 12000 + , 4000 + , 4000 + , 4000 + , 6000 + , 4000 + , 4000 + , 4000 + , 4000 + , 4000 + , 12000 + }; // 너비 + + String[] header = { + "교육일시" + , "교육구분" + , "학교(기관)명" + , "학교구분" + , "도시벽지학교여부" + , "주소" + , "담당자" + , "휴대폰" + , "전화" + , "이메일" + , "강사" + , "구분" + , "교육장소" + , "대상" + , "인원" + , "온라인콘텐츠 신청 항목" + }; + + //VO name과 일치 시킨다. + String[] order = { + "EduDate" + , "EduSlctCd" + , "Title" + , "InsttDivCd" + , "IsltnScholYn" + , "AddrDetail" + , "ChrgNm" + , "Clphone" + , "Phone" + , "Email" + , "InstrNm" + , "DivCd" + , "EduPlace" + , "Trgt" + , "Prsnl" + , "PrcsNm" + }; // 호출 SXSSFWorkbook workbook = ExcelUtil.makeSimpleFruitExcelWorkbook(excelData , header, order, width, title); diff --git a/src/main/resources/egovframework/sqlmap/kccadr/sch/SchduleManage_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/sch/SchduleManage_SQL_Mysql.xml index e1792126..d7b3c402 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/sch/SchduleManage_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/sch/SchduleManage_SQL_Mysql.xml @@ -82,6 +82,13 @@ , aa.trgt , aa.prsnl , aa.instrNm + + , IF(aa.isltnScholYn = 'Y', '예', '아니오') AS isltnScholYn + , aa.eduPlace + + , aa.divCd + , aa.prcsNm + FROM( SELECT @@ -116,7 +123,13 @@ a.RQST_CN rqstCn, b.trgt trgt, b.prsnl prsnl, - f.instr_nm instrNm + f.instr_nm instrNm, + a.isltn_schol_yn isltnScholYn, + a.edu_place eduPlace + + ,g.code_nm divCd, + h.prcs_nm prcsNm + FROM ve_edu_aplct a , ve_edu_chasi b @@ -124,6 +137,10 @@ , lettccmmndetailcode d , ve_edu_chasi_instr_asgnm e , ve_instr_detail f + + , lettccmmndetailcode g + , ve_prcs h + WHERE 1=1 AND IFNULL(A.USE_YN, 'Y') != 'N' @@ -142,12 +159,26 @@ AND c.code_id = 'VE0007' AND c.code = a.edu_slct_cd - AND d.code_id = 'VE0012' - AND d.code = a.instt_div_cd + + + AND d.code_id = 'VE0009' + AND d.code = a.schol_div_cd + + + AND d.code_id = 'VE0012' + AND d.code = a.instt_div_cd + + AND e.EDU_CHASI_ORD = b.EDU_CHASI_ORD AND f.user_id = e.user_id AND f.use_yn = 'Y' AND f.instr_div = #lctrDivCd# + + AND g.code_id = 'VE0010' + AND g.code = b.div_cd + AND h.use_Yn = 'Y' + AND h.prcs_ord = a.edu_cn + )aa ORDER BY START diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cmm/SchduleManagerPopDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cmm/SchduleManagerPopDetail.jsp index d5f14b34..36670eaf 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cmm/SchduleManagerPopDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cmm/SchduleManagerPopDetail.jsp @@ -211,19 +211,13 @@

대상

- +

인원

- -

구분

- - - -