From 0e158398dd7078d380a0f954c3611616ff49dcb0 Mon Sep 17 00:00:00 2001 From: myname Date: Thu, 16 May 2024 17:24:52 +0900 Subject: [PATCH] =?UTF-8?q?2024-05-16=2017:24=20=EC=9B=94=EB=B3=84=20?= =?UTF-8?q?=EA=B5=90=EC=9C=A1=20=EC=9D=B4=EC=88=98=20=ED=98=84=ED=99=A9=20?= =?UTF-8?q?=ED=86=B5=EA=B3=84=20=EC=A0=95=EB=B3=B4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../instrInfo/service/VEInstrMixService.java | 3 + .../instrInfo/service/impl/VEInstrMixDAO.java | 7 +- .../service/impl/VEInstrMixServiceImpl.java | 6 +- .../lctrInfo/service/VELctrDetailVO.java | 7 ++ .../web/CndtnInstrMngController.java | 8 ++- .../ve/instr/VESttst_MIX_SQL_Tibero.xml | 69 ++++++++++++++++++- .../cndtnSspnIdtmt/newEduPrfrmMngList.jsp | 6 ++ 7 files changed, 100 insertions(+), 6 deletions(-) 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 ec89b30c..a26f181e 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 @@ -174,4 +174,7 @@ public interface VEInstrMixService { //교육실정통계- 3.대상별 교육 의뢰 현황(그래프 포함) List selectEduPrfrmInfo_csi_no3(VEInstrDetailVO vEInstrDetailVO) throws Exception; + + //교육실정통계- ⑤월별 교육 이수 현황(그래프 포함) + List selectEduPrfrmInfo_csi_no5(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 76f765a6..89601a41 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 @@ -341,5 +341,10 @@ public class VEInstrMixDAO extends EgovAbstractDAO { public List selectEduPrfrmInfo_csi_no3(VEInstrDetailVO vEInstrDetailVO) throws Exception { List tlist = (List) list("VESttstMixDAO.selectEduPrfrmInfo_csi_no3", vEInstrDetailVO); return tlist; - } + } + + public List selectEduPrfrmInfo_csi_no5(VEInstrDetailVO vEInstrDetailVO) throws Exception { + List tlist = (List) list("VESttstMixDAO.selectEduPrfrmInfo_csi_no5", 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 4b52e166..7e121908 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 @@ -273,5 +273,9 @@ public class VEInstrMixServiceImpl implements VEInstrMixService { public List selectEduPrfrmInfo_csi_no3(VEInstrDetailVO vEInstrDetailVO) throws Exception{ return vEInstrMixDAO.selectEduPrfrmInfo_csi_no3(vEInstrDetailVO); - } + } + + public List selectEduPrfrmInfo_csi_no5(VEInstrDetailVO vEInstrDetailVO) throws Exception{ + return vEInstrMixDAO.selectEduPrfrmInfo_csi_no5(vEInstrDetailVO); + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/VELctrDetailVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/VELctrDetailVO.java index a2547916..2d5c79a9 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/VELctrDetailVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/VELctrDetailVO.java @@ -228,6 +228,7 @@ public class VELctrDetailVO extends ComDefaultVO implements Serializable { private String codeNm; //코드명 private String cnt; //통계 데이터 숫자 + private String cnt2; //통계 데이터 숫자 public String getPrcsOrd() { @@ -1181,5 +1182,11 @@ public class VELctrDetailVO extends ComDefaultVO implements Serializable { public void setMntSum20(String mntSum20) { this.mntSum20 = mntSum20; } + public String getCnt2() { + return cnt2; + } + public void setCnt2(String cnt2) { + this.cnt2 = cnt2; + } } diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnInstrMngController.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnInstrMngController.java index 2a2ec304..9944275b 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnInstrMngController.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnInstrMngController.java @@ -594,7 +594,7 @@ public class CndtnInstrMngController { { vEInstrDetailVODetail = egovCryptoUtil.encryptVEInstrDetailVO(vEInstrDetailVODetail); vEInstrDetailVODetail.setSearchEduStateCd("20"); //이수만 보기 - List selectAsgnmInfoT5List = vEInstrMixService.selectEduPrfrmInfo_csi_no2(vEInstrDetailVODetail); + List selectAsgnmInfoT5List = vEInstrMixService.selectEduPrfrmInfo_csi_no5(vEInstrDetailVODetail); model.addAttribute("list_no5",selectAsgnmInfoT5List); } // ⑥대상별 교육이수현황(그래프 포함) - 대상이 없어서 제공안됨 @@ -1095,7 +1095,7 @@ public class CndtnInstrMngController { //vEInstrDetailVODetail.setInstrNm(vEInstrDetailVODetail.getSearchKeyword()); vEInstrDetailVODetail = egovCryptoUtil.encryptVEInstrDetailVO(vEInstrDetailVODetail); vEInstrDetailVODetail.setSearchEduStateCd("20"); //이수만 보기 - List selectAsgnmInfoT2List = vEInstrMixService.selectEduPrfrmInfo_csi_no2(vEInstrDetailVODetail); + List selectAsgnmInfoT2List = vEInstrMixService.selectEduPrfrmInfo_csi_no5(vEInstrDetailVODetail); //복호화 //selectAsgnmInfoT2List = egovCryptoUtil.decryptVELctrDetailVOList(selectAsgnmInfoT2List); @@ -1113,7 +1113,7 @@ public class CndtnInstrMngController { String title = "교육실적통계-월별 교육 이수 현황"; int[] width = { - 4000, 4000 + 4000, 4000, 4000 }; // 너비 @@ -1122,6 +1122,7 @@ public class CndtnInstrMngController { "월" , "이수(명)" + , "횟수" }; @@ -1129,6 +1130,7 @@ public class CndtnInstrMngController { "CodeNm" , "Cnt" + , "Cnt2" }; diff --git a/src/main/resources/egovframework/sqlmap/ve/instr/VESttst_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/instr/VESttst_MIX_SQL_Tibero.xml index a9393c76..95e02b27 100644 --- a/src/main/resources/egovframework/sqlmap/ve/instr/VESttst_MIX_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/instr/VESttst_MIX_SQL_Tibero.xml @@ -2268,5 +2268,72 @@ on(aaa.mnt=bbb.codeNm) ORDER BY aaa.mnt - + + + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/newEduPrfrmMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/newEduPrfrmMngList.jsp index 6a8f3de0..3325f7c7 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/newEduPrfrmMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/newEduPrfrmMngList.jsp @@ -1031,6 +1031,12 @@ + + + 횟수 + + +