2024-03-26 10:11 기소유예 excel 내용 변경

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

@@ -366,9 +366,8 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable {
 	private String cmptntAthrt; //대상자 성별
 	private String vntYear; //대상자 성별
 	private String vntNmbr; //대상자 성별
-	private String prsctrNm; //대상자 성별
+	private String prsctrNm; //검사명
-	
+	private String reqNmbr; //의뢰번호	
-	
 	
 	
 	public String getPrcsAplctPrdOrd() {
@@ -2123,6 +2122,12 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable {
 	public void setPrsctrNm(String prsctrNm) {
 		this.prsctrNm = prsctrNm;
 	}
+	public String getReqNmbr() {
+		return reqNmbr;
+	}
+	public void setReqNmbr(String reqNmbr) {
+		this.reqNmbr = reqNmbr;
+	}
 	
 	
 }

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

@@ -54,6 +54,7 @@ import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsService;
 import kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service.CndtnTrgtMngService;
 import kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service.CndtnTrgtMngVO;
 import kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service.impl.TrgtExcelReader;
+import kcc.ve.oprtn.fndtnEnhanceTrn.prcsAplctPrdMng.service.ExcelVO;
 
 /**
  * 기반강화연수(관리자)
@@ -2499,7 +2500,9 @@ public class CndtnTrgtMngController {
 			ex.printStackTrace();
 		}
 
+				
 		
+		/*
         int[] width = {
         		4000, 5000, 5000, 5000, 3000
         		}; // 너비
@@ -2508,8 +2511,77 @@ public class CndtnTrgtMngController {
         		}; // 헤더에 들어갈 이름
         String[] order = {
         		"TrgtNm", "DBirth", "Email", "Phone", "EduStateCd"
-        		}; // vo 내부의 필드 이름 (첫글자 대문자, 낙타체 사용)        
+        		}; // vo 내부의 필드 이름 (첫글자 대문자, 낙타체 사용)
+        		*/ 
+        
+		List<ExcelVO> excelVOList = new ArrayList<>();
 		
+		// util에서 vo의 모든 변수를 순회하기 때문에 느림
+		// 필요한 변수들만 vo로 선언
+		vEPrcsDetailVOList.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());
+			excelVO.setSbmtPnttm(vo.getSbmtPnttm());
+			excelVO.setTrgtSex(vo.getTrgtSex());
+			excelVO.setDBirth(vo.getDBirth());
+			excelVO.setTrgtNm(vo.getTrgtNm());
+			excelVO.setPrsctrNm(vo.getPrsctrNm());
+			excelVO.setReqNmbr(vo.getReqNmbr());
+			
+			ComDefaultCodeVO codeParam = new ComDefaultCodeVO();
+			codeParam.setCodeId("VE0003");
+			codeParam.setCode(vo.getAprvlCd());
+			excelVO.setAprvlCd(egovCmmUseService.selectCmmCodeDetailCodeValue(codeParam));
+
+			//ComDefaultCodeVO codeParam = new ComDefaultCodeVO();
+			codeParam.setCodeId("VEA008");
+			codeParam.setCode(vo.getCmptntAthrt());
+			excelVO.setCmptntAthrt(egovCmmUseService.selectCmmCodeDetailCodeValue(codeParam));
+			
+			 System.out.println(excelVO.getPrcsNm());
+			
+			excelVOList.add(excelVO);
+		});
+		
+			
+
+		
+		
+		List<Object> excelData  = new ArrayList<>();
+		excelData.addAll(excelVOList);		
+		
+		int[] width = {
+				2000, 4000, 4000, 4000, 4000
+				, 4000, 4000, 4000
+				, 4000, 4000, 4000, 4000, 4000
+			}; // 너비
+			
+			String[] header = {
+				"순번", "신청자", "이메일", "핸드폰", "생년월일"
+				, "성별", "신청일", "상태"
+				, "관할청", "사건번호", "담당검사", "교육명", "의뢰번호"
+			};
+			
+			String[] order = {
+				"RowNoStr", "TrgtNm", "Email", "Phone", "DBirth"
+				, "TrgtSex", "SbmtPnttm", "AprvlCd"
+				, "CmptntAthrt", "VntNmbr", "PrsctrNm", "Title", "ReqNmbr"
+			};        
+		
+			// 호출
+			SXSSFWorkbook workbook = ExcelUtil.makeSimpleFruitExcelWorkbook(excelData , header, order, width, "교육확정상세-교육신청자");
+			model.addAttribute("locale", Locale.KOREA);
+			model.addAttribute("workbook", workbook);
+			model.addAttribute("workbookName", "교육확정상세-교육신청자");
+			/*
 		excelDown(
 				vEPrcsDetailVOList,
 				"교육확정상세-교육신청자",
@@ -2518,6 +2590,7 @@ public class CndtnTrgtMngController {
 				order,
 				model
 				);
+				*/
 		
 		modelAndView.addObject(model);
 		

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

