From bb821678ae9518d8723eb49c832c910e8e27f38d Mon Sep 17 00:00:00 2001 From: myname Date: Fri, 12 Jan 2024 14:45:20 +0900 Subject: [PATCH] =?UTF-8?q?2024-01-12=2014:44=20=EA=B0=95=EC=82=AC?= =?UTF-8?q?=EB=A3=8C=20=ED=99=95=EC=A0=95=20=EA=B4=80=EB=A6=AC=20=EC=BF=BC?= =?UTF-8?q?=EB=A6=AC=20=EC=88=98=EC=A0=95,=20=EC=9E=90=EB=8F=99=20?= =?UTF-8?q?=EB=B0=B0=EC=A0=95=20=EC=88=98=EC=A0=95=20=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ve/aplct/comweb/CommonWebController.java | 87 +------------------ .../sqlmap/ve/asgnm/VEInstrFee_SQL_Tibero.xml | 4 +- .../ve/edu/VEAutoAsgnm_MIX_SQL_Tibero.xml | 49 ++++++++--- .../oprtn/tngrVisitEdu/eduCnfrmMngList.jsp | 6 +- 4 files changed, 45 insertions(+), 101 deletions(-) diff --git a/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java b/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java index 057a68fe..2ae09cf6 100644 --- a/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java +++ b/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java @@ -643,95 +643,16 @@ public class CommonWebController { //step2.배정 대상별 가능한 대상 강사 찾기 및 등록 int p=0; { + System.out.println("vEEduAplctVOList.size()"); + System.out.println(vEEduAplctVOList.size()); + System.out.println(vEEduAplctVOList.size()); for (int i=0;i vEInstrAssiEduAplctVOList = null; - - //필수 조건(월별시수제한, 요일, 희망지역) - { - //step2-1.가능 강사중 월별 시수이상을 받지 않은자 & 해당 요일에 수업 가능한 강사 리스트(필) - vEAutoAsgnmVO = new VEAutoAsgnmVO(); - vEAutoAsgnmVO.setEduHopeMnt(s_eduHopeDt.substring(5,7)); - vEAutoAsgnmVO.setYr(s_eduHopeDt.substring(0,4)); - vEAutoAsgnmVO.setInstrDiv("10"); //10-청소년, 20-성인 - vEAutoAsgnmVO.setEduChasiOrd(tChasiInfo.getEduChasiOrd()); - - vEInstrAssiEduAplctVOList = vEAutoAsgnmMIXService.selectInstrMntAsgnmtChasiList(vEAutoAsgnmVO); - - //step2-2.희망 지역 강사 검색(필) - - for (int j=0;j0) { - VEInstrAsgnmVO p_vEInstrAsgnmVO = new VEInstrAsgnmVO(); - p_vEInstrAsgnmVO.setEduAplctOrd(tChasiInfo.getEduAplctOrd()); - p_vEInstrAsgnmVO.setEduChasiOrd(tChasiInfo.getEduChasiOrd()); - - p_vEInstrAsgnmVO.setUserId(vEInstrAssiEduAplctVOList.get(0).getUserId()); - p_vEInstrAsgnmVO.setFrstRegisterId(loginVO.getUniqId()); - p_vEInstrAsgnmVO.setAsgnmAprvlCd("10"); - p_vEInstrAsgnmVO.setAsgnmAprvlId(loginVO.getUniqId()); - p_vEInstrAsgnmVO.setRmrks("배정기준1순위"); - - //저장 - vEEduChasiInstrAsgnmService.insert(p_vEInstrAsgnmVO); - - //저장여부 확인 - //step3-1.해당 차시에 강사 배정이 있는지 확인 - VEInstrAsgnmVO vEInstrAsgnmVOTmp = vEEduChasiInstrAsgnmService.selectDetail(p_vEInstrAsgnmVO); - if (vEInstrAsgnmVOTmp!=null) p = p+1; - } - */ } } diff --git a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEInstrFee_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEInstrFee_SQL_Tibero.xml index 50c9711a..fae6d590 100644 --- a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEInstrFee_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEInstrFee_SQL_Tibero.xml @@ -132,9 +132,9 @@ , A.EDU_CHASI_ORD AS eduChasiOrd , B.INSTR_FEE_ORD AS instrFeeOrd , A.USER_ID AS userId - ,(SELECT AA.ADDR FROM VE_INSTR_DETAIL AA WHERE 1=1 AND AA.USER_ID = A.USER_ID AND aa.instr_div=e.lctr_div_cd AND aa.use_yn='Y') AS instrRsdnc + ,(SELECT AA.ADDR FROM VE_INSTR_DETAIL AA WHERE 1=1 AND AA.USER_ID = A.USER_ID AND aa.instr_div=e.lctr_div_cd AND aa.use_yn='Y' LIMIT 1) AS instrRsdnc - ,(SELECT AA.div_cd FROM VE_INSTR_DETAIL AA WHERE 1=1 AND AA.USER_ID = A.USER_ID AND aa.instr_div=e.lctr_div_cd AND aa.use_yn ='Y') AS divCd + ,(SELECT AA.div_cd FROM VE_INSTR_DETAIL AA WHERE 1=1 AND AA.USER_ID = A.USER_ID AND aa.instr_div=e.lctr_div_cd AND aa.use_yn='Y' LIMIT 1) AS divCd ,(SELECT EE.NEW_ADDR FROM VE_SCHOL EE WHERE 1=1 AND EE.STNDRD_SCHOL_CD = E.STNDRD_SCHOL_CD) AS scholArea diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEAutoAsgnm_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEAutoAsgnm_MIX_SQL_Tibero.xml index d93ac09c..2ba42b3c 100644 --- a/src/main/resources/egovframework/sqlmap/ve/edu/VEAutoAsgnm_MIX_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEAutoAsgnm_MIX_SQL_Tibero.xml @@ -771,19 +771,42 @@ + NVL(SUM(CASE WHEN substring(bb.yrmnt,6,7)='11' THEN bb.instrSumChasi END),0) + NVL(SUM(CASE WHEN substring(bb.yrmnt,6,7)='12' THEN bb.instrSumChasi END),0))*100 / - ( NVL(aa.m01_tm,0) - + NVL(aa.m02_tm,0) - + NVL(aa.m03_tm,0) - + NVL(aa.m04_tm,0) - + NVL(aa.m05_tm,0) - + NVL(aa.m06_tm,0) - + NVL(aa.m07_tm,0) - + NVL(aa.m08_tm,0) - + NVL(aa.m09_tm,0) - + NVL(aa.m10_tm,0) - + NVL(aa.m11_tm,0) - + NVL(aa.m12_tm,0) - )) + /* 0 으로 나누는 오류를 막기위해서 처리함 */ + DECODE + ( + ( + NVL(aa.m01_tm,0) + + NVL(aa.m02_tm,0) + + NVL(aa.m03_tm,0) + + NVL(aa.m04_tm,0) + + NVL(aa.m05_tm,0) + + NVL(aa.m06_tm,0) + + NVL(aa.m07_tm,0) + + NVL(aa.m08_tm,0) + + NVL(aa.m09_tm,0) + + NVL(aa.m10_tm,0) + + NVL(aa.m11_tm,0) + + NVL(aa.m12_tm,0) + ) + ,0 + ,1 + , + ( + NVL(aa.m01_tm,0) + + NVL(aa.m02_tm,0) + + NVL(aa.m03_tm,0) + + NVL(aa.m04_tm,0) + + NVL(aa.m05_tm,0) + + NVL(aa.m06_tm,0) + + NVL(aa.m07_tm,0) + + NVL(aa.m08_tm,0) + + NVL(aa.m09_tm,0) + + NVL(aa.m10_tm,0) + + NVL(aa.m11_tm,0) + + NVL(aa.m12_tm,0) + ) + ) + ) AS achvmRt FROM vea_instr_indvd_mnt_tm aa diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduCnfrmMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduCnfrmMngList.jsp index 59ad04a2..42ab3129 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduCnfrmMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduCnfrmMngList.jsp @@ -1061,7 +1061,7 @@ 교육대상 강사명 선택근거 - 확정여부 + 확정여부(코드) 강사배치 추가강사인원 @@ -1078,7 +1078,7 @@ ${list.asgnmAprvlCd} + title="Check" type="checkbox"/> @@ -1114,7 +1114,7 @@ - + (${list.asgnmAprvlCd})