From e41ff9fecfda0ce353248cfc7c4688c5b0fbef84 Mon Sep 17 00:00:00 2001 From: myname Date: Mon, 6 Nov 2023 15:14:49 +0900 Subject: [PATCH] =?UTF-8?q?2023-11-06=2015:14=20=EC=B0=BE=EA=B5=90=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=EC=9A=94=EC=B2=AD=20=EC=82=AC=ED=95=AD=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adv/tngr/stngInfo/service/VEAStngVO.java | 15 +++ .../eduAplct/web/EduAplctTngrController.java | 4 +- .../web/AdvAreaLctrMngTngrController.java | 82 +++++++++++++- .../web/AreaLctrMngTngrController.java | 1 + .../sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml | 10 +- .../ve/tngr/VEALctrYrStngMix_SQL_Tibero.xml | 15 ++- .../oprtn/tngrVisitEdu/advAreaLctrMngList.jsp | 105 +++++++++++++++++- .../tngrVisitEdu/eduAplct/eduAplctList.jsp | 10 +- .../asgnmInfo/instrAsgnmRqstDetail.jsp | 2 + .../tngrVisitEdu/instrInfo/instrDashboard.jsp | 31 ++++-- .../instrInfo/instrPrflDetail.jsp | 4 +- 11 files changed, 255 insertions(+), 24 deletions(-) diff --git a/src/main/java/kcc/ve/adv/tngr/stngInfo/service/VEAStngVO.java b/src/main/java/kcc/ve/adv/tngr/stngInfo/service/VEAStngVO.java index b1c09b2e..b5eb903e 100644 --- a/src/main/java/kcc/ve/adv/tngr/stngInfo/service/VEAStngVO.java +++ b/src/main/java/kcc/ve/adv/tngr/stngInfo/service/VEAStngVO.java @@ -124,6 +124,9 @@ public class VEAStngVO extends ComDefaultVO implements Serializable { private String start; private String end; private String title; + + private String titleF; //현재신청 + private String titleB; //가능신청 //지역별 강의 설정 @@ -618,5 +621,17 @@ public class VEAStngVO extends ComDefaultVO implements Serializable { public void setCn(String cn) { this.cn = cn; } + public String getTitleF() { + return titleF; + } + public void setTitleF(String titleF) { + this.titleF = titleF; + } + public String getTitleB() { + return titleB; + } + public void setTitleB(String titleB) { + this.titleB = titleB; + } } 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 41471d13..55a43400 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 @@ -2,7 +2,6 @@ package kcc.ve.aplct.tngrVisitEdu.eduAplct.web; import java.util.HashSet; import java.util.List; -import java.util.stream.Collector; import java.util.stream.Collectors; import javax.annotation.Resource; @@ -166,7 +165,8 @@ public class EduAplctTngrController { PaginationInfo paginationInfo = this.setPagingStep1(vEEduAplctVO); //2. pageing step2 vEEduAplctVO = this.setPagingStep2(vEEduAplctVO, paginationInfo); - List vEEduAplctVOList = vEEduMIXService.selectPagingList(vEEduAplctVO); + //List vEEduAplctVOList = vEEduMIXService.selectPagingList(vEEduAplctVO); + List vEEduAplctVOList = vEEduMIXService.selectPagingApplyList(vEEduAplctVO); //3.pageing step3 paginationInfo = this.setPagingStep3(vEEduAplctVOList, paginationInfo); model.addAttribute("paginationInfo", paginationInfo); diff --git a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/areaLctrMng/web/AdvAreaLctrMngTngrController.java b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/areaLctrMng/web/AdvAreaLctrMngTngrController.java index 74940f1a..5ff75c95 100644 --- a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/areaLctrMng/web/AdvAreaLctrMngTngrController.java +++ b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/areaLctrMng/web/AdvAreaLctrMngTngrController.java @@ -414,6 +414,73 @@ public class AdvAreaLctrMngTngrController { return modelAndView; + } + + /** + * 지역별 총 접수시간 처리 팝업 + */ + + @RequestMapping(value="/kccadr/oprtn/tngrVisitEdu/areaLctrMngrgstrPsblTmAllAjax.do") + public ModelAndView areaLctrMngrgstrPsblTmAllAjax( + VEAStngVO vEAStngVO + //, RedirectAttributes redirectAttributes + , ModelMap model + , HttpServletRequest request + ) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + //로그인 처리==================================== + //로그인 정보 가져오기 + /* + String s_oprtnLoginCheckNInfo = checkLoginUtil.oprtnCheckNInfo(model); + if (!"".equals(s_oprtnLoginCheckNInfo)) { + modelAndView.addObject("result", "loginFail"); + return modelAndView; + } + */ + + //로그인 처리==================================== + + try { + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + + vEAStngVO.setFrstRegisterId(loginVO.getUniqId()); + vEAStngVO.setLastUpdusrId(loginVO.getUniqId()); + + + String p_ttlEduCnfrmPsblChasi = request.getParameter("ttlEduCnfrmPsblChasi"); + String p_areaCd = request.getParameter("areaCd"); + + String[] a_ttlEduCnfrmPsblChasi = p_ttlEduCnfrmPsblChasi.split("_"); + String[] a_areaCd = p_areaCd.split("_"); + + for (int i=0;i0) modelAndView.addObject("result", "success"); + else modelAndView.addObject("result", "fail"); + } + } + + + //modelAndView.addObject("result", "success"); + + }catch(Exception ex) { + ex.printStackTrace(); + } + + + return modelAndView; + + } /** @@ -1295,8 +1362,21 @@ public class AdvAreaLctrMngTngrController { System.out.println("vList.get(i).getDtPsblTmQnttyOrd()"); System.out.println(vList.get(i).getDtPsblTmQnttyOrd()); System.out.println(vList.get(i).getRndsNm()); + if (vList.get(i).getTitle().equals("불가능")) - vList.get(i).setColor("#FF0000"); + { + vList.get(i).setColor("#FF0000"); + + }else if (Integer.parseInt(vList.get(i).getTitleF())>=Integer.parseInt(vList.get(i).getTitleB())) + { + vList.get(i).setColor("#FF0000"); + + }else if (Integer.parseInt(vList.get(i).getTitleF())*5>=Integer.parseInt(vList.get(i).getTitleB())*4) + { + vList.get(i).setColor("#FFAA00"); + } + + }catch(Exception ex) { ex.printStackTrace(); } diff --git a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/areaLctrMng/web/AreaLctrMngTngrController.java b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/areaLctrMng/web/AreaLctrMngTngrController.java index feabdfe1..65f9f411 100644 --- a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/areaLctrMng/web/AreaLctrMngTngrController.java +++ b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/areaLctrMng/web/AreaLctrMngTngrController.java @@ -666,6 +666,7 @@ public class AreaLctrMngTngrController { } + /** * 년도 / 반기의 접수 일자 저장 */ 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 f6ed1370..332573e1 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 @@ -2333,11 +2333,17 @@ - AND b.EDU_HOPE_DT = ]]> REPLACE(#searchStartDt#, '.' , '') + /* + AND b.EDU_HOPE_DT = ]]> REPLACE(searchStartDt, '.' , '') + */ + AND b.EDU_HOPE_DT = ]]> #searchStartDt# - AND b.EDU_HOPE_DT REPLACE(#searchEndDt#, '.' , '') + /* + AND b.EDU_HOPE_DT REPLACE(searchEndDt, '.' , '') + */ + AND b.EDU_HOPE_DT #searchEndDt# diff --git a/src/main/resources/egovframework/sqlmap/ve/tngr/VEALctrYrStngMix_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/tngr/VEALctrYrStngMix_SQL_Tibero.xml index bd1c5011..60c625cb 100644 --- a/src/main/resources/egovframework/sqlmap/ve/tngr/VEALctrYrStngMix_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/tngr/VEALctrYrStngMix_SQL_Tibero.xml @@ -243,7 +243,20 @@ /* , ddd.LCTR_PSBL_PRD_ORD , eee.LCTR_PSBL_PRD_ORD - */ + */ + + , CASE + WHEN ddd.LCTR_PSBL_PRD_ORD IS NOT NULL THEN '불가능' + WHEN bbb.DT_PSBL_TM_QNTTY_ORD IS NULL THEN to_char(NVL(fff.psblTmQnttyCnt,0)) + ELSE to_char(NVL(fff.psblTmQnttyCnt,0)) + END AS titleF + + , CASE + WHEN ddd.LCTR_PSBL_PRD_ORD IS NOT NULL THEN '불가능' + WHEN bbb.DT_PSBL_TM_QNTTY_ORD IS NULL THEN to_char(ccc.psbl_tm_qntty) + ELSE to_char(bbb.PSBL_TM_QNTTY) + END AS titleB + FROM ( /* Step1.올해-내년의 달력을 만들고, */ SELECT diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/advAreaLctrMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/advAreaLctrMngList.jsp index 0e6ed3df..8e4ca6ba 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/advAreaLctrMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/advAreaLctrMngList.jsp @@ -345,7 +345,76 @@ alert("지역별 총 접수시간을 입력해주세요."); } } - + + //교육설정 등록여부 체크 + function fncDupleCheckAll(thisObj){ + + var list1 = $("input[name=checkList]"); + var list2 = $("input[name=ttlEduCnfrmPsblChasi]"); + + + //alert(list1.length); + //alert(list2.length); + + if (list1.length>0 && list1.length==list2.length) + { + //alert("true"); + ; + }else{ + alert("false"); + return; + } + + var v_list1 = ""; + var v_list2 = ""; + + $.each(list1, function(idx, obj){ + v_list1 = v_list1 + "_" + $(this).val(); + }); + + $.each(list2, function(idx, obj){ + v_list2 = v_list2 + "_" + $(this).val(); + }); + + //alert(v_list1); + //alert(v_list2); + + + //var p_ttlEduCnfrmPsblChasi = $(thisObj).closest("td").find("input[name=ttlEduCnfrmPsblChasi]").val(); + //var p_rndsOrd = $("#rndsOrd").val(); + var p_rndsOrd = $("#listForm #stngYr").val(); //회차기준에서 년도 기준으로 변경함 + //var p_areaCd = $(thisObj).closest("tr").find("input[name=checkList]").val(); + + //alert(p_areaCd); + + if(v_list2 != "") { + + $.ajax({ + type:"POST", + url:"${pageContext.request.contextPath}/kccadr/oprtn/tngrVisitEdu/areaLctrMngrgstrPsblTmAllAjax.do", + data:{ + "rndsOrd" : p_rndsOrd, + "areaCd" : v_list1, + "ttlEduCnfrmPsblChasi" : v_list2, + }, + dataType:'json', + success:function(returnData){ + if(returnData.result == "success"){ + alert("변경 처리 되었습니다."); + fncGoList(); + }else{ + alert("변경 중 오류가 발생하였습니다."); + } + }, + error:function(request , status, error){ + alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error); + } + }); + }else{ + alert("지역별 총 접수시간을 입력해주세요."); + } + } + function fncRgstrDateSave(){ if(confirm("접수일자를 저장 하시겠습니까?")){ $.ajax({ @@ -821,6 +890,10 @@ + + + + @@ -838,17 +911,43 @@ - - + + + + () + + + + + + + + + 총합 + + + + ${ttlChasi} + + + + ${ttlAplctChasi} + (${ttlAplct}) + + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctList.jsp index 97b1c7d6..6d7997fd 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctList.jsp @@ -64,10 +64,10 @@ - - +
@@ -115,7 +122,7 @@
    - +
@@ -161,17 +168,20 @@ + + - + ', '');"> - + ', '');"> - +

${instrAsgnmList.eduHopeDt}

+

~ @@ -180,6 +190,7 @@

(온)

+ @@ -354,3 +365,7 @@
+ + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/instrPrflDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/instrPrflDetail.jsp index 88dce906..767c3f61 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/instrPrflDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/instrPrflDetail.jsp @@ -289,7 +289,7 @@
-

청소년 강사 신청 상세

+

강사정보 상세

@@ -683,7 +683,7 @@ - +