diff --git a/src/main/java/kcc/com/cmm/service/EgovFileMngService.java b/src/main/java/kcc/com/cmm/service/EgovFileMngService.java index e041d96e..972c3d92 100644 --- a/src/main/java/kcc/com/cmm/service/EgovFileMngService.java +++ b/src/main/java/kcc/com/cmm/service/EgovFileMngService.java @@ -131,4 +131,6 @@ public interface EgovFileMngService { public void updateFileName(FileVO fileVO) throws Exception; public void deleteOffeduFile(FileVO fvo, VEEduAplctVO vEEduAplctVO) throws Exception; + + public List selectZipFileOrderList(FileVO fvo) throws Exception; } diff --git a/src/main/java/kcc/com/cmm/service/FileVO.java b/src/main/java/kcc/com/cmm/service/FileVO.java index 37b3adb0..f718b160 100644 --- a/src/main/java/kcc/com/cmm/service/FileVO.java +++ b/src/main/java/kcc/com/cmm/service/FileVO.java @@ -94,6 +94,8 @@ public class FileVO implements Serializable { */ public String downloadType; + public String orderQuery; + public String getMaxFileNum() { return maxFileNum; } @@ -344,4 +346,13 @@ public class FileVO implements Serializable { public void setDownloadType(String downloadType) { this.downloadType = downloadType; } + + public String getOrderQuery() { + return orderQuery; + } + + public void setOrderQuery(String orderQuery) { + this.orderQuery = orderQuery; + } + } diff --git a/src/main/java/kcc/com/cmm/service/impl/EgovFileMngServiceImpl.java b/src/main/java/kcc/com/cmm/service/impl/EgovFileMngServiceImpl.java index 6f9f984f..9ae76f2a 100644 --- a/src/main/java/kcc/com/cmm/service/impl/EgovFileMngServiceImpl.java +++ b/src/main/java/kcc/com/cmm/service/impl/EgovFileMngServiceImpl.java @@ -214,4 +214,9 @@ public class EgovFileMngServiceImpl extends EgovAbstractServiceImpl implements E } fileMngDAO.deleteFileInf(fileVO); //DB삭제 } + + @Override + public List selectZipFileOrderList(FileVO fvo) throws Exception { + return fileMngDAO.selectZipFileOrderList(fvo); + } } diff --git a/src/main/java/kcc/com/cmm/service/impl/FileManageDAO.java b/src/main/java/kcc/com/cmm/service/impl/FileManageDAO.java index 1bb3de2f..eb0a2910 100644 --- a/src/main/java/kcc/com/cmm/service/impl/FileManageDAO.java +++ b/src/main/java/kcc/com/cmm/service/impl/FileManageDAO.java @@ -203,4 +203,10 @@ public class FileManageDAO extends EgovComAbstractDAO { public int updateOffeduFileNull(VEEduAplctVO vEEduAplctVO) throws Exception { return update("FileManageDAO.updateOffeduFileNull", vEEduAplctVO); } + + @SuppressWarnings("unchecked") + public List selectZipFileOrderList(FileVO vo) throws Exception { + return (List) list("FileManageDAO.selectZipFileOrderList", vo); + } + } 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 3b632ec0..d6ac18d2 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 @@ -799,7 +799,17 @@ String[] order = { fileVO.setDownloadType(downloadType); fileVO.setAtchFileIdList(atchFileIdList); - List fvoList = fileService.selectZipFileList(fileVO); // 해당 기능에 맞게 파일 조회 + + //IN에 들어간대로 정렬하기 위한 처리 + String orderQuery = "'"; + for(String fileId : atchFileIdList) { + orderQuery += fileId + ","; + } + orderQuery = orderQuery.substring(0, orderQuery.length() -1); //마지막 쉼표 삭제 + orderQuery += "' , a.ATCH_FILE_ID"; + fileVO.setOrderQuery(orderQuery); + + List fvoList = fileService.selectZipFileOrderList(fileVO); // 해당 기능에 맞게 파일 조회 int size = 1024; byte[] buf = new byte[size]; diff --git a/src/main/resources/egovframework/sqlmap/let/cmm/fms/EgovFile_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/let/cmm/fms/EgovFile_SQL_Tibero.xml index 8fa67537..f4ee82a3 100644 --- a/src/main/resources/egovframework/sqlmap/let/cmm/fms/EgovFile_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/let/cmm/fms/EgovFile_SQL_Tibero.xml @@ -276,4 +276,38 @@ WHERE 1=1 AND edu_aplct_ord = #eduAplctOrd# + +