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 atchFileIdList = new ArrayList(); List fileNmList = new ArrayList(); + 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 fvoIterator = fvoList.iterator(); Iterator 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-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