@@ -863,12 +863,19 @@ public class CndtnPrcsInfoMngController {
 					excelVO.setTrgtSex(vo.getTrgtSex());
 					excelVO.setDBirth(vo.getDBirth());
 					excelVO.setTrgtNm(vo.getTrgtNm());
+					excelVO.setPrsctrNm(vo.getPrsctrNm());
+					excelVO.setReqNmbr(vo.getReqNmbr());
 					
 					ComDefaultCodeVO codeParam = new ComDefaultCodeVO();
 					codeParam.setCodeId("VE0003");
 					codeParam.setCode(vo.getAprvlCd());
 					excelVO.setAprvlCd(egovCmmUseService.selectCmmCodeDetailCodeValue(codeParam));
 
+					//ComDefaultCodeVO codeParam = new ComDefaultCodeVO();
+					codeParam.setCodeId("VEA008");
+					codeParam.setCode(vo.getCmptntAthrt());
+					excelVO.setCmptntAthrt(egovCmmUseService.selectCmmCodeDetailCodeValue(codeParam));
+					
 					 System.out.println(excelVO.getPrcsNm());
 					
 					excelVOList.add(excelVO);
@@ -885,19 +892,19 @@ public class CndtnPrcsInfoMngController {
 				int[] width = {
 					2000, 4000, 4000, 4000, 4000
 					, 4000, 4000, 4000
-					, 4000, 4000, 4000, 4000
+					, 4000, 4000, 4000, 4000, 4000
 				}; // 너비
 				
 				String[] header = {
 					"순번", "신청자", "이메일", "핸드폰", "생년월일"
 					, "성별", "신청일", "상태"
-					, "관할청", "사건번호", "담당검사", "교육명"
+					, "관할청", "사건번호", "담당검사", "교육명", "의뢰번호"
 				};
 				
 				String[] order = {
 					"RowNoStr", "TrgtNm", "Email", "Phone", "DBirth"
 					, "TrgtSex", "SbmtPnttm", "AprvlCd"
-					, "CmptntAthrt", "VntNmbr", "PrsctrNm", "Title"
+					, "CmptntAthrt", "VntNmbr", "PrsctrNm", "Title", "ReqNmbr"
 				};
 		
 				// 호출

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

@@ -35,7 +35,7 @@ public class ExcelVO extends ComDefaultVO implements Serializable {
 	private String trgtNm;
 	private String prcsNm;
 	private String prsctrNm;
-	
+	private String reqNmbr;
 	
 	
 	
@@ -153,6 +153,12 @@ public class ExcelVO extends ComDefaultVO implements Serializable {
 	public void setPrcsNm(String prcsNm) {
 		this.prcsNm = prcsNm;
 	}
+	public String getReqNmbr() {
+		return reqNmbr;
+	}
+	public void setReqNmbr(String reqNmbr) {
+		this.reqNmbr = reqNmbr;
+	}
 
 
 	

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

@@ -420,6 +420,7 @@
 			vsit.VNT_YEAR  AS vntYear,
 			vsit.VNT_NMBR AS vntNmbr,
 			vsit.PRSCTR_NM AS prsctrNm,
+			vsit.req_nmbr AS reqNmbr,
 			vadi.APLCT_STATE_CD AS aplctStateCd,  /* 이수 상태 */
 			vadi.CNCL_ATCH_FILE_ID AS cnclAtchFileId,
 			vadi.CNCL_CN AS cnclCn,          
@@ -641,6 +642,22 @@
 	<select id="VEEduMIXDAO.selectTrgtList4Cmplt" parameterClass="VEEduAplctVO" resultClass="VEEduAplctVO">
 		/*	VEEduMIXDAO.selectTrgtList4Cmplt	*/
 		SELECT			
+			ROW_NUMBER() OVER(
+			ORDER BY a.frst_regist_pnttm ASC) AS rowNo,	
+			vpap.TITLE AS title,
+			
+			vsit.CMPTNT_ATHRT AS cmptntAthrt,
+			vsit.VNT_YEAR AS vntYear,
+			vsit.VNT_NMBR AS vntNmbr,
+			vsit.PRSCTR_NM AS prsctrNm,
+			vsit.req_nmbr AS reqNmbr,	
+			
+			CASE
+				WHEN vsit.sex = 'M' THEN '남성'
+				WHEN vsit.sex = 'F' THEN '여성'
+				ELSE ''
+			END trgtSex ,
+			
 			qe.QESTNR_ID AS qestnrId , /* 설문했으면 ID가 있음 */
 			vadi.APLCT_STATE_CD AS aplctStateCd,  /* 이수 상태 */
 			vsit.edu_state_cd AS eduStateCd,