Merge branch 'hylee' into advc

src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java

@@ -42,6 +42,8 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable {
 	private String	clphone2;		//휴대폰
 	private String	clphone3;		//휴대폰
 	
+	private String	title;			
+	
 	private String	phone;			//연락처
 
 	private String	phone1;			//연락처
@@ -361,6 +363,13 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable {
 	
 	private String trgtSex; //대상자 성별
 	
+	private String cmptntAthrt; //대상자 성별
+	private String vntYear; //대상자 성별
+	private String vntNmbr; //대상자 성별
+	private String prsctrNm; //대상자 성별
+	
+	
+	
 	
 	public String getPrcsAplctPrdOrd() {
 		return prcsAplctPrdOrd;
@@ -396,8 +405,17 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable {
 		return orderByQuery;
 	}
 	
+	
+	
 	////////////////paging///////////////
 	
+	public String getTitle() {
+		return title;
+	}
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
 	// VEInstrFeeAcmdtVO
 	private String specialWorkAllow;
 	private String distanceAllow;
@@ -2081,6 +2099,30 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable {
 	public void setAplctUserId(String aplctUserId) {
 		this.aplctUserId = aplctUserId;
 	}
+	public String getCmptntAthrt() {
+		return cmptntAthrt;
+	}
+	public void setCmptntAthrt(String cmptntAthrt) {
+		this.cmptntAthrt = cmptntAthrt;
+	}
+	public String getVntYear() {
+		return vntYear;
+	}
+	public void setVntYear(String vntYear) {
+		this.vntYear = vntYear;
+	}
+	public String getVntNmbr() {
+		return vntNmbr;
+	}
+	public void setVntNmbr(String vntNmbr) {
+		this.vntNmbr = vntNmbr;
+	}
+	public String getPrsctrNm() {
+		return prsctrNm;
+	}
+	public void setPrsctrNm(String prsctrNm) {
+		this.prsctrNm = prsctrNm;
+	}
 	
 	
 }

src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java

@@ -851,6 +851,11 @@ public class CndtnPrcsInfoMngController {
 				list.forEach( vo -> {
 					ExcelVO excelVO = new ExcelVO();
 					
+					excelVO.setRowNoStr(Integer.toString(vo.getRowNo()));
+					excelVO.setVntNmbr(vo.getVntYear() +"형제"+ vo.getVntNmbr());
+					excelVO.setCmptntAthrt(vo.getCmptntAthrt());
+					excelVO.setTitle(vo.getTitle());
+					excelVO.setPrcsNm(vo.getPrcsNm());
 					excelVO.setUserNm(vo.getUserNm());
 					excelVO.setEmail(vo.getEmail());
 					excelVO.setPhone(vo.getPhone());
@@ -864,11 +869,13 @@ public class CndtnPrcsInfoMngController {
 					codeParam.setCode(vo.getAprvlCd());
 					excelVO.setAprvlCd(egovCmmUseService.selectCmmCodeDetailCodeValue(codeParam));
 
+					 System.out.println(excelVO.getPrcsNm());
 					
 					excelVOList.add(excelVO);
 				});
 				
-				
+					
+
 				
 				
 				List<Object> excelData  = new ArrayList<>();
@@ -876,15 +883,18 @@ public class CndtnPrcsInfoMngController {
 				// 세팅값
 				String title = "조건부 기소유예 - 교육신청 목록";
 				int[] width = {
-					4000, 4000, 4000, 4000, 4000, 4000, 4000
+					2000, 4000, 4000, 4000, 4000, 4000, 4000, 4000
+					, 4000, 4000, 4000, 4000
 				}; // 너비
 				
 				String[] header = {
-					"신청자", "이메일", "핸드폰", "생년월일", "성별", "신청일", "상태"
+					"순번", "신청자", "이메일", "핸드폰", "생년월일", "성별", "신청일", "상태"
+					, "관할청", "사건번호", "담당검사", "교육명"
 				};
 				
 				String[] order = {
-					"TrgtNm", "Email", "Phone", "DBirth", "TrgtSex", "SbmtPnttm", "AprvlCd"
+					"RowNoStr", "TrgtNm", "Email", "Phone", "DBirth", "TrgtSex", "SbmtPnttm", "AprvlCd"
+					, "CmptntAthrt", "VntNmbr", "PrsctrNm", "Title"
 				};
 		
 				// 호출

src/main/java/kcc/ve/oprtn/fndtnEnhanceTrn/prcsAplctPrdMng/service/ExcelVO.java

@@ -16,12 +16,15 @@ public class ExcelVO extends ComDefaultVO implements Serializable {
 
 	//ve_prcs
 	
-	
+	private String rowNoStr;
 	
 
 	private String userNm;
 	private String sbmtPnttm;
 	private String aprvlCd;
+	private String vntNmbr;
+	private String title;
+	private String cmptntAthrt;
 	private String chrgNm;
 	private String DBirth;
 	private String insttNm;
@@ -32,6 +35,17 @@ public class ExcelVO extends ComDefaultVO implements Serializable {
 	private String prvsQs;
 	private String trgtSex;
 	private String trgtNm;
+	private String prcsNm;
+	
+	
+	
+	
+	public String getRowNoStr() {
+		return rowNoStr;
+	}
+	public void setRowNoStr(String rowNoStr) {
+		this.rowNoStr = rowNoStr;
+	}
 	public String getUserNm() {
 		return userNm;
 	}
@@ -110,6 +124,30 @@ public class ExcelVO extends ComDefaultVO implements Serializable {
 	public void setTrgtNm(String trgtNm) {
 		this.trgtNm = trgtNm;
 	}
+	public String getVntNmbr() {
+		return vntNmbr;
+	}
+	public void setVntNmbr(String vntNmbr) {
+		this.vntNmbr = vntNmbr;
+	}
+	public String getTitle() {
+		return title;
+	}
+	public void setTitle(String title) {
+		this.title = title;
+	}
+	public String getCmptntAthrt() {
+		return cmptntAthrt;
+	}
+	public void setCmptntAthrt(String cmptntAthrt) {
+		this.cmptntAthrt = cmptntAthrt;
+	}
+	public String getPrcsNm() {
+		return prcsNm;
+	}
+	public void setPrcsNm(String prcsNm) {
+		this.prcsNm = prcsNm;
+	}
 
 
 	

src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml

@@ -413,6 +413,13 @@
 	<select id="VEEduMIXDAO.selectCndtnList" parameterClass="VEEduAplctVO" resultClass="VEEduAplctVO">
 		/*	VEEduMIXDAO.selectCndtnList	*/
 		SELECT			
+			ROW_NUMBER() OVER(ORDER BY a.frst_regist_pnttm ASC) AS rowNo,
+			vadi.APLCT_STATE_CD AS aplctStateCd,
+			vpap.TITLE AS title, 
+			vsit.CMPTNT_ATHRT AS cmptntAthrt,
+			vsit.VNT_YEAR  AS vntYear,
+			vsit.VNT_NMBR AS vntNmbr,
+			vsit.PRSCTR_NM AS prsctrNm,
 			vadi.APLCT_STATE_CD AS aplctStateCd,  /* 이수 상태 */
 			vadi.CNCL_ATCH_FILE_ID AS cnclAtchFileId,
 			vadi.CNCL_CN AS cnclCn,          
@@ -450,7 +457,6 @@
 			/*	신청 정보에 대상자 키 값이 들어 있어서 해당 값을만 확인하면 된다.*/
 			a.rnds_ord=vsit.SSPN_IDTMT_TRGT_ORD			
 		)
-		
 		WHERE
 			1=1
 			<isNotEmpty property="prcsOrd">

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

@@ -668,18 +668,21 @@
 			<div class="tb_type01">
 				<table>
 					<colgroup>
+						<col style="width: 4%">
+						<col style="width: 4%">
 						<col style="width: 5%">
-						<col style="width: 5%">
+						<col style="width: 14%">
 						<col style="width: 20%">
 						<col style="width: 17%">
-						<col style="width: 13%">
+						<col style="width: 10%">
-						<col style="width: 110px;">
+						<col style="width: 90px;">
 						<col style="width: auto;">
-						<col style="width: 210px;">						
+						<col style="width: 180px;">						
 					</colgroup>
 					<thead>
 					<tr>
 						<th><input type="checkbox" name="checkAll" id="checkAll" onclick="chkAll(this);" /><label for="checkAll"></label></th>
+						<th>순번</th>
 						<th>신청자</th>
 						<th>아이디</th>
 						<th>이메일</th>
@@ -706,6 +709,9 @@
 												</c:otherwise>
 											</c:choose>
 										</td>
+										<td>
+											<c:out value="${list.rowNo}"/>
+										</td>
 										<td>
 											<c:out value="${list.trgtNm}"/>
 										</td>