2024-02-22 11:30 실무역량 수량 맞추기 쿼리 수정

src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java

@@ -568,8 +568,8 @@ public class SspnIdtmtController {
 	        
 	        
 	    	VEEduAplctVO vEEduAplctVO = new VEEduAplctVO();
-	    	
+	    	String s_eduAplctOrd	=	eduAplctGnrService.getNextStringId();
-	    	vEEduAplctVO.setEduAplctOrd(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#

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<VELctrDetailVO> selectAsgnmInfoT2List = 	    	vEInstrMixService.selectEduPrfrmInfo_tngr_no1(vEInstrDetailVODetail);
+	    	List<VELctrDetailVO> 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"
+				"CodeNm"
-				, "Chasi"
+				, "Cnt"				
-				, "Mnt01"
-				//, "wCnt"
-				, "Mnt02"
-				
-				, "Mnt03", "Mnt04", "Mnt05", "Mnt06", "Mnt07"
-				, "Mnt08", "Mnt09", "Mnt10", "Mnt11", "Mnt12"
-				, "MntSum"
 				
 			};
 

src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml

@@ -403,6 +403,9 @@
 		<isNotEmpty property="reqStateCd">
 			, req_state_cd				= #reqStateCd#
 		</isNotEmpty>
+		<isNotEmpty property="eduAplctOrd">
+			, edu_aplct_ord				= #eduAplctOrd#
+		</isNotEmpty>				        
 			   
 			, edu_state_cd				= #eduStateCd#   
 			, prcs_aplct_prd_ord_cmplt	= #prcsAplctPrdOrdCmplt#

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 IS NOT NULL -->
 			<isNotEmpty property="searchKeyword">
 				AND 
 					b.MBER_NM LIKE CONCAT('%' , #searchKeyword# , '%') 

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,
 			<include refid="VEEduMIXDAO.select_column_name"/>,
 			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,
 			<include refid="VEEduMIXDAO.select_column_name"/>,
 			vsit.trgt_nm AS trgtNm,
 			vsit.sspn_idtmt_trgt_ord AS sspnIdtmtTrgtOrd,

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 
+<!-- 					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 
+<!-- 					AND le.MBER_NM IS NOT NULL  -->
               )	AS nosCnt1
               /*
               	신청자 정보 

src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp

@@ -662,15 +662,15 @@
 			<div class="tb_type01">
 				<table>
 					<colgroup>
-						<col style="width: 5%">
+						<col style="width: 50px">
-						<col style="width: 180px;">
-						<col style="width: 12%">
-						<col style="width: 12%">
 						<col style="width: 210px;">
+						<col style="width: 150px;">
+						<col style="width: auto">
+						<col style="width: 150px;">
+						<col style="width: 110px;">						
 						<col style="width: 210px;">			
-						<col style="width: 210px;">			
+						<col style="width: 150px;">
-						<col style="width: 180px;">
+<%-- 						<col style="width: 140px;">			 --%>
-						<col style="width: 140px;">			
 					</colgroup>
 					<thead>
 					<tr>
@@ -682,7 +682,7 @@
 						<th>교육이수여부</th>						
 						<th>교육이수상태변경</th>					
 						<th>설문조사</th>					
-						<th>이수증</th>							
+<!-- 						<th>이수증</th>							 -->
 					</tr>
 					</thead>					
 					<tbody>
@@ -696,7 +696,8 @@
 											data-clphone="<c:out value='${list.phone}' />" title="Check" type="checkbox"/>
 										</td>
 										<td>
-											<c:out value="${list.userNm}"/>(<c:out value="${list.trgtNm}"/>)(<c:out value="${list.sspnIdtmtTrgtOrd}"/>)
+											<c:out value="${list.trgtNm}"/><br/>(<c:out value="${list.mberId}"/>)
+<%-- 											<br/>(<c:out value="${list.sspnIdtmtTrgtOrd}"/>) --%>
 										</td>
 										<td>
 											<c:out value="${list.dBirth}"/>
@@ -769,34 +770,26 @@
 												</c:otherwise>
 											</c:choose>											
 										</td>
-										<td>
+<!-- 										<td> -->
+											
 <%-- 											<c:choose> --%>
-<%-- 												<c:when test="${list.qestRsltExists }"> --%>
+<%-- 												<c:when test="${list.aplctStateCd eq 20 and list.qestnrId10Cnt gt 0}"> --%>
-<%-- 													<button type="button" title="이수증" class="btn_type04" onclick="fncCmpltCrtfc('<c:out value="${info.prcsAplctPrdOrd}"/>', '<c:out value="${list.eduAplctOrd}"/>');">이수증</button> --%>
+<%-- 													<button type="button" title="이수증" class="btn_type01" onclick="fncCmpltCrtfc('<c:out value="${list.prcsOrd}"/>', '<c:out value="${list.eduAplctOrd}"/>');">이수증</button> --%>
+<%-- 												</c:when> --%>
+<%-- 												<c:when test="${list.aplctStateCd eq 20 and not(list.qestnrId10Cnt gt 0)}"> --%>
+<!-- 													설문등록 후 발급 -->
 <%-- 												</c:when> --%>
 <%-- 												<c:otherwise> --%>
-<!-- 												- -->
+<!-- 													- -->
-<%-- 												</c:otherwise> --%>
+<%-- 												</c:otherwise>								 --%>
-<%-- 											</c:choose> --%>
+<%-- 											</c:choose>												 --%>
-											
+<!-- 										</td> -->
-											<c:choose>
-												<c:when test="${list.aplctStateCd eq 20 and list.qestnrId10Cnt gt 0}">
-													<button type="button" title="이수증" class="btn_type01" onclick="fncCmpltCrtfc('<c:out value="${list.prcsOrd}"/>', '<c:out value="${list.eduAplctOrd}"/>');">이수증</button>
-												</c:when>
-												<c:when test="${list.aplctStateCd eq 20 and not(list.qestnrId10Cnt gt 0)}">
-													설문등록 후 발급
-												</c:when>
-												<c:otherwise>
-													-
-												</c:otherwise>								
-											</c:choose>												
-										</td>
 									</tr>					
 								</c:forEach>
 							</c:when>
 							<c:otherwise>
 								<tr>
-									<td colspan="6">데이터가 없습니다.</td>
+									<td colspan="8">데이터가 없습니다.</td>
 								</tr>
 							</c:otherwise>
 						</c:choose>

src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/newEduPrfrmMngList.jsp

@@ -84,7 +84,7 @@
 	
 	function excelDownLoad_no1(){
 		var listForm = document.listForm ;
-		listForm.action = "<c:url value='/kccadr/oprtn/cndtnSspnIdtmt/eduPrfrmMngExcelDownLoad_tngr_no1.do'/>";
+		listForm.action = "<c:url value='/kccadr/oprtn/cndtnSspnIdtmt/eduPrfrmMngExcelDownLoad_csi_no1.do'/>";
 		listForm.submit();
 	}
 
@@ -207,105 +207,6 @@
 						</div>
 					</div>
 
-					<!-- list -->
-					<div class="tb_type01">
-						<table>
-							<colgroup>
-<%-- 								<col style="width: 10%"> --%>
-								<col style="width: 6%">
-								<col style="width: 6%">
-								
-								<col style="width: 6%">
-								<col style="width: 6%">
-								<col style="width: 6%">
-								<col style="width: 6%">
-								<col style="width: 6%">
-								<col style="width: 6%">
-								
-								<col style="width: 6%">
-								<col style="width: 6%">
-								<col style="width: 6%">
-								<col style="width: 6%">
-								<col style="width: 6%">
-								<col style="width: 6%">
-								<col style="width: auto;">																
-							</colgroup>
-							<thead>
-							<tr>
-<!-- 								<th>대상</th> -->
-								<th>구분</th>
-								<th>의뢰(명)</th>
-								
-								<th>1월</th>
-								<th>2월</th>
-								<th>3월</th>
-								<th>4월</th>
-								<th>5월</th>
-								<th>6월</th>
-								<th>7월</th>
-								<th>8월</th>
-								<th>9월</th>
-								<th>10월</th>
-								<th>11월</th>
-								<th>12월</th>
-								<th>합계</th>								
-							</tr>
-							</thead>
-							<tbody>
-							<c:set var="title1" value="" />
-							<c:set var="title2" value="" />
-							<c:forEach var="list" items="${list_no1}" varStatus="status">
-								<tr>
-									<!-- 
-									<td>
-										<c:choose>
-											<c:when test="${list.divCd eq title1}">
-												
-											</c:when>
-											<c:otherwise>
-												<c:out value="${list.divCd}"/>
-											</c:otherwise>
-										</c:choose>																				
-									</td>
-									 -->
-									 <td><c:out value="${list.codeNm}"/></td>
-									 <td><fmt:formatNumber value="${list.cnt}" pattern="#,###"/></td>
-									<td>
-										<c:choose>
-											<c:when test="${list.eduSlctCd eq title2}">
-												
-											</c:when>
-											<c:otherwise>
-												<c:out value="${list.eduSlctCd}"/>
-											</c:otherwise>
-										</c:choose>																				
-									</td>
-									<td><fmt:formatNumber value="${list.mnt02}" pattern="#,###"/></td>
-									<td><fmt:formatNumber value="${list.mnt03}" pattern="#,###"/></td>
-									<td><fmt:formatNumber value="${list.mnt04}" pattern="#,###"/></td>
-									<td><fmt:formatNumber value="${list.mnt05}" pattern="#,###"/></td>
-									<td><fmt:formatNumber value="${list.mnt06}" pattern="#,###"/></td>
-									<td><fmt:formatNumber value="${list.mnt07}" pattern="#,###"/></td>
-									<td><fmt:formatNumber value="${list.mnt08}" pattern="#,###"/></td>
-									<td><fmt:formatNumber value="${list.mnt09}" pattern="#,###"/></td>
-									<td><fmt:formatNumber value="${list.mnt10}" pattern="#,###"/></td>
-									<td><fmt:formatNumber value="${list.mnt11}" pattern="#,###"/></td>
-									<td><fmt:formatNumber value="${list.mnt12}" pattern="#,###"/></td>
-									<td><fmt:formatNumber value="${list.mntSum}" pattern="#,###"/></td>									
-								</tr>
-								
-									<c:set var="title1" value="${list.divCd}" />
-									<c:set var="title2" value="${list.eduSlctCd}" />								
-								
-							</c:forEach>
-							<c:if test="${empty list_no1}">
-								<tr><td colspan="15"><spring:message code="common.nodata.msg" /></td></tr>
-							</c:if>
-							</tbody>
-						</table>
-					</div>
-					<!-- //list -->
-
 					<!-- 월별 횟수/교육인원 차트 -->
 					<!-- 횟수합계 - dataNOT / 인원합계 = dataNOP -->
 					
@@ -407,6 +308,52 @@
 					</div>
 					<!-- /월별 횟수/교육인원 차트 -->
 
+					<!-- list -->
+					<div class="tb_type01">
+						<table>
+							<colgroup>
+<%-- 								<col style="width: 10%"> --%>
+								<col style="width: 200px">
+								<col style="width: 200px">
+																								
+							</colgroup>
+							<thead>
+							<tr>
+<!-- 								<th>대상</th> -->
+								<th>구분</th>
+								<th>의뢰(명)</th>
+														
+							</tr>
+							</thead>
+							<tbody>
+							<c:forEach var="list" items="${list_no1}" varStatus="status">
+								<tr>
+									<!-- 
+									<td>
+										<c:choose>
+											<c:when test="${list.divCd eq title1}">
+												
+											</c:when>
+											<c:otherwise>
+												<c:out value="${list.divCd}"/>
+											</c:otherwise>
+										</c:choose>																				
+									</td>
+									 -->
+									 <td><c:out value="${list.codeNm}"/></td>
+									 <td><fmt:formatNumber value="${list.cnt}" pattern="#,###"/></td>
+
+																	
+								</tr>								
+								
+							</c:forEach>
+							<c:if test="${empty list_no1}">
+								<tr><td colspan="2"><spring:message code="common.nodata.msg" /></td></tr>
+							</c:if>
+							</tbody>
+						</table>
+					</div>
+					<!-- //list -->
 
 					<!-- list util -->
 					<div class="list_util">

src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp

@@ -725,17 +725,17 @@
 			<div class="tb_type01">
 				<table>
 					<colgroup>
-						<col style="width: 5%">
+						<col style="width: 50px">
-						<col style="width: 10%;">
+						<col style="width: 210px">
-						<col style="width: 10%;">
+						<col style="width: 100px">
-						<col style="width: 10%;">
+						<col style="width: auto;">
-						<col style="width: 10%;">
+						<col style="width: 150px">
-						<col style="width: 10%;">
+						<col style="width: 100px">
-						<col style="width: 10%;">
+						<col style="width: 100px">
-						<col style="width: 10%;">
+						<col style="width: 100px">
-						<col style="width: 10%;">
+						<col style="width: 150px">
-						<col style="width: 10%;">
+						<col style="width: 150px">
-						<col style="width: 10%;">
+						<col style="width: 150px">
 					</colgroup>
 					<thead>
 					<tr>
@@ -769,7 +769,7 @@
 <%-- 											value="${list.eduAplctOrd}" title="Check" type="checkbox"/> --%>
 <!-- 										</td> -->
 										<td>
-											<c:out value="${list.userNm}"/>
+											<c:out value="${list.mberId}"/>
 										</td>
 										<td>
 											<c:out value="${list.chrgNm}"/>

src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngDetail.jsp

@@ -531,11 +531,19 @@
 			<div class="tb_type01">
 				<table>
 					<colgroup>
-						<col style="width: 5%">
+						<col style="width: 50px">
-						<col style="width: 5%">
 						<col style="width: 210px;"><!-- name -->
+						<col style="width: 100px;">
+						<col style="width: 100px;">
+						<col style="width: 100px;">
+						<col style="width: 150px;">
 						<col style="width: auto;"><!-- 제출일 -->
-						<col style="width: 210px;"><!-- 신청상태 -->						
+						<col style="width: 100px;">
+						
+						<col style="width: 100px;">						
+						<col style="width: 110px;"><!-- name -->
+						
+						<col style="width: 100px;">					
 					</colgroup>
 					<thead>
 					<tr>
@@ -565,7 +573,7 @@
 											value="${list.eduAplctOrd}" title="Check" type="checkbox"/>
 										</td>
 										<td>
-											<c:out value="${list.userNm}"/>
+											<c:out value="${list.mberId}"/>
 										</td>
 										<td>
 											<c:out value="${list.sbmtPnttm}"/>

src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp

@@ -77,12 +77,14 @@
 	}
 
 	function fncGoList(){
+		/*
 		var listForm = document.listForm ;
 		listForm.action = "<c:url value='/web/ve/aplct/sspnIdtmt/eduAplctList.do'/>";
 		listForm.submit();
+		*/
+		history.back(-1);
 	}
 
-
 	function fncSendSubmit(){
 		if(confirm("제출 하시겠습니까?")){
 			$.ajax({
@@ -417,6 +419,9 @@
 	</div>
 	<div class="btn_wrap btn_layout01">
 		<div class="btn_left">
+			<button type="button"  id="listBtn" class="btnType02" onclick="fncGoList();">
+				목록
+			</button>		
 		</div>
 		<div class="btn_center">
 		</div>
@@ -459,7 +464,7 @@
 								<th scope="row">주민번호앞자리</th>
 								<td>
 									<div class="calendar_wrap">
-										<duet-date-picker identifier="date" id="dBirth" class="startDate" id="" min="1940-01-01"></duet-date-picker>
+<!-- 										<duet-date-picker identifier="date" id="dBirth" class="" id="" min="1940-01-01"></duet-date-picker> -->
 									</div>
 									<script src="${pageContext.request.contextPath}/visitEdu/usr/publish/script/duetdatepicker2.js"></script>
 								</td>