From 5fa5d073229c15448e35a070d39e2db388f3cbac Mon Sep 17 00:00:00 2001 From: myname Date: Wed, 8 Nov 2023 11:57:36 +0900 Subject: [PATCH] =?UTF-8?q?2023-11-08=2011:57=20=EC=84=B1=EC=9D=B8=20?= =?UTF-8?q?=EA=B0=95=EC=82=AC=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EC=9D=BC?= =?UTF-8?q?=EA=B4=84=20=EC=B6=9C=EB=A0=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aplct/comweb/CrownixAjaxController.java | 181 +++++++++++++++++- .../instrInfo/service/VEInstrMixService.java | 3 + .../instrInfo/service/impl/VEInstrMixDAO.java | 5 + .../service/impl/VEInstrMixServiceImpl.java | 5 + .../web/OprtnInstrAdultPrflContoller.java | 3 +- .../ve/instr/VEInstr_MIX_SQL_Tibero.xml | 163 +++++++++++++++- .../oprtn/adultVisitEdu/instrAplctMngList.jsp | 17 ++ .../oprtn/adultVisitEdu/instrMngDetail.jsp | 13 +- .../jsp/oprtn/adultVisitEdu/instrMngList.jsp | 68 ++++++- 9 files changed, 448 insertions(+), 10 deletions(-) diff --git a/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java b/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java index b76794db..787e665b 100644 --- a/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java +++ b/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java @@ -1,8 +1,12 @@ package kcc.ve.aplct.comweb; +import java.util.List; + import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import org.json.simple.JSONArray; +import org.json.simple.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; @@ -11,12 +15,15 @@ import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; +import kcc.com.cmm.ComDefaultVO; +import kcc.com.cmm.util.StringUtil; import kcc.let.utl.fcc.service.EgovCryptoUtil; import kcc.ve.adv.tngr.stngInfo.service.VEACmpltCrtfcMixService; import kcc.ve.adv.tngr.stngInfo.service.VEACmpltCrtfcVO; import kcc.ve.aplct.fndtnEnhanceTrn.service.FndtnEnhanceTrnService; import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailService; import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO; +import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrMixService; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; /** @@ -133,6 +140,9 @@ public class CrownixAjaxController { @Resource(name = "vEACmpltCrtfcMixService") private VEACmpltCrtfcMixService vEACmpltCrtfcMixService; + //강사MIX 정보 + @Resource(name="vEInstrMixService") + private VEInstrMixService vEInstrMixService; /** * 교육 list select @@ -358,5 +368,174 @@ public class CrownixAjaxController { return modelAndView; - } + } + + /** + * 성인강사들 출력 정보 + * + */ + @RequestMapping("/ve/aplct/adultVisitEdu/eduAplct/instrDetailListAjax.do") + public ModelAndView instrDetailListAjax( + ModelMap model + , HttpServletRequest request + ) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + System.out.println("----------------"); + System.out.println(request.getParameter("p_searchQlfctEndYn")); + System.out.println(request.getParameter("p_searcDivCd")); + System.out.println(request.getParameter("p_searchKeyword")); + System.out.println("----------------"); + /* + VEACmpltCrtfcVO vEACmpltCrtfcVO = new VEACmpltCrtfcVO(); + vEACmpltCrtfcVO.setPrcsAplctPrdOrd(request.getParameter("prcsAplctPrdOrd")); + vEACmpltCrtfcVO.setEduAplctOrd(request.getParameter("eduAplctOrd")); + + vEACmpltCrtfcVO = vEACmpltCrtfcMixService.selectDetail_CC_1(vEACmpltCrtfcVO); + + vEACmpltCrtfcVO.setMberNm(egovCryptoUtil.decrypt(vEACmpltCrtfcVO.getMberNm())); + */ + + /* + modelAndView.addObject("data_t", "강사정보"); + + modelAndView.addObject("data_1", "성인강사2"); + modelAndView.addObject("data_2", "010-9341-4986"); + modelAndView.addObject("data_3", "rosehips@naver.com"); + modelAndView.addObject("data_4", "13473 경기 성남시 분당구 경부고속도로 409삼평동"); + modelAndView.addObject("data_5", "광주광역시(동구 계림동)"); + modelAndView.addObject("data_6", "20110812"); + modelAndView.addObject("data_7", "전문분야"); + + //modelAndView.addObject("path", "http://119.193.215.98:9989/offedu/visitEdu/usr/publish/images/common/ci.png"); + modelAndView.addObject("image", "http://119.193.215.98:9989/offedu/uss/ion/pwm/getImage.do?atchFileId=FILE_000000000000463"); + + + modelAndView.addObject("data_d", "2023년05월28일"); + */ + + //////////////////////////////////////////////성인 강사 정보 + /* + String s_user_id = request.getParameter("p_instrId"); + VEInstrDetailVO vEInstrDetailVO = new VEInstrDetailVO(); + + vEInstrDetailVO.setUserId(s_user_id); + vEInstrDetailVO.setInstrDiv("20"); + vEInstrDetailVO.setUseYn("Y"); + VEInstrDetailVO info = vEInstrDetailService.selectDetail(vEInstrDetailVO); + + // 강사 정보 select + info = egovCryptoUtil.decryptVEInstrDetailVO(info); + + + modelAndView.addObject("data_t", "강사정보"); + + modelAndView.addObject("data_1", info.getInstrNm()); + modelAndView.addObject("data_2", info.getPhone()); + modelAndView.addObject("data_3", info.getEmail()); + modelAndView.addObject("data_4", info.getAddr()); + modelAndView.addObject("data_5", info.getRsdne()); + modelAndView.addObject("data_6", info.getdBirth()); + modelAndView.addObject("data_7", info.getPrfsnFld()); + + //modelAndView.addObject("path", "http://119.193.215.98:9989/offedu/visitEdu/usr/publish/images/common/ci.png"); + //modelAndView.addObject("image", "http://119.193.215.98:9989/offedu/uss/ion/pwm/getImage.do?atchFileId=FILE_000000000000463"); + modelAndView.addObject("image", "http://119.193.215.98:9989/offedu/uss/ion/pwm/getImage.do?atchFileId="+info.getPhtAtchFileId()); + + + modelAndView.addObject("data_d", "2023년05월28일"); + */ + + /* + modelAndView.addObject("data_t", "기소유예이수증"); + + modelAndView.addObject("data_1", vEACmpltCrtfcVO.getEduCmpltCrtfcNmbr()); + modelAndView.addObject("data_2", vEACmpltCrtfcVO.getMberNm()); + modelAndView.addObject("data_3", vEACmpltCrtfcVO.getBirthDay()); + modelAndView.addObject("data_4", vEACmpltCrtfcVO.getPrcsDiv()); + modelAndView.addObject("data_5", vEACmpltCrtfcVO.getPrcsNm()); + modelAndView.addObject("data_6", vEACmpltCrtfcVO.getMberNm()); + modelAndView.addObject("data_7", vEACmpltCrtfcVO.getEduStrtPnttm()+"~"+vEACmpltCrtfcVO.getEduDdlnPnttm()); + + String s_rd = vEACmpltCrtfcVO.getRd(); + s_rd = s_rd.substring(0,4)+"년"+s_rd.substring(4,6)+"년"+s_rd.substring(6,8); + System.out.println(s_rd); + System.out.println(s_rd); + + modelAndView.addObject("data_d", s_rd); + */ + + VEInstrDetailVO vEInstrDetailVO = new VEInstrDetailVO(); + + //3. SelectPagingListQuery set 할 조건 설정 + String selectCondition = new String(); + //3.1 제출 완료 후 사용중인 데이터 조회 + //selectCondition += "AND a.sbmt_yn='Y' AND a.use_yn = 'Y'"; + selectCondition += "AND a0.sbmt_yn='Y' AND a0.use_yn = 'Y'"; + //3.2 강사 테이블 성인강사여부 Y인것만 조회 + //selectCondition += "AND (b.adult_instr_yn ='Y' OR a.qlfct_end_yn = 'Y') "; + selectCondition += "AND (b0.adult_instr_yn ='Y' OR a0.qlfct_end_yn = 'Y') "; + //3.3 이름 검색 시 + if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchKeyword())){ + //selectCondition += "AND a.instr_nm LIKE CONCAT ('%', '" +vEInstrDetailVO.getSearchKeyword() + "', '%')"; + //이름 암호화 - comDefaultVO 검색단어 공통 암호화 + ComDefaultVO comDefaultVO = new ComDefaultVO(); + comDefaultVO.setSearchKeyword(vEInstrDetailVO.getSearchKeyword()); + comDefaultVO = egovCryptoUtil.encryptComDefaultVO(comDefaultVO); + vEInstrDetailVO.setSearchKeyword(comDefaultVO.getSearchKeyword()); + //selectCondition += "AND a.instr_nm LIKE CONCAT ('%', '" +vEInstrDetailVO.getSearchKeyword() + "', '%')"; + selectCondition += "AND a0.instr_nm LIKE '%'||'" +vEInstrDetailVO.getSearchKeyword() + "'||'%'"; + comDefaultVO = egovCryptoUtil.decryptComDefaultVO(comDefaultVO); + vEInstrDetailVO.setSearchKeyword(comDefaultVO.getSearchKeyword()); + } + vEInstrDetailVO.setInstrDiv("20"); + vEInstrDetailVO.setSelectPagingListQuery(selectCondition); + + //대상 강사 리스트 + List vEInstrDetailVOList = vEInstrMixService.selectPagingDetailList4Report(vEInstrDetailVO); + //복호화 + vEInstrDetailVOList = egovCryptoUtil.decryptVEInstrDetailVOList(vEInstrDetailVOList); + + + JSONArray jsReqInfo = new JSONArray(); //신청인 정보 + + for (int i=0;i selectPagingDetailList(VEInstrDetailVO vEInstrDetailVO) throws Exception; + //L page (강사디테일 믹스) + List selectPagingDetailList4Report(VEInstrDetailVO vEInstrDetailVO) throws Exception; + //L page (강사디테일 믹스) List selectPagingDetailList4Asgnm(VEInstrDetailVO vEInstrDetailVO) throws Exception; diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrMixDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrMixDAO.java index 7732b567..2d11a908 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrMixDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrMixDAO.java @@ -85,6 +85,11 @@ public class VEInstrMixDAO extends EgovAbstractDAO { return tlist; } + public List selectPagingDetailList4Report(VEInstrDetailVO vEInstrDetailVO) throws Exception { + List tlist = (List) list("VEInstrMixDAO.selectPagingDetailList4Report", vEInstrDetailVO); + return tlist; + } + public List selectPagingDetailList4Asgnm(VEInstrDetailVO vEInstrDetailVO) throws Exception { List tlist = (List) list("VEInstrMixDAO.selectPagingDetailList4Asgnm", vEInstrDetailVO); return tlist; diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrMixServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrMixServiceImpl.java index 07dd810f..9c1b2cd0 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrMixServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrMixServiceImpl.java @@ -67,6 +67,11 @@ public class VEInstrMixServiceImpl implements VEInstrMixService { return vEInstrMixDAO.selectPagingDetailList(vEInstrDetailVO); } + //paging List + public List selectPagingDetailList4Report(VEInstrDetailVO vEInstrDetailVO) throws Exception{ + return vEInstrMixDAO.selectPagingDetailList4Report(vEInstrDetailVO); + } + //paging List public List selectPagingDetailList4Asgnm(VEInstrDetailVO vEInstrDetailVO) throws Exception{ return vEInstrMixDAO.selectPagingDetailList4Asgnm(vEInstrDetailVO); diff --git a/src/main/java/kcc/ve/oprtn/instr/adultVisitEdu/instrInfo/web/OprtnInstrAdultPrflContoller.java b/src/main/java/kcc/ve/oprtn/instr/adultVisitEdu/instrInfo/web/OprtnInstrAdultPrflContoller.java index 4c4d9a62..547b84b2 100644 --- a/src/main/java/kcc/ve/oprtn/instr/adultVisitEdu/instrInfo/web/OprtnInstrAdultPrflContoller.java +++ b/src/main/java/kcc/ve/oprtn/instr/adultVisitEdu/instrInfo/web/OprtnInstrAdultPrflContoller.java @@ -1033,7 +1033,8 @@ public class OprtnInstrAdultPrflContoller { comDefaultVO.setSearchKeyword(vEInstrDetailVO.getSearchKeyword()); comDefaultVO = egovCryptoUtil.encryptComDefaultVO(comDefaultVO); vEInstrDetailVO.setSearchKeyword(comDefaultVO.getSearchKeyword()); - selectCondition += "AND a.instr_nm LIKE CONCAT ('%', '" +vEInstrDetailVO.getSearchKeyword() + "', '%')"; + //selectCondition += "AND a.instr_nm LIKE CONCAT ('%', '" +vEInstrDetailVO.getSearchKeyword() + "', '%')"; + selectCondition += "AND a0.instr_nm LIKE '%'||'" +vEInstrDetailVO.getSearchKeyword() + "'||'%'"; comDefaultVO = egovCryptoUtil.decryptComDefaultVO(comDefaultVO); vEInstrDetailVO.setSearchKeyword(comDefaultVO.getSearchKeyword()); } 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 e5c0908e..5942793a 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 @@ -733,7 +733,7 @@ AND a.div_cd = #searcDivCd# - AND a.rsdne LIKE CONCAT('%',#rsdne#,'%') + AND a.rsdne LIKE '%'||#rsdne#||'%' AND a.instr_div=#instrDiv# @@ -763,6 +763,167 @@ + + +