From c8d84851f244f80628f2a750a542c192e0de0ccb Mon Sep 17 00:00:00 2001 From: jiwoo Date: Tue, 25 Jul 2023 16:13:14 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=EC=9E=90=20=EC=BD=94=EB=93=9C=EA=B4=80=EB=A6=AC(?= =?UTF-8?q?=EA=B8=B0=EC=A1=B4=EC=97=90=20=EC=95=88=EC=97=B4=EB=A6=BC),=20?= =?UTF-8?q?=EB=A9=94=EB=89=B4=EA=B4=80=EB=A6=AC(=EC=82=AD=EC=A0=9C=20?= =?UTF-8?q?=EC=8B=9C=20=EC=83=9D=EC=84=B1=EB=82=B4=EC=97=AD=EB=8F=84=20?= =?UTF-8?q?=EC=A0=84=EB=B6=80=20=EC=82=AD=EC=A0=9C=ED=95=98=EA=B2=8C)=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 --- .../cca/web/EgovCcmCmmnCodeManageController.java | 2 +- .../mcm/web/EgovMenuCreateManageController.java | 8 ++++---- .../let/sym/mnu/mcm/EgovMenuCreat_SQL_Mysql.xml | 10 ++++------ .../let/sym/mnu/mpm/EgovMenuManage_SQL_Mysql.xml | 14 ++++++-------- .../jsp/cmm/sym/ccm/EgovCcmCmmnCodeTree.jsp | 1 + .../jsp/sym/mnu/mpm/EgovMenuCreatSelectJtree.jsp | 1 + 6 files changed, 17 insertions(+), 19 deletions(-) diff --git a/src/main/java/kcc/let/sym/ccm/cca/web/EgovCcmCmmnCodeManageController.java b/src/main/java/kcc/let/sym/ccm/cca/web/EgovCcmCmmnCodeManageController.java index 8385e2db..622015b9 100644 --- a/src/main/java/kcc/let/sym/ccm/cca/web/EgovCcmCmmnCodeManageController.java +++ b/src/main/java/kcc/let/sym/ccm/cca/web/EgovCcmCmmnCodeManageController.java @@ -307,7 +307,7 @@ public class EgovCcmCmmnCodeManageController { @ModelAttribute("searchVO") CmmnDetailCodeVO searchVO, ModelMap model, HttpServletResponse response) throws Exception { ObjectMapper mapper = new ObjectMapper(); - response.setHeader("Content-Type", "text/html;charset=utf-8"); + //response.setHeader("Content-Type", "text/html;charset=utf-8"); PrintWriter out = new PrintWriter(new OutputStreamWriter(response.getOutputStream(), "UTF-8")); //CmmnDetailCodeVO searchVO = new CmmnDetailCodeVO(); diff --git a/src/main/java/kcc/let/sym/mnu/mcm/web/EgovMenuCreateManageController.java b/src/main/java/kcc/let/sym/mnu/mcm/web/EgovMenuCreateManageController.java index 19dc2cfc..ba281665 100644 --- a/src/main/java/kcc/let/sym/mnu/mcm/web/EgovMenuCreateManageController.java +++ b/src/main/java/kcc/let/sym/mnu/mcm/web/EgovMenuCreateManageController.java @@ -439,9 +439,9 @@ public class EgovMenuCreateManageController { int usingOtherSiteCnt = menuCreateManageDAO.selectMenuCreatAuthCnt(menuCreatVO) ; //다른 사이트 아이디가 매뉴를 사용할시 매뉴 삭제안한다. - if(usingOtherSiteCnt == 1){ + //if(usingOtherSiteCnt == 1){ menuManageService.deleteMenuManage(menuManageVO); - } + //} /*LoginVO loginVO = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser(); if(null == loginVO){ @@ -452,9 +452,9 @@ public class EgovMenuCreateManageController { menuCreateManageDAO.deleteMenuCreatAuthNo(menuCreatVO); if(null != progrmManageVO.getProgrmFileNm() && !progrmManageVO.getProgrmFileNm().equals("dir")){ //프로그램만 지움 - if(usingOtherSiteCnt == 1){ //다른 사이트 아이디가 매뉴를 사용할시 매뉴 삭제안한다. + //if(usingOtherSiteCnt == 1){ //다른 사이트 아이디가 매뉴를 사용할시 매뉴 삭제안한다. progrmManageService.deleteProgrm(progrmManageVO); - } + //} } modelAndView.addObject("status", "success"); }catch (Exception e) { diff --git a/src/main/resources/egovframework/sqlmap/let/sym/mnu/mcm/EgovMenuCreat_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/sym/mnu/mcm/EgovMenuCreat_SQL_Mysql.xml index 13f68fab..17ad7050 100644 --- a/src/main/resources/egovframework/sqlmap/let/sym/mnu/mcm/EgovMenuCreat_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/sym/mnu/mcm/EgovMenuCreat_SQL_Mysql.xml @@ -211,13 +211,12 @@ A.MENU_NO > 0 ]]> - AND (B.AUTHOR_CODE = #authorCode# - OR B.AUTHOR_CODE = 'ROLE_USER_MEMBER' - OR B.AUTHOR_CODE = 'ROLE_USER_MANAGER') + AND B.AUTHOR_CODE IN ('ROLE_ANONYMOUS', 'ROLE_USER_MEMBER', 'ROLE_USER_MANAGER') GROUP BY A.MENU_NO - AND B.AUTHOR_CODE = #authorCode# + AND B.AUTHOR_CODE IN ('ROLE_ADMIN', 'ROLE_ADR_ADMIN', 'ROLE_VISIT') + GROUP BY A.MENU_NO ORDER BY A.UPPER_MENU_NO, @@ -235,8 +234,7 @@ DELETE FROM LETTNMENUCREATDTLS - WHERE AUTHOR_CODE=#authorCode# - AND MENU_NO= #menuNo# + WHERE MENU_NO= #menuNo# diff --git a/src/main/webapp/WEB-INF/jsp/cmm/sym/ccm/EgovCcmCmmnCodeTree.jsp b/src/main/webapp/WEB-INF/jsp/cmm/sym/ccm/EgovCcmCmmnCodeTree.jsp index d3877083..3063ea8a 100644 --- a/src/main/webapp/WEB-INF/jsp/cmm/sym/ccm/EgovCcmCmmnCodeTree.jsp +++ b/src/main/webapp/WEB-INF/jsp/cmm/sym/ccm/EgovCcmCmmnCodeTree.jsp @@ -53,6 +53,7 @@ function jstreeInit() { "data" : { "url" : "", "dataType" : "json", + "error": function (jqXHR, textStatus, errorThrown) {$('#kopost_organization').html(textStatus + "//" + errorThrown); }, "data" : function (node) { return {'id' : node.id } } diff --git a/src/main/webapp/WEB-INF/jsp/sym/mnu/mpm/EgovMenuCreatSelectJtree.jsp b/src/main/webapp/WEB-INF/jsp/sym/mnu/mpm/EgovMenuCreatSelectJtree.jsp index ca6482b2..6b928428 100644 --- a/src/main/webapp/WEB-INF/jsp/sym/mnu/mpm/EgovMenuCreatSelectJtree.jsp +++ b/src/main/webapp/WEB-INF/jsp/sym/mnu/mpm/EgovMenuCreatSelectJtree.jsp @@ -48,6 +48,7 @@ function jstreeInit() { "data" : { "url" : "", "dataType" : "json", + "error": function (jqXHR, textStatus, errorThrown) {$('#kopost_organization').html(textStatus + "//" + errorThrown); }, "data" : function (node) { return {'id' : node.id, 'authorCode' : $('#authorCode').val() }; } From 7c22e00e4b6a7dc6d66f5844dcfd32deb52302e0 Mon Sep 17 00:00:00 2001 From: jiwoo Date: Fri, 28 Jul 2023 11:35:21 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=EC=9E=90=20=EC=84=B1=EC=9D=B8=20=EA=B5=90=EC=9C=A1=20?= =?UTF-8?q?=EC=9D=BC=EC=A0=95=EA=B4=80=EB=A6=AC=20>=20=EC=83=81=EC=84=B8?= =?UTF-8?q?=ED=8C=9D=EC=97=85=EC=97=90=20=EB=88=84=EA=B0=80=20=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=EC=B6=94=EA=B0=80,=20=EC=9D=BC=EC=A0=95=20?= =?UTF-8?q?=EC=97=91=EC=85=80=20=EB=8B=A4=EC=9A=B4=EB=A1=9C=EB=93=9C=20?= =?UTF-8?q?=EC=8B=9C=20=EC=A0=95=EB=B3=B4=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kccadr/sch/service/SchduleManageVO.java | 113 ++++++++++++++++++ .../let/utl/fcc/service/EgovCryptoUtil.java | 26 ++++ .../web/EduAplctMngAdultController.java | 35 +++++- .../web/EduAplctMngTngrController.java | 1 + .../kccadr/sch/SchduleManage_SQL_Mysql.xml | 34 +++++- .../sqlmap/ve/edu/VEEduChasi_SQL_Cubrid.xml | 1 - .../oprtn/adultVisitEdu/eduAplctMngList.jsp | 2 +- .../oprtn/adultVisitEdu/eduRsltMngDetail.jsp | 5 +- .../cmm/SchduleManagerPopDetailAdult.jsp | 22 +++- 9 files changed, 225 insertions(+), 14 deletions(-) diff --git a/src/main/java/kcc/kccadr/sch/service/SchduleManageVO.java b/src/main/java/kcc/kccadr/sch/service/SchduleManageVO.java index 6d30b659..5b2abb7c 100644 --- a/src/main/java/kcc/kccadr/sch/service/SchduleManageVO.java +++ b/src/main/java/kcc/kccadr/sch/service/SchduleManageVO.java @@ -96,6 +96,21 @@ public class SchduleManageVO extends ComDefaultVO { private String lastUpdusrId; private Date todate; + + //23.07.26 엑셀 다운로드 항목 추가 + private String eduSlctCd; //교육구분 + private String insttDivCd; //기관구분 + private String eduMd; //교육매체 + private String addr; // 주소 + private String addrDetail; //상세주소 + private String chrgNm; //담당자 + private String jobNm; //담당자 + private String clphone; //휴대폰 + private String phone; //번호 + private String email; //이메일 + private String hopeSbjct; //희망주제 + private String rqstCn; //교육 주제 관련 상세 요청사항 및 사전 질의 + public Date getTodate() { @@ -298,4 +313,102 @@ public class SchduleManageVO extends ComDefaultVO { public void setTimeTxt(String timeTxt) { this.timeTxt = timeTxt; } + + public String getEduSlctCd() { + return eduSlctCd; + } + + public void setEduSlctCd(String eduSlctCd) { + this.eduSlctCd = eduSlctCd; + } + + public String getInsttDivCd() { + return insttDivCd; + } + + public void setInsttDivCd(String insttDivCd) { + this.insttDivCd = insttDivCd; + } + + public String getEduMd() { + return eduMd; + } + + public void setEduMd(String eduMd) { + this.eduMd = eduMd; + } + + public String getAddr() { + return addr; + } + + public void setAddr(String addr) { + this.addr = addr; + } + + public String getAddrDetail() { + return addrDetail; + } + + public void setAddrDetail(String addrDetail) { + this.addrDetail = addrDetail; + } + + public String getChrgNm() { + return chrgNm; + } + + public void setChrgNm(String chrgNm) { + this.chrgNm = chrgNm; + } + + public String getJobNm() { + return jobNm; + } + + public void setJobNm(String jobNm) { + this.jobNm = jobNm; + } + + public String getClphone() { + return clphone; + } + + public void setClphone(String clphone) { + this.clphone = clphone; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getHopeSbjct() { + return hopeSbjct; + } + + public void setHopeSbjct(String hopeSbjct) { + this.hopeSbjct = hopeSbjct; + } + + public String getRqstCn() { + return rqstCn; + } + + public void setRqstCn(String rqstCn) { + this.rqstCn = rqstCn; + } + + } diff --git a/src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java b/src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java index 89e9af0c..f05f2c6c 100644 --- a/src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java +++ b/src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java @@ -14,6 +14,7 @@ import kcc.com.cmm.ComDefaultCodeVO; import kcc.com.cmm.ComDefaultVO; import kcc.com.cmm.service.CmmnDetailCode; import kcc.com.cmm.service.EgovCmmUseService; +import kcc.kccadr.sch.service.SchduleManageVO; import kcc.let.uat.uia.service.SsoLoginVO; import kcc.let.uss.umt.service.UserManageVO; import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEEduExcelVO; @@ -454,6 +455,31 @@ public class EgovCryptoUtil { return p_VEEduSatisfactionExcelVO; } + + + //SchduleManageVO + //- 복호화 + public List decryptSchduleManageVOList(List p_schduleManageVOList){ + + for (int i=0;i list= schduleManageService.selectSchManageStatusList(schduleManageVO); + list = egovCryptoUtil.decryptSchduleManageVOList(list); List excelData = new ArrayList<>(); excelData.addAll(list); @@ -501,19 +502,49 @@ public class EduAplctMngAdultController { 4000 , 4000 , 4000 + , 4000 + , 4000 + , 12000 + , 4000 + , 4000 + , 4000 + , 4000 + , 6000 + , 8000 + , 12000 }; // 너비 String[] header = { "교육일자" + , "교육구분" , "기관(단체)명" - , "교육시간" + , "기관구분" + , "교육매체" + , "장소" + , "담당자" + , "직함" + , "휴대폰" + , "전화" + , "이메일" + , "희망주제" + , "교육 주제 관련 상세 요청사항" }; //VO name과 일치 시킨다. String[] order = { "DateTxt" + , "EduSlctCd" , "Title" - , "TimeTxt" + , "InsttDivCd" + , "EduMd" + , "AddrDetail" + , "ChrgNm" + , "JobNm" + , "Clphone" + , "Phone" + , "Email" + , "HopeSbjct" + , "RqstCn" }; // 호출 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 311787d1..88c3e8e9 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 @@ -486,6 +486,7 @@ public class EduAplctMngTngrController { //사용자 교육신청 차시 리스트 VEEduChasiVO vEEduChasiVO = new VEEduChasiVO(); vEEduChasiVO.setEduAplctOrd(vEEduAplctVO.getEduAplctOrd()); + vEEduChasiVO.setInstrDiv(VeConstants.LCTR_DIV_CD_10); List vEEduChasiVOList = vVEEduChasiService.selectList(vEEduChasiVO); 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 5434cf06..a7d9c507 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 @@ -67,6 +67,17 @@ , to_char( TO_DATETIME(CONCAT(aa.edu_hope_dt, aa.strt_tm),'YYYYMMDDHH24MI'), 'HH24:MI:SS' ) AS timeTxt , aa.url , aa.allDay + , aa.eduSlctCd + , aa.insttDivCd + , aa.eduMd + , aa.addr + ' ' + aa.addrDetail AS addrDetail + , aa.chrgNm + , aa.jobNm + , aa.clphone + , aa.phone + , aa.email + , aa.hopeSbjct + , aa.rqstCn FROM( SELECT @@ -86,10 +97,24 @@ b.strt_tm, b.end_tm, '' url , - 0 allDay - + 0 allDay, + c.code_nm eduSlctCd, + d.code_nm insttDivCd, + a.EDU_MD eduMd, + a.ADDR addr, + a.ADDR_DETAIL addrDetail, + a.CHRG_NM chrgNm, + a.JOB_NM jobNm, + a.CLPHONE clphone, + a.PHONE phone, + a.EMAIL email, + a.HOPE_SBJCT hopeSbjct, + a.RQST_CN rqstCn + FROM ve_edu_aplct a , ve_edu_chasi b + , lettccmmndetailcode c + , lettccmmndetailcode d WHERE 1=1 AND IFNULL(A.USE_YN, 'Y') != 'N' @@ -106,7 +131,10 @@ AND SUBSTRING(b.edu_hope_dt,1,6) = SUBSTRING(DATE_FORMAT(DATE_ADD(TO_DATE(#searchStartDt#,'YYYYMMDD'), INTERVAL 7 day),'%Y%m%d'),1,6) - + AND c.code_id = 'VE0007' + AND c.code = a.edu_slct_cd + AND d.code_id = 'VE0012' + AND d.code = a.instt_div_cd )aa ORDER BY START diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduChasi_SQL_Cubrid.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduChasi_SQL_Cubrid.xml index f4376336..56b81981 100644 --- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduChasi_SQL_Cubrid.xml +++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduChasi_SQL_Cubrid.xml @@ -20,7 +20,6 @@ LEFT OUTER JOIN VE_INSTR_DETAIL D ON (B.USER_ID = D.USER_ID AND D.USE_YN = 'Y' - AND D.instr_div = '10' AND D.instr_div = #instrDiv# diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngList.jsp index d41c25ea..573996e3 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngList.jsp @@ -79,7 +79,7 @@ " /> " /> " /> - +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngDetail.jsp index 11daab95..20287fa3 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngDetail.jsp @@ -204,7 +204,10 @@

희망주제

- + +

교육 주제 관련 상세 요청사항
및 사전 질의

+

+ diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cmm/SchduleManagerPopDetailAdult.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cmm/SchduleManagerPopDetailAdult.jsp index 446a56e4..3f54c326 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cmm/SchduleManagerPopDetailAdult.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cmm/SchduleManagerPopDetailAdult.jsp @@ -134,12 +134,22 @@ - -

교육매체

- - - - + + +

교육매체

+ + + + + + + +

주소

+ + + + +