2024-12-17 15:40 기소유예 통계 정보 및 화면 수정

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

@@ -533,6 +533,34 @@
 		/* 의뢰상태 검색*/	
 		<isNotEmpty prepend="AND" property="searchEduStateCd">
 			a.EDU_STATE_CD = #searchEduStateCd#
+			/*AND a.prcs_aplct_prd_ord_cmplt is null*/
+			
+			AND (
+			
+			CASE
+				WHEN a.prcs_aplct_prd_ord_cmplt IS NOT NULL THEN (
+						SELECT
+							CODE
+						FROM
+							LETTCCMMNDETAILCODE
+						WHERE
+							USE_AT = 'Y'
+							AND CODE_ID = 'VEA002'
+							AND CODE = (
+										SELECT
+											b.edu_state_cd
+										FROM
+											vea_sspn_idmt_trgt b
+										WHERE
+											b.sspn_idtmt_trgt_ord = a.prcs_aplct_prd_ord_cmplt 
+										) 
+						)
+				ELSE 	(
+							a.edu_state_cd 
+						)
+			END
+			)=#searchEduStateCd#			
+			
 		</isNotEmpty>
 		/* 교육상태 검색*/
 		<isNotEmpty property="searchReqStateCd">
@@ -549,6 +577,33 @@
 						</isNotEqual>
 
 					</isNotEqual>
+					
+						AND(
+						CASE
+							WHEN a.prcs_aplct_prd_ord_cmplt IS NOT NULL THEN (
+							
+							SELECT
+								CODE
+							FROM
+								LETTCCMMNDETAILCODE
+							WHERE
+								USE_AT = 'Y'
+								AND CODE_ID = 'VEA002'
+								AND CODE = (
+								SELECT
+									b.req_state_cd
+								FROM
+									vea_sspn_idmt_trgt b
+								WHERE
+									b.sspn_idtmt_trgt_ord = a.prcs_aplct_prd_ord_cmplt )		
+							
+							)
+							WHEN a.EDU_STATE_CD = '20'
+							AND a.req_state_cd = '20' THEN a.req_state_cd
+							ELSE (
+							a.req_state_cd )
+						END	)=#searchReqStateCd#					
+					
 		</isNotEmpty>
 
 		/* 교육상태 검색*/	

src/main/resources/egovframework/sqlmap/ve/instr/VESttst_MIX_SQL_Tibero.xml

@@ -2136,16 +2136,27 @@
 						, sum(aa.cnt) 					AS cnt
 					FROM (
 								SELECT NVL(a.CMPTNT_ATHRT,'미정') AS CMPTNT_ATHRT
-									, count(*) AS cnt			
-								FROM vea_sspn_idmt_trgt a
-								WHERE to_char(a.REQ_PNTTM,'YYYY')=#mngNmbrYr#
-								/*	병합제거시 주석 제거 할것
-									AND a.prcs_aplct_prd_ord_cmplt IS null
-									*/
+									, count(*) AS cnt	
+											
+								FROM
+									vea_sspn_idmt_trgt a ,
+									ve_edu_aplct b ,
+									ve_prcs_aplct_prd c ,
+									vea_aplct_detail_info d
+								WHERE
+									SUBSTRING(c.edu_strt_pnttm, 1, 4)=#mngNmbrYr#
+									AND b.aprvl_cd = '60'
+									AND b.prcs_ord = c.prcs_aplct_prd_ord
+									AND a.sspn_idtmt_trgt_ord = b.rnds_ord 
+									
+									/* 병합제거시 주석 제거 할것	
+									AND a.prcs_aplct_prd_ord_cmplt IS null */
 									
 								<isNotEmpty property="searchEduStateCd">
 							   		AND a.edu_state_cd	=	#searchEduStateCd#
-							   	</isNotEmpty>									
+							   	</isNotEmpty>	
+									AND b.EDU_APLCT_ORD = d.EDU_APLCT_ORD
+									AND d.aplct_state_cd = '20'
 									
 								GROUP BY a.CMPTNT_ATHRT
 						)aa	LEFT OUTER JOIN
@@ -2249,15 +2260,25 @@
 						substring(req_nmbr,0,1) AS CMPTNT_ATHRT ,
 						count(*) AS cnt
 					FROM
-						vea_sspn_idmt_trgt a
-					WHERE to_char(a.REQ_PNTTM,'YYYY')=#mngNmbrYr#
-										 
-						/* 병합제거시 주석 제거 할것
-			           AND a.prcs_aplct_prd_ord_cmplt IS null */
-			           
-						<isNotEmpty property="searchEduStateCd">
-					   		AND a.edu_state_cd	=	#searchEduStateCd#
-					   	</isNotEmpty>						           
+						vea_sspn_idmt_trgt a ,
+						ve_edu_aplct b ,
+						ve_prcs_aplct_prd c ,
+						vea_aplct_detail_info d
+					WHERE
+						SUBSTRING(c.edu_strt_pnttm, 1, 4)=#mngNmbrYr#
+						AND b.aprvl_cd = '60'
+						AND b.prcs_ord = c.prcs_aplct_prd_ord
+						AND a.sspn_idtmt_trgt_ord = b.rnds_ord 
+						
+						/* 병합제거시 주석 제거 할것	
+						AND a.prcs_aplct_prd_ord_cmplt IS null */
+						
+					<isNotEmpty property="searchEduStateCd">
+				   		AND a.edu_state_cd	=	#searchEduStateCd#
+				   	</isNotEmpty>	
+						AND b.EDU_APLCT_ORD = d.EDU_APLCT_ORD
+						AND d.aplct_state_cd = '20'
+														           
 			           
 					GROUP BY
 						substring(req_nmbr,0,1) )aa

src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml

@@ -418,8 +418,11 @@
 		WHERE
 			1=1		
 			AND a.prcs_ord=b.prcs_ord
-			
 
+		<isNotEmpty property="searchStatus">
+			AND b.prcs_div=#searchStatus#
+		</isNotEmpty>
+		
 		<isNotEmpty property="selectPagingListQuery">
 			$selectPagingListQuery$
 		</isNotEmpty>
@@ -664,7 +667,10 @@
 			1=1		
 			AND a.prcs_ord=b.prcs_ord
 			
-
+		<isNotEmpty property="searchStatus">
+			AND b.prcs_div=#searchStatus#
+		</isNotEmpty>
+		
 		<isNotEmpty property="selectPagingListQuery">
 			$selectPagingListQuery$
 		</isNotEmpty>

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

@@ -326,7 +326,7 @@
 <form:form id="createForm" name="createForm" commandName="vEPrcsDetailVO" method="post">
 <input type="hidden" name="sspnIdtmtTrgtOrd" value="<c:out value='${info.sspnIdtmtTrgtOrd}' />"/>
 <input type="hidden" name="atchFileId" value="<c:out value='${info.atchFileId}' />" />
-<input type="hidden" name="reqNmbr" value="<c:out value="${info.reqNmbr }" />" />
+
 <input type="hidden" name="cmptntAthrtNm" id="cmptntAthrtNm" value="" />
 <!-- cont -->
 <div class="cont_wrap">
@@ -371,6 +371,13 @@
 								</div>
 							</div>
 						</td>
+						<th scope="row">의뢰번호</th>
+						<td>
+							<input type="text" name="reqNmbr" value="<c:out value="${info.reqNmbr }" />" />
+						</td>
+						
+						
+						
 					</tr>
 					<tr>
 						<th scope="row">사건번호</th>