From 7ebc9608554aca616caf77fe2be153fc17a90047 Mon Sep 17 00:00:00 2001 From: myname Date: Tue, 5 Dec 2023 12:25:38 +0900 Subject: [PATCH] =?UTF-8?q?2023-12-05=2012:25=20=EA=B5=90=EC=9C=A1?= =?UTF-8?q?=EC=9D=BC=EC=A0=95=EB=8B=AC=EB=A0=A5=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stngInfo/service/VEAStngMixService.java | 3 + .../stngInfo/service/impl/VEAStngMixDAO.java | 5 + .../service/impl/VEAStngMixServiceImpl.java | 5 + .../web/ScholInfoController.java | 4 +- .../sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml | 100 +++++---- .../ve/tngr/VEALctrYrStngMix_SQL_Tibero.xml | 191 ++++++++++++++++++ .../exprnClsrmInfo/popup/calendarPopList.jsp | 14 +- .../asgnmInfo/instrAsgnmEndDetail.jsp | 12 +- .../endInfo/instrAsgnmEndDetail.jsp | 10 +- 9 files changed, 282 insertions(+), 62 deletions(-) diff --git a/src/main/java/kcc/ve/adv/tngr/stngInfo/service/VEAStngMixService.java b/src/main/java/kcc/ve/adv/tngr/stngInfo/service/VEAStngMixService.java index 8f1ecfd0..6fa22786 100644 --- a/src/main/java/kcc/ve/adv/tngr/stngInfo/service/VEAStngMixService.java +++ b/src/main/java/kcc/ve/adv/tngr/stngInfo/service/VEAStngMixService.java @@ -19,6 +19,9 @@ public interface VEAStngMixService { //교육가능시수 데이터 - 교육가능시수 세부 선택 데이터 List selectList_VEALPPS_2(VEAStngVO paramVO) throws Exception; // LIST + + //교육가능시수 데이터 - 교육가능시수 세부 선택 데이터 - 사용자 달력용 + List selectList_VEALPPS_2_4_user(VEAStngVO paramVO) throws Exception; // LIST //강의가능기간에 불가능한 일자 가져오기 List selectList_VEALPPS_3(VEAStngVO paramVO) throws Exception; // LIST diff --git a/src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEAStngMixDAO.java b/src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEAStngMixDAO.java index ff2f4bac..0e0dd9d4 100644 --- a/src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEAStngMixDAO.java +++ b/src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEAStngMixDAO.java @@ -30,6 +30,11 @@ public class VEAStngMixDAO extends EgovAbstractDAO { return tlist; } + public List selectList_VEALPPS_2_4_user(VEAStngVO paramVO) throws Exception { + List tlist = (List) list("VEALctrYrStngMixDAO.selectList_VEALPPS_2_4_user", paramVO); + return tlist; + } + public List selectList_VEALPPS_3(VEAStngVO paramVO) throws Exception { List tlist = (List) list("VEALctrYrStngMixDAO.selectList_VEALPPS_3", paramVO); return tlist; diff --git a/src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEAStngMixServiceImpl.java b/src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEAStngMixServiceImpl.java index 75029bad..4799f077 100644 --- a/src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEAStngMixServiceImpl.java +++ b/src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEAStngMixServiceImpl.java @@ -47,6 +47,11 @@ public class VEAStngMixServiceImpl implements VEAStngMixService { public List selectList_VEALPPS_2(VEAStngVO paramVO) throws Exception{ return vEAStngMixDAO.selectList_VEALPPS_2(paramVO); } + + public List selectList_VEALPPS_2_4_user(VEAStngVO paramVO) throws Exception{ + return vEAStngMixDAO.selectList_VEALPPS_2_4_user(paramVO); + } + public List selectList_VEALPPS_3(VEAStngVO paramVO) throws Exception{ return vEAStngMixDAO.selectList_VEALPPS_3(paramVO); diff --git a/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ScholInfoController.java b/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ScholInfoController.java index 203f9436..42ad2d5c 100644 --- a/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ScholInfoController.java +++ b/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ScholInfoController.java @@ -253,7 +253,7 @@ public class ScholInfoController { //schduleManageVO.setSearchStartDt(schduleManageVO.getSearchStartDt().split("T")[0].replaceAll("-", "")); //step1.현재달력의 첫번째 날짜를 기준으로 그해와 다음해의 전체 일자를 만들고, - List vList = vEAStngMixService.selectList_VEALPPS_2(vEAStngVO); + List vList = vEAStngMixService.selectList_VEALPPS_2_4_user(vEAStngVO); //return vEAStngMixService.selectList_VEALPPS_1(vEAStngVO); @@ -270,10 +270,12 @@ public class ScholInfoController { }else if (Integer.parseInt(vList.get(i).getTitleF())>=Integer.parseInt(vList.get(i).getTitleB())) { vList.get(i).setColor("#FF0000"); + vList.get(i).setTitle("가능"); }else if (Integer.parseInt(vList.get(i).getTitleF())*5>=Integer.parseInt(vList.get(i).getTitleB())*4) { vList.get(i).setColor("#FFAA00"); + vList.get(i).setTitle("가능"); } 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 8ca49840..e30bade4 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 @@ -5346,7 +5346,15 @@ VALUES substring(bbbb.edu_hope_dt,1,4)|| '-'|| substring(bbbb.edu_hope_dt,5,2)|| '-'|| substring(bbbb.edu_hope_dt,7,2) AS eduHopeDt , cccc.schol_instt_nm AS scholInsttNm , eeee.instr_nm AS instrNm + /* , IF(vals=0,'',vals) AS valss + */ + + , CASE + WHEN vals=0 THEN '' + ELSE vals + END AS valss + , aaaa.edu_aplct_ord , aaaa.edu_chasi_ord @@ -5384,7 +5392,7 @@ VALUES , nos||'' AS nos , 6-nos vals , SUM( - IF (qestnSn=1 + DECODE (qestnSn,1 , CASE WHEN nos=1 THEN verySatisfied @@ -5397,7 +5405,7 @@ VALUES ) ) AS qestnSn1 , SUM( - IF (qestnSn=2 + DECODE (qestnSn,2 , CASE WHEN nos=1 THEN verySatisfied @@ -5410,7 +5418,7 @@ VALUES ) ) AS qestnSn2 , SUM( - IF (qestnSn=3 + DECODE(qestnSn,3 , CASE WHEN nos=1 THEN verySatisfied @@ -5423,7 +5431,7 @@ VALUES ) ) AS qestnSn3 , SUM( - IF (qestnSn=4 + DECODE(qestnSn,4 , CASE WHEN nos=1 THEN verySatisfied @@ -5436,7 +5444,7 @@ VALUES ) ) AS qestnSn4 , SUM( - IF (qestnSn=5 + DECODE(qestnSn,5 , CASE WHEN nos=1 THEN verySatisfied @@ -5449,7 +5457,7 @@ VALUES ) ) AS qestnSn5 , SUM( - IF (qestnSn=6 + DECODE(qestnSn,6 , CASE WHEN nos=1 THEN verySatisfied @@ -5462,7 +5470,7 @@ VALUES ) ) AS qestnSn6 , SUM( - IF (qestnSn=7 + DECODE(qestnSn,7 , CASE WHEN nos=1 THEN verySatisfied @@ -5475,7 +5483,7 @@ VALUES ) ) AS qestnSn7 , SUM( - IF (qestnSn=8 + DECODE(qestnSn,8 , CASE WHEN nos=1 THEN verySatisfied @@ -5522,11 +5530,11 @@ VALUES ) , ( - SELECT 1 NOs - UNION ALL SELECT 2 NOs - UNION ALL SELECT 3 NOs - UNION ALL SELECT 4 NOs - UNION ALL SELECT 5 NOs + SELECT 1 NOs FROM DUAL + UNION ALL SELECT 2 NOs FROM DUAL + UNION ALL SELECT 3 NOs FROM DUAL + UNION ALL SELECT 4 NOs FROM DUAL + UNION ALL SELECT 5 NOs FROM DUAL )D WHERE 1 =1 /* @@ -5571,7 +5579,7 @@ VALUES , nos , 6-nos vals , SUM( - IF (qestnSn=1 + DECODE(qestnSn,1 , CASE WHEN nos=1 THEN verySatisfied @@ -5584,7 +5592,7 @@ VALUES ) ) AS qestnSn1 , SUM( - IF (qestnSn=2 + DECODE(qestnSn,2 , CASE WHEN nos=1 THEN verySatisfied @@ -5597,7 +5605,7 @@ VALUES ) ) AS qestnSn2 , SUM( - IF (qestnSn=3 + DECODE(qestnSn,3 , CASE WHEN nos=1 THEN verySatisfied @@ -5610,7 +5618,7 @@ VALUES ) ) AS qestnSn3 , SUM( - IF (qestnSn=4 + DECODE(qestnSn,4 , CASE WHEN nos=1 THEN verySatisfied @@ -5623,7 +5631,7 @@ VALUES ) ) AS qestnSn4 , SUM( - IF (qestnSn=5 + DECODE(qestnSn,5 , CASE WHEN nos=1 THEN verySatisfied @@ -5636,7 +5644,7 @@ VALUES ) ) AS qestnSn5 , SUM( - IF (qestnSn=6 + DECODE(qestnSn,6 , CASE WHEN nos=1 THEN verySatisfied @@ -5649,7 +5657,7 @@ VALUES ) ) AS qestnSn6 , SUM( - IF (qestnSn=7 + DECODE(qestnSn,7 , CASE WHEN nos=1 THEN verySatisfied @@ -5662,7 +5670,7 @@ VALUES ) ) AS qestnSn7 , SUM( - IF (qestnSn=8 + DECODE(qestnSn,8 , CASE WHEN nos=1 THEN verySatisfied @@ -5708,11 +5716,11 @@ VALUES ) , ( - SELECT 1 NOs - UNION ALL SELECT 2 NOs - UNION ALL SELECT 3 NOs - UNION ALL SELECT 4 NOs - UNION ALL SELECT 5 NOs + SELECT 1 NOs FROM DUAL + UNION ALL SELECT 2 NOs FROM DUAL + UNION ALL SELECT 3 NOs FROM DUAL + UNION ALL SELECT 4 NOs FROM DUAL + UNION ALL SELECT 5 NOs FROM DUAL )D WHERE 1 =1 /* @@ -5752,7 +5760,7 @@ VALUES , IF(qestnSn7 IS NULL OR qestnSn7=0,0,ROUND(CAST(SUM(qestnSn7*vals*1.0) / SUM(qestnSn7*5.0)*100.0 AS double),2)) AS qestnSn7 , IF(qestnSn8 IS NULL OR qestnSn8=0,0,ROUND(CAST(SUM(qestnSn8*vals*1.0) / SUM(qestnSn8*5.0)*100.0 AS double),2)) AS qestnSn8 */ - + /* ,ROUND(SUM(IF(qestnSn1 IS NULL OR qestnSn1=0,0,qestnSn1) *vals*1.0)*100 / IF(SUM(IF(qestnSn1 IS NULL OR qestnSn1=0,0,qestnSn1)*5.0)=0,1,SUM(IF(qestnSn1 IS NULL OR qestnSn1=0,0,qestnSn1)*5.0)),2) AS qestnSn1 ,ROUND(SUM(IF(qestnSn2 IS NULL OR qestnSn2=0,0,qestnSn2) *vals*1.0)*100 / IF(SUM(IF(qestnSn2 IS NULL OR qestnSn2=0,0,qestnSn2)*5.0)=0,1,SUM(IF(qestnSn2 IS NULL OR qestnSn2=0,0,qestnSn2)*5.0)),2) AS qestnSn2 ,ROUND(SUM(IF(qestnSn3 IS NULL OR qestnSn3=0,0,qestnSn3) *vals*1.0)*100 / IF(SUM(IF(qestnSn3 IS NULL OR qestnSn3=0,0,qestnSn3)*5.0)=0,1,SUM(IF(qestnSn3 IS NULL OR qestnSn3=0,0,qestnSn3)*5.0)),2) AS qestnSn3 @@ -5761,7 +5769,17 @@ VALUES ,ROUND(SUM(IF(qestnSn6 IS NULL OR qestnSn6=0,0,qestnSn6) *vals*1.0)*100 / IF(SUM(IF(qestnSn6 IS NULL OR qestnSn6=0,0,qestnSn6)*5.0)=0,1,SUM(IF(qestnSn6 IS NULL OR qestnSn6=0,0,qestnSn6)*5.0)),2) AS qestnSn6 ,ROUND(SUM(IF(qestnSn7 IS NULL OR qestnSn7=0,0,qestnSn7) *vals*1.0)*100 / IF(SUM(IF(qestnSn7 IS NULL OR qestnSn7=0,0,qestnSn7)*5.0)=0,1,SUM(IF(qestnSn7 IS NULL OR qestnSn7=0,0,qestnSn7)*5.0)),2) AS qestnSn7 ,ROUND(SUM(IF(qestnSn8 IS NULL OR qestnSn8=0,0,qestnSn8) *vals*1.0)*100 / IF(SUM(IF(qestnSn8 IS NULL OR qestnSn8=0,0,qestnSn8)*5.0)=0,1,SUM(IF(qestnSn8 IS NULL OR qestnSn8=0,0,qestnSn8)*5.0)),2) AS qestnSn8 - + */ + + ,ROUND(SUM(DECODE(qestnSn1,0,0,qestnSn1) *vals*1.0)*100 / DECODE(SUM(DECODE(qestnSn1,0,0,qestnSn1)*5.0),0,1,SUM(DECODE(qestnSn1,0,0,qestnSn1)*5.0)),2) AS qestnSn1 + ,ROUND(SUM(DECODE(qestnSn2,0,0,qestnSn2) *vals*1.0)*100 / DECODE(SUM(DECODE(qestnSn2,0,0,qestnSn2)*5.0),0,1,SUM(DECODE(qestnSn2,0,0,qestnSn2)*5.0)),2) AS qestnSn2 + ,ROUND(SUM(DECODE(qestnSn3,0,0,qestnSn3) *vals*1.0)*100 / DECODE(SUM(DECODE(qestnSn3,0,0,qestnSn3)*5.0),0,1,SUM(DECODE(qestnSn3,0,0,qestnSn3)*5.0)),2) AS qestnSn3 + ,ROUND(SUM(DECODE(qestnSn4,0,0,qestnSn4) *vals*1.0)*100 / DECODE(SUM(DECODE(qestnSn4,0,0,qestnSn4)*5.0),0,1,SUM(DECODE(qestnSn4,0,0,qestnSn4)*5.0)),2) AS qestnSn4 + ,ROUND(SUM(DECODE(qestnSn5,0,0,qestnSn5) *vals*1.0)*100 / DECODE(SUM(DECODE(qestnSn5,0,0,qestnSn5)*5.0),0,1,SUM(DECODE(qestnSn5,0,0,qestnSn5)*5.0)),2) AS qestnSn5 + ,ROUND(SUM(DECODE(qestnSn6,0,0,qestnSn6) *vals*1.0)*100 / DECODE(SUM(DECODE(qestnSn6,0,0,qestnSn6)*5.0),0,1,SUM(DECODE(qestnSn6,0,0,qestnSn6)*5.0)),2) AS qestnSn6 + ,ROUND(SUM(DECODE(qestnSn7,0,0,qestnSn7) *vals*1.0)*100 / DECODE(SUM(DECODE(qestnSn7,0,0,qestnSn7)*5.0),0,1,SUM(DECODE(qestnSn7,0,0,qestnSn7)*5.0)),2) AS qestnSn7 + ,ROUND(SUM(DECODE(qestnSn8,0,0,qestnSn8) *vals*1.0)*100 / DECODE(SUM(DECODE(qestnSn8,0,0,qestnSn8)*5.0),0,1,SUM(DECODE(qestnSn8,0,0,qestnSn8)*5.0)),2) AS qestnSn8 + , '99' AS srt FROM ( /* @@ -5776,7 +5794,7 @@ VALUES , nos , 6-nos vals , SUM( - IF (qestnSn=1 + DECODE (qestnSn,1 , CASE WHEN nos=1 THEN verySatisfied @@ -5789,7 +5807,7 @@ VALUES ) ) AS qestnSn1 , SUM( - IF (qestnSn=2 + DECODE (qestnSn,2 , CASE WHEN nos=1 THEN verySatisfied @@ -5802,7 +5820,7 @@ VALUES ) ) AS qestnSn2 , SUM( - IF (qestnSn=3 + DECODE (qestnSn,3 , CASE WHEN nos=1 THEN verySatisfied @@ -5815,7 +5833,7 @@ VALUES ) ) AS qestnSn3 , SUM( - IF (qestnSn=4 + DECODE (qestnSn,4 , CASE WHEN nos=1 THEN verySatisfied @@ -5828,7 +5846,7 @@ VALUES ) ) AS qestnSn4 , SUM( - IF (qestnSn=5 + DECODE (qestnSn,5 , CASE WHEN nos=1 THEN verySatisfied @@ -5841,7 +5859,7 @@ VALUES ) ) AS qestnSn5 , SUM( - IF (qestnSn=6 + DECODE (qestnSn,6 , CASE WHEN nos=1 THEN verySatisfied @@ -5854,7 +5872,7 @@ VALUES ) ) AS qestnSn6 , SUM( - IF (qestnSn=7 + DECODE (qestnSn,7 , CASE WHEN nos=1 THEN verySatisfied @@ -5867,7 +5885,7 @@ VALUES ) ) AS qestnSn7 , SUM( - IF (qestnSn=8 + DECODE (qestnSn,8 , CASE WHEN nos=1 THEN verySatisfied @@ -5913,11 +5931,11 @@ VALUES ) , ( - SELECT 1 NOs - UNION ALL SELECT 2 NOs - UNION ALL SELECT 3 NOs - UNION ALL SELECT 4 NOs - UNION ALL SELECT 5 NOs + SELECT 1 NOs FROM DUAL + UNION ALL SELECT 2 NOs FROM DUAL + UNION ALL SELECT 3 NOs FROM DUAL + UNION ALL SELECT 4 NOs FROM DUAL + UNION ALL SELECT 5 NOs FROM DUAL )D WHERE 1 =1 /* 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 60c625cb..4a279384 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 @@ -397,6 +397,197 @@ + + + -

교육가능시수현황

+

교육신청가능일자현황


-
+
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmEndDetail.jsp index 80944518..eb1b55ab 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmEndDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmEndDetail.jsp @@ -282,6 +282,7 @@ + + 해당설문없음 - + + --> diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/sspnIdtmtVisitEdu/endInfo/instrAsgnmEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/sspnIdtmtVisitEdu/endInfo/instrAsgnmEndDetail.jsp index 32c06461..2f88c8ce 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/sspnIdtmtVisitEdu/endInfo/instrAsgnmEndDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/sspnIdtmtVisitEdu/endInfo/instrAsgnmEndDetail.jsp @@ -258,6 +258,7 @@ + - + + -->