From 52693fb1f2a79438ce8453a30c2dd94584f6489f Mon Sep 17 00:00:00 2001
From: myname <antelope337@gmail.com>
Date: Mon, 22 Jul 2024 18:01:43 +0900
Subject: [PATCH] =?UTF-8?q?2024-07-22=2018:01=20=EC=B2=B4=ED=97=98?=
 =?UTF-8?q?=EA=B5=90=EC=8B=A4=20=EC=9D=BC=EA=B4=84=EB=8B=A4=EC=9A=B4?=
 =?UTF-8?q?=EB=A1=9C=EB=93=9C=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/OprtnAplctMngController.java          | 40 ++++++++++++++-----
 .../sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml    |  2 +-
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/web/OprtnAplctMngController.java b/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/web/OprtnAplctMngController.java
index 5b7d8e30..2a4fbf95 100644
--- a/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/web/OprtnAplctMngController.java
+++ b/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/web/OprtnAplctMngController.java
@@ -846,22 +846,31 @@ String[] order = {
 		//첨부파일있는 항목만 재배치
 		List<String> atchFileIdList = new ArrayList<String>();
 		List<String> fileNmList = new ArrayList<String>();
+		
 		vEEduAplctVOList.forEach( vo -> {
+			
 			if(vo.getOrgnlRsltAtchFileId() != null) {
 				atchFileIdList.add(vo.getOrgnlRsltAtchFileId());
-				fileNmList.add(vo.getScholInsttNm()+"_"+vo.getChrgNm()+"_원본");
+				fileNmList.add(vo.getOrgnlRsltAtchFileId() + "_" + vo.getScholInsttNm()+"_"+vo.getChrgNm()+"_원본");				
+				//fileNmList.add(vo.getScholInsttNm()+"_"+vo.getChrgNm()+"_원본");
 			}
+		
 			if(vo.getCpyRsltAtchFileId() != null) {
 				atchFileIdList.add(vo.getCpyRsltAtchFileId());
-				fileNmList.add(vo.getScholInsttNm()+"_"+vo.getChrgNm()+"_사본");
+				fileNmList.add(vo.getCpyRsltAtchFileId() + "_" + vo.getScholInsttNm()+"_"+vo.getChrgNm()+"_사본");
+				//fileNmList.add(vo.getScholInsttNm()+"_"+vo.getChrgNm()+"_사본");
 			}
+		
 			if(vo.getEvdncPhtAtchFileId() != null) {
 				atchFileIdList.add(vo.getEvdncPhtAtchFileId());
-				fileNmList.add(vo.getScholInsttNm()+"_"+vo.getChrgNm()+"_증빙");
+				fileNmList.add(vo.getEvdncPhtAtchFileId() + "_" + vo.getScholInsttNm()+"_"+vo.getChrgNm()+"_증빙");
+				//fileNmList.add(vo.getScholInsttNm()+"_"+vo.getChrgNm()+"_증빙");
 			}
+		
 			if(vo.getRmtTrnAtchFileId() != null) {
 				atchFileIdList.add(vo.getRmtTrnAtchFileId());
-				fileNmList.add(vo.getScholInsttNm()+"_"+vo.getChrgNm()+"_이수증");
+				fileNmList.add(vo.getRmtTrnAtchFileId() + "_" + vo.getScholInsttNm()+"_"+vo.getChrgNm()+"_이수증");				
+				//fileNmList.add(vo.getScholInsttNm()+"_"+vo.getChrgNm()+"_이수증");
 			}
 		});
 		
@@ -888,10 +897,7 @@ String[] order = {
 		FileInputStream fis = null;
 		ZipArchiveOutputStream zos = null;
 		BufferedInputStream bis = null;
-		
-		
-		
-		
+				
 		int fileCnt = 0;
 		try {
 			System.out.println("outZipNm : "+ outZipNm);
@@ -900,10 +906,24 @@ String[] order = {
 			
 			Iterator<FileVO> fvoIterator = fvoList.iterator();
 			Iterator<String> fileNmIterator = fileNmList.iterator();
+			
 		 
-			while (fvoIterator.hasNext() && fileNmIterator.hasNext() ){
+			//while (fvoIterator.hasNext() && fileNmIterator.hasNext() ){
+			while (fvoIterator.hasNext()){
 				FileVO vo = fvoIterator.next();
-				String fileNm = fileNmIterator.next();
+				//String fileNm = fileNmIterator.next();
+				//System.out.println("vo.getAtchFileId().replaceAll()");
+				//System.out.println(vo.getAtchFileId().replaceAll("FILE_", ""));
+				//System.out.println(vo.getAtchFileId().replaceAll("FILE_", ""));
+				String fileNm = "";
+				
+				for (int i=0;i<fileNmList.size();i++) {
+					if (fileNmList.get(i).indexOf(vo.getAtchFileId())>-1) {
+						fileNm = fileNmList.get(i).replaceAll(vo.getAtchFileId() + "_", "");
+						i = fileNmList.size();
+					}
+				}
+				
 				zos.setEncoding("UTF-8");
 				
 				// Create a file object
diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml
index 00b4079e..029f4a85 100644
--- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml
@@ -9322,7 +9322,7 @@ VALUES
 	</select>
 	
 	<select id="VEEduMIXDAO.selectExprnRsltFileDownList" parameterClass="VEEduAplctVO" resultClass="VEEduAplctVO">
-	/*	임시.*NOT_SQL_LOG.*  VEEduMIXDAO.selectExprnAtchFileDownList	*/
+	/*	임시.*NOT_SQL_LOG.*  VEEduMIXDAO.selectExprnRsltFileDownList	*/
 		SELECT 
 			A.edu_aplct_ord 		AS eduAplctOrd,
 			A.schol_instt_nm			AS scholInsttNm,