2024-04-15 14:40 기소유예 성능 향상을 위한 대상자 목록 쿼리 수정

src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngVO.java

@@ -67,6 +67,11 @@ public class CndtnTrgtMngVO extends ComDefaultVO implements Serializable {
 	private String aplctStateCd;
 	private String cnclCn;
 	
+	private String eduStateCdNm;	// 대상상태명
+	private String reqStateCdNm;	// 신청상태명
+	//private String cmptntAthrtNm;	// 대상상태코드 VEA002
+	private String sexNm;			// 성별명
+	
 
 	public String getTitle() {
 		return title;
@@ -339,5 +344,23 @@ public class CndtnTrgtMngVO extends ComDefaultVO implements Serializable {
 	public void setCnclCn(String cnclCn) {
 		this.cnclCn = cnclCn;
 	}
+	public String getEduStateCdNm() {
+		return eduStateCdNm;
+	}
+	public void setEduStateCdNm(String eduStateCdNm) {
+		this.eduStateCdNm = eduStateCdNm;
+	}
+	public String getReqStateCdNm() {
+		return reqStateCdNm;
+	}
+	public void setReqStateCdNm(String reqStateCdNm) {
+		this.reqStateCdNm = reqStateCdNm;
+	}
+	public String getSexNm() {
+		return sexNm;
+	}
+	public void setSexNm(String sexNm) {
+		this.sexNm = sexNm;
+	}
 	
 }

src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java

@@ -1956,7 +1956,9 @@ public class CndtnTrgtMngController {
 				tmp.setReqPnttm(tmp.getReqPnttm().substring(0, 10));
 				//사건번호
 				tmp.setVntYear(tmp.getVntYear()+"형제"+tmp.getVntNmbr());
+				
 				//관할청
+				/*
 				if(StringUtil.isNotEmpty(tmp.getCmptntAthrt())) {
 			        vo.setCodeId("VEA008");
 			        vo.setCode(tmp.getCmptntAthrt());
@@ -1964,18 +1966,24 @@ public class CndtnTrgtMngController {
 					
 					if (cmmnDetailCode!=null) tmp.setCmptntAthrt(StringUtil.escapeXml(cmmnDetailCode.getCodeNm()));
 				}
+				*/
+				
 				//생년월일
 				if(StringUtil.isNotEmpty(tmp.getdBirth())) {
 					tmp.setDBirth(tmp.getdBirth());
 				}
+				
 	            //성별
+				/*
 				if(StringUtil.isNotEmpty(tmp.getSex())) {
 		            vo.setCodeId("COM014");
 			        vo.setCode(tmp.getSex());
 					CmmnDetailCode cmmnDetailCodeSex= egovCmmUseService.selectCmmCodeDetailValue(vo);
 					if (cmmnDetailCodeSex!=null) tmp.setSex((StringUtil.escapeXml(cmmnDetailCodeSex.getCodeNm())));
 				}
+				*/
 	            //의뢰상태
+				/*
 				if(StringUtil.isNotEmpty(tmp.getReqStateCd())) {
 		            if (tmp.getPrcsAplctPrdOrdCmplt()==null) {
 			            vo.setCodeId("VEA005");
@@ -1986,13 +1994,16 @@ public class CndtnTrgtMngController {
 		            	tmp.setReqStateCd("병합처리");
 		            }
 				}
+				*/
 	            //교육상태
+				/*
 				if(StringUtil.isNotEmpty(tmp.getEduStateCd())) {
 		            vo.setCodeId("VEA002");
 			        vo.setCode(tmp.getEduStateCd());
 					CmmnDetailCode cmmnDetailCodeEduState= egovCmmUseService.selectCmmCodeDetailValue(vo);
 					if (cmmnDetailCodeEduState!=null) tmp.setEduStateCd((StringUtil.escapeXml(cmmnDetailCodeEduState.getCodeNm())));
 				}
+				*/
 				//주소
 				if(StringUtil.isNotEmpty(tmp.getAddr()) && StringUtil.isNotEmpty(tmp.getAddrDetail())) {
 						tmp.setAddr(tmp.getAddr()+" "+tmp.getAddrDetail());
@@ -2016,8 +2027,8 @@ public class CndtnTrgtMngController {
         		, "검사명" 
         		}; // 헤더에 들어갈 이름
         String[] order = {
-        		"ReqPnttm", "VntYear", "CmptntAthrt", "DBirth", "TrgtNm"
+        		"ReqPnttm", "VntYear", "CmptntAthrtNm", "DBirth", "TrgtNm"
-        		, "Sex", "ReqNmbr", "ReqStateCd", "EduStateCd", "Addr"
+        		, "SexNm", "ReqNmbr", "ReqStateCdNm", "EduStateCdNm", "Addr"
         		
         		, "PrsctrNm"
         		}; // vo 내부의 필드 이름 (첫글자 대문자, 낙타체 사용)        
@@ -2111,13 +2122,16 @@ public class CndtnTrgtMngController {
 					tmp.setDBirth(tmp.getdBirth());
 				}
 	            //성별
+				/*
 				if(StringUtil.isNotEmpty(tmp.getSex())) {
 		            vo.setCodeId("COM014");
 			        vo.setCode(tmp.getSex());
 					CmmnDetailCode cmmnDetailCodeSex= egovCmmUseService.selectCmmCodeDetailValue(vo);
 					if (cmmnDetailCodeSex!=null) tmp.setSex((StringUtil.escapeXml(cmmnDetailCodeSex.getCodeNm())));
 				}
+				*/
 	            //의뢰상태
+				/*
 				if(StringUtil.isNotEmpty(tmp.getReqStateCd())) {
 		            if (tmp.getPrcsAplctPrdOrdCmplt()==null) {
 			            vo.setCodeId("VEA005");
@@ -2128,13 +2142,16 @@ public class CndtnTrgtMngController {
 		            	tmp.setReqStateCd("병합처리");
 		            }
 				}
+				*/
 	            //교육상태
+				/*
 				if(StringUtil.isNotEmpty(tmp.getEduStateCd())) {
 		            vo.setCodeId("VEA002");
 			        vo.setCode(tmp.getEduStateCd());
 					CmmnDetailCode cmmnDetailCodeEduState= egovCmmUseService.selectCmmCodeDetailValue(vo);
 					if (cmmnDetailCodeEduState!=null) tmp.setEduStateCd((StringUtil.escapeXml(cmmnDetailCodeEduState.getCodeNm())));
 				}
+				*/
 				//주소
 				if(StringUtil.isNotEmpty(tmp.getAddr()) && StringUtil.isNotEmpty(tmp.getAddrDetail())) {
 						tmp.setAddr(tmp.getAddr()+" "+tmp.getAddrDetail());
@@ -2158,8 +2175,8 @@ public class CndtnTrgtMngController {
         		, "검사명" 
         		}; // 헤더에 들어갈 이름
         String[] order = {
-        		"ReqPnttm", "VntNmbr", "CmptntAthrt", "DBirth", "TrgtNm"
+        		"ReqPnttm", "VntNmbr", "CmptntAthrtNm", "DBirth", "TrgtNm"
-        		, "Sex", "ReqNmbr", "ReqStateCd", "EduStateCd", "Addr"
+        		, "SexNm", "ReqNmbr", "ReqStateCdNm", "EduStateCdNm", "Addr"
         		, "PrsctrNm"
         		}; // vo 내부의 필드 이름 (첫글자 대문자, 낙타체 사용)        
 		
@@ -2275,6 +2292,7 @@ public class CndtnTrgtMngController {
 				//사건번호
 				tmp.setVntYear(tmp.getVntYear()+"형제"+tmp.getVntNmbr());
 				//관할청
+				/*
 				if(StringUtil.isNotEmpty(tmp.getCmptntAthrt())) {
 			        vo.setCodeId("VEA008");
 			        vo.setCode(tmp.getCmptntAthrt());
@@ -2282,18 +2300,22 @@ public class CndtnTrgtMngController {
 					
 					if (cmmnDetailCode!=null) tmp.setCmptntAthrt(StringUtil.escapeXml(cmmnDetailCode.getCodeNm()));
 				}
+				*/
 				//생년월일
 				if(StringUtil.isNotEmpty(tmp.getdBirth())) {
 					tmp.setDBirth(tmp.getdBirth());
 				}
 	            //성별
+				/*
 				if(StringUtil.isNotEmpty(tmp.getSex())) {
 		            vo.setCodeId("COM014");
 			        vo.setCode(tmp.getSex());
 					CmmnDetailCode cmmnDetailCodeSex= egovCmmUseService.selectCmmCodeDetailValue(vo);
 					if (cmmnDetailCodeSex!=null) tmp.setSex((StringUtil.escapeXml(cmmnDetailCodeSex.getCodeNm())));
 				}
+				*/
 	            //의뢰상태
+				/*
 				if(StringUtil.isNotEmpty(tmp.getReqStateCd())) {
 		            if (tmp.getPrcsAplctPrdOrdCmplt()==null) {
 			            vo.setCodeId("VEA005");
@@ -2304,13 +2326,16 @@ public class CndtnTrgtMngController {
 		            	tmp.setReqStateCd("병합처리");
 		            }
 				}
+				*/
 	            //교육상태
+				/*
 				if(StringUtil.isNotEmpty(tmp.getEduStateCd())) {
 		            vo.setCodeId("VEA002");
 			        vo.setCode(tmp.getEduStateCd());
 					CmmnDetailCode cmmnDetailCodeEduState= egovCmmUseService.selectCmmCodeDetailValue(vo);
 					if (cmmnDetailCodeEduState!=null) tmp.setEduStateCd((StringUtil.escapeXml(cmmnDetailCodeEduState.getCodeNm())));
 				}
+				*/
 				//주소
 				if(StringUtil.isNotEmpty(tmp.getAddr()) && StringUtil.isNotEmpty(tmp.getAddrDetail())) {
 						tmp.setAddr(tmp.getAddr()+" "+tmp.getAddrDetail());
@@ -2334,8 +2359,8 @@ public class CndtnTrgtMngController {
         		, "검사명", "비공개메모" 
         		}; // 헤더에 들어갈 이름
         String[] order = {
-        		"ReqPnttm", "VntYear", "CmptntAthrt", "DBirth", "TrgtNm", "Clphone"
+        		"ReqPnttm", "VntYear", "CmptntAthrtNm", "DBirth", "TrgtNm", "Clphone"
-        		, "Sex", "ReqNmbr", "ReqStateCd", "EduStateCd", "Addr"
+        		, "SexNm", "ReqNmbr", "ReqStateCdNm", "EduStateCdNm", "Addr"
         		
         		, "PrsctrNm", "Rmrks"
         		}; // vo 내부의 필드 이름 (첫글자 대문자, 낙타체 사용)        

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

@@ -440,6 +440,42 @@
 		SELECT
 			 COUNT(1) OVER() AS totCnt,
 			<include refid="CndtnTrgtInfoMngDAO.select_column_name"/>
+			
+			, (
+			       SELECT CODE_NM 
+			       FROM LETTCCMMNDETAILCODE
+			        WHERE USE_AT = 'Y'
+			          AND CODE_ID = 'VEA002'
+			          AND CODE = a.edu_state_cd
+			          ) AS eduStateCdNm	
+			          
+			, CASE
+    				WHEN a.prcs_aplct_prd_ord_cmplt IS NOT NULL THEN '병합처리' 
+    				ELSE (
+					        SELECT CODE_NM 
+					        FROM LETTCCMMNDETAILCODE
+					         WHERE USE_AT = 'Y'
+					           AND CODE_ID = 'VEA005'
+					           AND CODE = a.req_state_cd
+           			)
+    			END	AS reqStateCdNm		
+    			
+			, (
+		        SELECT CODE_NM 
+		        FROM LETTCCMMNDETAILCODE
+		         WHERE USE_AT = 'Y'
+		           AND CODE_ID = 'VEA008'
+		           AND CODE = a.cmptnt_athrt
+		           ) AS cmptntAthrtNm
+			
+			, (
+		        SELECT CODE_NM 
+		        FROM LETTCCMMNDETAILCODE
+		         WHERE USE_AT = 'Y'
+		           AND CODE_ID = 'COM014'
+		           AND CODE = a.sex
+		           ) AS sexNm	
+			
 		FROM 
 			<include refid="CndtnTrgtInfoMngDAO.table_name"/> a
 		WHERE