From cf37bc3a1ba7398becb78c501cb18eefa528b4a1 Mon Sep 17 00:00:00 2001 From: hylee Date: Wed, 13 Dec 2023 11:57:49 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EA=B5=90=EC=9C=A1=EB=AC=B8=EC=9D=98=20sele?= =?UTF-8?q?ct=20list=20/=20order=20by=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml index 10c7cd21..9fd7e945 100644 --- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml @@ -401,6 +401,7 @@ $searchQuery$ + ORDER BY qn.FRST_REGIST_PNTTM desc OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY; From 27b5b041498a47f6d9939404124786eea5df6973 Mon Sep 17 00:00:00 2001 From: hylee Date: Wed, 13 Dec 2023 16:05:47 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EA=B0=95=EC=9D=98=EA=B5=90=ED=99=98=20,=20?= =?UTF-8?q?=EC=95=84=EC=9D=B4=EB=94=94=EA=B2=80=EC=83=89=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eduAplct/web/EduAplctTngrController.java | 16 +- .../instrInfo/service/VEInstrMixService.java | 2 + .../instrInfo/service/impl/VEInstrMixDAO.java | 4 + .../service/impl/VEInstrMixServiceImpl.java | 5 + .../ve/instr/VEInstr_MIX_SQL_Cubrid.xml | 5292 ++++++++--------- .../ve/instr/VEInstr_MIX_SQL_Tibero.xml | 20 + .../popup/changeLctrPopList.jsp | 11 +- 7 files changed, 2690 insertions(+), 2660 deletions(-) diff --git a/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduAplct/web/EduAplctTngrController.java b/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduAplct/web/EduAplctTngrController.java index 4f5f5e48..40af68c6 100644 --- a/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduAplct/web/EduAplctTngrController.java +++ b/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduAplct/web/EduAplctTngrController.java @@ -36,6 +36,9 @@ import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduChasiService; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduChasiVO; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduMIXService; +import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO; +import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrMixService; +import kcc.ve.instr.tngrVisitEdu.lctrInfo.service.VELctrDetailVO; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsMIXService; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsOnlnCntntService; @@ -137,7 +140,11 @@ public class EduAplctTngrController { @Resource(name = "vEAStngService") private VEAStngService vEAStngService; - + + //rkdtk 관리 + @Resource(name = "vEInstrMixService") + private VEInstrMixService vEInstrMixService; + /* * START @@ -633,7 +640,7 @@ public class EduAplctTngrController { */ @RequestMapping("eduInstrAsgnmChkAjax.do") public ModelAndView eduInstrAsgnmChkAjax( - @ModelAttribute("vEAStngVO") VEAStngVO vEAStngVO + @ModelAttribute("vEInstrDetailVO") VEInstrDetailVO vEInstrDetailVO , ModelMap model , HttpServletRequest request ) throws Exception { @@ -649,9 +656,8 @@ public class EduAplctTngrController { System.out.println(request.getParameter("userId")); System.out.println(request.getParameter("eduAplctOrd")); System.out.println(request.getParameter("eduChasiOrd")); - - //String s_message = vEAStngMixService.eduAplctDateChkProcess(vEAStngVO, request, modelAndView); - + + VELctrDetailVO instrInfo = vEInstrMixService.findByIdFromVeInstr(vEInstrDetailVO); //vEAStngMixService.selectDetail_VEADPTQS(paramVO) //ㅁ /* diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrMixService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrMixService.java index 03ec22bc..45d22b1d 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrMixService.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrMixService.java @@ -92,4 +92,6 @@ public interface VEInstrMixService { //교육실정통계-기반강화 List selectEduPrfrmInfoFndthEnhanceTrn(VEInstrDetailVO vEInstrDetailVO) throws Exception; + + VELctrDetailVO findByIdFromVeInstr(VEInstrDetailVO vEInstrDetailVO); } 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 1abdf178..ca5deee0 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 @@ -208,5 +208,9 @@ public class VEInstrMixDAO extends EgovAbstractDAO { List tlist = (List) list("VEInstrMixDAO.selectEduPrfrmInfoFndthEnhanceTrn", vEInstrDetailVO); return tlist; } + + public VELctrDetailVO findByIdFromVeInstr(VEInstrDetailVO vEInstrDetailVO) { + return (VELctrDetailVO) select("VEInstrMixDAO.findByIdFromVeInstr", vEInstrDetailVO); + } } 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 e79772b9..c1c6eaf2 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 @@ -154,4 +154,9 @@ public class VEInstrMixServiceImpl implements VEInstrMixService { public List selectEduPrfrmInfoFndthEnhanceTrn(VEInstrDetailVO vEInstrDetailVO) throws Exception{ return vEInstrMixDAO.selectEduPrfrmInfoFndthEnhanceTrn(vEInstrDetailVO); } + + @Override + public VELctrDetailVO findByIdFromVeInstr(VEInstrDetailVO vEInstrDetailVO) { + return vEInstrMixDAO.findByIdFromVeInstr(vEInstrDetailVO); + } } diff --git a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Cubrid.xml b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Cubrid.xml index 84375926..a9d0bdcb 100644 --- a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Cubrid.xml +++ b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Cubrid.xml @@ -1,2646 +1,2646 @@ - - - - - - - - - - - - - - ve_instr - - - - - user_id, - tngr_instr_yn, - adult_instr_yn, - frst_regist_pnttm, - frst_register_id, - last_updt_pnttm, - last_updusr_id - - - - - - a.user_id AS userId, - a.tngr_instr_yn AS tngrInstrYn, - a.adult_instr_yn AS adultInstrYn, - - DATE_FORMAT(a.frst_regist_pnttm,'%Y-%m-%d') AS frstRegistPnttm, - a.frst_register_id AS frstRegisterId, - DATE_FORMAT(a.last_updt_pnttm,'%Y-%m-%d') AS lastUpdtPnttm, - a.last_updusr_id AS lastUpdusrId - - - - - - ve_instr_detail - - - - - instr_div, - user_id, - instr_detail_ord, - - instr_nm, - phone, - email, - post, - addr, - addr_detail, - rsdne, - d_birth, - final_schol, - mjr, - appt_yr, - appt_div, - actvt_carer, - mn_lctr_cn, - pht_atch_file_id, - blng, - pstn, - prfsn_fld, - sbmt_yn, - sbmt_pnttm, - aprvl_cd, - aprvl_pnttm, - aprvl_id, - aprvl_cn, - frst_regist_pnttm, - frst_register_id, - last_updt_pnttm, - last_updusr_id, - - use_yn, - qlfct_end_yn, - qlfct_end_pnttm, - qlfct_end_cn - - - - - - a.instr_div AS instrDiv, - a.user_id AS userId, - a.instr_detail_ord AS instrDetailOrd, - - a.instr_nm AS instrNm, - a.phone AS phone, - a.email AS email, - a.post AS post, - a.addr AS addr, - a.addr_detail AS addrDetail, - a.rsdne AS rsdne, - a.d_birth AS dBirth, - a.final_schol AS finalSchol, - a.mjr AS mjr, - a.appt_yr AS apptYr, - a.appt_div AS apptDiv, - a.actvt_carer AS actvtCarer, - a.mn_lctr_cn AS mnLctrCn, - a.pht_atch_file_id AS phtAtchFileId, - a.blng AS blng, - a.pstn AS pstn, - a.prfsn_fld AS prfsnFld, - a.sbmt_yn AS sbmtYn, - a.sbmt_pnttm AS sbmtPnttm, - a.aprvl_cd AS aprvlCd, - - DATE_FORMAT(a.aprvl_pnttm,'%Y-%m-%d') AS aprvlPnttm, - - a.aprvl_id AS aprvlId, - a.aprvl_cn AS aprvlCn, - - DATE_FORMAT(a.frst_regist_pnttm,'%Y-%m-%d') AS frstRegistPnttm, - a.frst_register_id AS frstRegisterId, - DATE_FORMAT(a.last_updt_pnttm,'%Y-%m-%d') AS lastUpdtPnttm, - a.last_updusr_id AS lastUpdusrId, - - a.use_yn AS useYn, - a.qlfct_end_yn AS qlfctEndYn, - a.qlfct_end_pnttm AS qlfctEndPnttm, - a.qlfct_end_cn AS qlfctEndCn, - a.div_cd AS divCd - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - UPDATE - - SET - use_yn = 'N' - WHERE - instr_div = #instrDiv# - AND user_id = #userId# - AND instr_detail_ord != #instrDetailOrd# - - - - - - UPDATE - - SET - pht_atch_file_id = '' - WHERE - instr_div = #instrDiv# - AND user_id = #userId# - AND instr_detail_ord != #instrDetailOrd# - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + ve_instr + + + + + user_id, + tngr_instr_yn, + adult_instr_yn, + frst_regist_pnttm, + frst_register_id, + last_updt_pnttm, + last_updusr_id + + + + + + a.user_id AS userId, + a.tngr_instr_yn AS tngrInstrYn, + a.adult_instr_yn AS adultInstrYn, + + DATE_FORMAT(a.frst_regist_pnttm,'%Y-%m-%d') AS frstRegistPnttm, + a.frst_register_id AS frstRegisterId, + DATE_FORMAT(a.last_updt_pnttm,'%Y-%m-%d') AS lastUpdtPnttm, + a.last_updusr_id AS lastUpdusrId + + + + + + ve_instr_detail + + + + + instr_div, + user_id, + instr_detail_ord, + + instr_nm, + phone, + email, + post, + addr, + addr_detail, + rsdne, + d_birth, + final_schol, + mjr, + appt_yr, + appt_div, + actvt_carer, + mn_lctr_cn, + pht_atch_file_id, + blng, + pstn, + prfsn_fld, + sbmt_yn, + sbmt_pnttm, + aprvl_cd, + aprvl_pnttm, + aprvl_id, + aprvl_cn, + frst_regist_pnttm, + frst_register_id, + last_updt_pnttm, + last_updusr_id, + + use_yn, + qlfct_end_yn, + qlfct_end_pnttm, + qlfct_end_cn + + + + + + a.instr_div AS instrDiv, + a.user_id AS userId, + a.instr_detail_ord AS instrDetailOrd, + + a.instr_nm AS instrNm, + a.phone AS phone, + a.email AS email, + a.post AS post, + a.addr AS addr, + a.addr_detail AS addrDetail, + a.rsdne AS rsdne, + a.d_birth AS dBirth, + a.final_schol AS finalSchol, + a.mjr AS mjr, + a.appt_yr AS apptYr, + a.appt_div AS apptDiv, + a.actvt_carer AS actvtCarer, + a.mn_lctr_cn AS mnLctrCn, + a.pht_atch_file_id AS phtAtchFileId, + a.blng AS blng, + a.pstn AS pstn, + a.prfsn_fld AS prfsnFld, + a.sbmt_yn AS sbmtYn, + a.sbmt_pnttm AS sbmtPnttm, + a.aprvl_cd AS aprvlCd, + + DATE_FORMAT(a.aprvl_pnttm,'%Y-%m-%d') AS aprvlPnttm, + + a.aprvl_id AS aprvlId, + a.aprvl_cn AS aprvlCn, + + DATE_FORMAT(a.frst_regist_pnttm,'%Y-%m-%d') AS frstRegistPnttm, + a.frst_register_id AS frstRegisterId, + DATE_FORMAT(a.last_updt_pnttm,'%Y-%m-%d') AS lastUpdtPnttm, + a.last_updusr_id AS lastUpdusrId, + + a.use_yn AS useYn, + a.qlfct_end_yn AS qlfctEndYn, + a.qlfct_end_pnttm AS qlfctEndPnttm, + a.qlfct_end_cn AS qlfctEndCn, + a.div_cd AS divCd + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + UPDATE + + SET + use_yn = 'N' + WHERE + instr_div = #instrDiv# + AND user_id = #userId# + AND instr_detail_ord != #instrDetailOrd# + + + + + + UPDATE + + SET + pht_atch_file_id = '' + WHERE + instr_div = #instrDiv# + AND user_id = #userId# + AND instr_detail_ord != #instrDetailOrd# + + + + + + + + + + + + + + + + + + + + + + + + + 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 cbc46d69..8e7caada 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 @@ -3424,4 +3424,24 @@ on(bbb.prcs_aplct_prd_ord=aaa.prcsOrd) GROUP BY rollup(yr, bbb.prcs_nm) + + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/changeLctrPopList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/changeLctrPopList.jsp index 6948dfe2..31323616 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/changeLctrPopList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/changeLctrPopList.jsp @@ -74,28 +74,21 @@ alert("강사ID는 필수 입력값 입니다."); return; } - + var searchKeyword = $('#searchKeyword').val(); $.ajax({ type:"POST", url:"${pageContext.request.contextPath}/web/ve/aplct/tngrVisitEdu/eduAplct/eduInstrAsgnmChkAjax.do", data: { + userId : searchKeyword }, dataType:'json', async: false, success:function(returnData){ if(returnData.result == "fail"){ - //신청 버튼 숨기기 - $("div.btn_layout01").hide(); - //alert("신청가능한 기간이 아닙니다."); - alert("신청가능한 기간이 아닙니다.\n\n"+returnData.message+"\n\n(교사, 학부모 대상 교육은 ‘찾아가는 저작권 교육(성인)'에서 상시 신청 가능합니다)"); - //location.href="" - - psblFlag = 'N'; }else if(returnData.result == "success"){ alert("등록처리되었습니다."); - //location.href="" $(".btn_popup_close").click(); }else{