diff --git a/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java b/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java index e7c30d5d..aedb1529 100644 --- a/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java +++ b/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java @@ -568,8 +568,8 @@ public class SspnIdtmtController { VEEduAplctVO vEEduAplctVO = new VEEduAplctVO(); - - vEEduAplctVO.setEduAplctOrd(eduAplctGnrService.getNextStringId()); + String s_eduAplctOrd = eduAplctGnrService.getNextStringId(); + vEEduAplctVO.setEduAplctOrd(s_eduAplctOrd); vEEduAplctVO.setLctrDivCd(VeConstants.LCTR_DIV_CD_60); // 기소유예 vEEduAplctVO.setAprvlCd("10"); // 승인코드 VE0003 10 - 요청, 20 - 승인, 30 - 반려 @@ -589,7 +589,7 @@ public class SspnIdtmtController { //암호화 vEEduAplctVO = egovCryptoUtil.encryptVEEduAplctVOInfo(vEEduAplctVO); vEEduAplctVO.setRndsOrd(vEPrcsDetailVO.getSspnIdtmtTrgtOrd()); //2024-02-07 추가 신청서 정보에 대상자 정보를 넣어야 추후 구분이 가능해서 추가함 - sspnIdtmtService.insertVeEduAplct(vEEduAplctVO); + sspnIdtmtService.insertVeEduAplct(vEEduAplctVO); CndtnTrgtMngVO cndtnTrgtMngVO = new CndtnTrgtMngVO(); @@ -597,6 +597,9 @@ public class SspnIdtmtController { cndtnTrgtMngVO.setUserId(loginVO.getUniqId()); cndtnTrgtMngVO.setSspnIdtmtTrgtOrd(vEPrcsDetailVO.getSspnIdtmtTrgtOrd()); cndtnTrgtMngVO.setEduStateCd("25"); // 신청 + + cndtnTrgtMngVO.setEduAplctOrd(s_eduAplctOrd); //동일한 대상자가 어떤 신청서와 맞는지 매칭에 필요함 + //cndtnTrgtMngVO.setPrcsAplctPrdOrdCmplt(vEPrcsDetailVO.getPrcsAplctPrdOrd()); // 교육 번호 // , edu_state_cd = #eduStateCd# // , prcs_aplct_prd_ord_cmplt = #prcsAplctPrdOrdCmplt# 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 ca4694f4..e4791824 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnInstrMngController.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnInstrMngController.java @@ -653,7 +653,7 @@ public class CndtnInstrMngController { //통계- ①월별 횟수/교육인원(그래프 포함) //vEInstrDetailVODetail.setInstrNm(vEInstrDetailVODetail.getSearchKeyword()); vEInstrDetailVODetail = egovCryptoUtil.encryptVEInstrDetailVO(vEInstrDetailVODetail); - List selectAsgnmInfoT2List = vEInstrMixService.selectEduPrfrmInfo_tngr_no1(vEInstrDetailVODetail); + List selectAsgnmInfoT2List = vEInstrMixService.selectEduPrfrmInfo_csi_no1(vEInstrDetailVODetail); //복호화 //selectAsgnmInfoT2List = egovCryptoUtil.decryptVELctrDetailVOList(selectAsgnmInfoT2List); @@ -666,17 +666,10 @@ public class CndtnInstrMngController { // 세팅값 - String title = "교육실적통계-월별 횟수.교육인원"; + String title = "교육실적통계-검찰청별 교육 의뢰 현황"; int[] width = { 4000, 4000 - , 4000 - , 4000, 4000 - //, 4000 - , 4000 - - , 4000, 4000, 4000, 4000, 4000 - , 4000, 4000, 4000, 4000, 4000 }; // 너비 @@ -684,28 +677,14 @@ public class CndtnInstrMngController { String[] header = { "구분" - , "횟수/인원" - , "1월" - //, "요일" - , "2월" - - , "3월", "4월", "5월", "6월", "7월" - , "8월", "9월", "10월", "11월", "12월" - , "합계" + , "의뢰(명)" }; String[] order = { - "EduSlctCd" - , "Chasi" - , "Mnt01" - //, "wCnt" - , "Mnt02" - - , "Mnt03", "Mnt04", "Mnt05", "Mnt06", "Mnt07" - , "Mnt08", "Mnt09", "Mnt10", "Mnt11", "Mnt12" - , "MntSum" + "CodeNm" + , "Cnt" }; diff --git a/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml index 6fbc1518..351fcac0 100644 --- a/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml @@ -402,7 +402,10 @@ , req_state_cd = #reqStateCd# - + + + , edu_aplct_ord = #eduAplctOrd# + , edu_state_cd = #eduStateCd# , prcs_aplct_prd_ord_cmplt = #prcsAplctPrdOrdCmplt# diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Cubrid.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Cubrid.xml index 8b69e528..1d37cf20 100644 --- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Cubrid.xml +++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Cubrid.xml @@ -2658,7 +2658,7 @@ VALUES INNER JOIN lettngnrlmber b ON a.scrty_dtrmn_trget_id = b.mber_id WHERE a.author_code = 'ROLE_USER_MEMBER' - AND b.MBER_NM IS NOT NULL + AND b.MBER_NM LIKE CONCAT('%' , #searchKeyword# , '%') 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 9b12919d..64a842f8 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 @@ -128,6 +128,7 @@ vadi.CNCL_ATCH_FILE_ID AS cnclAtchFileId, vadi.CNCL_CN AS cnclCn, le.MBER_NM AS userNm, + le.MBER_ID AS mberId, , a.CHRG_NM AS chrgNm , a.D_BIRTH AS dBirth , @@ -342,6 +343,7 @@ vadi.APLCT_STATE_CD AS aplctStateCd, /* 이수 상태 */ vsit.edu_state_cd AS eduStateCd, le.MBER_NM AS userNm, + le.MBER_ID AS mberId, , vsit.trgt_nm AS trgtNm, vsit.sspn_idtmt_trgt_ord AS sspnIdtmtTrgtOrd, diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml index bf25adde..e11448db 100644 --- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml @@ -379,7 +379,7 @@ WHERE x.prcs_ord = a.prcs_aplct_prd_ord AND x.sbmt_yn='Y' AND x.aprvl_cd != 40 /*취소된 신청자 제거*/ - AND le.MBER_NM IS NOT NULL + ) AS nosCnt1 /* 신청자 정보 @@ -463,7 +463,7 @@ AND x.sbmt_yn='Y' AND x.aprvl_cd != 40 /*취소된 신청자 제거*/ AND x.aprvl_cd != 30 /*취소된 신청자 제거*/ - AND le.MBER_NM IS NOT NULL + ) AS nosCnt1 /* 신청자 정보 diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp index 5c39a1f7..86bdad97 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp @@ -662,15 +662,15 @@
- - - - + - + + + + - - + +<%-- --%> @@ -682,7 +682,7 @@ - + @@ -696,7 +696,8 @@ data-clphone="" title="Check" type="checkbox"/> - + +<%-- --%> +<%-- --%> + - + 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 9f1119b5..59e35ced 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/newEduPrfrmMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/newEduPrfrmMngList.jsp @@ -84,7 +84,7 @@ function excelDownLoad_no1(){ var listForm = document.listForm ; - listForm.action = ""; + listForm.action = ""; listForm.submit(); } @@ -206,105 +206,6 @@ - - -
-
교육이수여부 교육이수상태변경 설문조사이수증
- ()() +
() +<%--
() --%> 		@@ -769,34 +770,26 @@ + + <%-- --%> -<%-- --%> -<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> + <%-- --%> <%-- --%> - -<%-- --%> -<%-- --%> - - - - - - - 설문등록 후 발급 - - - - - - -
데이터가 없습니다.데이터가 없습니다.
- -<%-- --%> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
구분의뢰(명)1월2월3월4월5월6월7월8월9월10월11월12월합계
- - - - - - - - -
-
- @@ -407,6 +308,52 @@ + +
+ + +<%-- --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + +
구분의뢰(명)
+
+
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp index 4d4be822..d2eca6ca 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp @@ -725,17 +725,17 @@
- - - - - - - - - - - + + + + + + + + + + + @@ -769,7 +769,7 @@ <%-- value="${list.eduAplctOrd}" title="Check" type="checkbox"/> --%>
- + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngDetail.jsp index 0d66b80f..c2df589b 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngDetail.jsp @@ -531,11 +531,19 @@
- - + + + + + - + + + + + + @@ -565,7 +573,7 @@ value="${list.eduAplctOrd}" title="Check" type="checkbox"/>
- + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp index ecad50ec..dc3d2fd8 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp @@ -77,12 +77,14 @@ } function fncGoList(){ + /* var listForm = document.listForm ; listForm.action = ""; listForm.submit(); + */ + history.back(-1); } - function fncSendSubmit(){ if(confirm("제출 하시겠습니까?")){ $.ajax({ @@ -417,6 +419,9 @@
+
@@ -459,7 +464,7 @@
주민번호앞자리
- +