From ee5cbb7446d59fd1dcf5cc86227e347753078b39 Mon Sep 17 00:00:00 2001 From: jiwoo Date: Mon, 26 Feb 2024 12:13:35 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=EC=9E=90=20=EC=B2=B4=ED=97=98=EA=B5=90=EC=8B=A4=20?= =?UTF-8?q?=EC=9A=B4=EC=98=81=EB=AA=A9=EB=A1=9D=20>=20=EA=B2=B0=EA=B3=BC?= =?UTF-8?q?=EB=B3=B4=EA=B3=A0=EC=84=9C=20=EC=9D=BC=EA=B4=84=EB=8B=A4?= =?UTF-8?q?=EC=9A=B4=EB=A1=9C=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cmm/service/EgovFileMngService.java | 2 ++ src/main/java/kcc/com/cmm/service/FileVO.java | 11 ++++++ .../service/impl/EgovFileMngServiceImpl.java | 5 +++ .../com/cmm/service/impl/FileManageDAO.java | 6 ++++ .../web/OprtnAplctMngController.java | 12 ++++++- .../let/cmm/fms/EgovFile_SQL_Tibero.xml | 34 +++++++++++++++++++ 6 files changed, 69 insertions(+), 1 deletion(-) 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# + +