tolag3/koipa_edu_2025-1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2024-07-22 18:01 체험교실 일괄다운로드 오류 수정

Browse Source
This commit is contained in:
myname 2024-07-22 18:01:43 +09:00
parent 100f94efdb
commit 52693fb1f2
2 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/web/OprtnAplctMngController.java
View File

@ -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()+"_이수증");
}
});
@ -889,9 +898,6 @@ String[] order = {
ZipArchiveOutputStream zos = null;
BufferedInputStream bis = null;
int fileCnt = 0;
try {
System.out.println("outZipNm : "+ outZipNm);
@ -901,9 +907,23 @@ 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

2
src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml
View File

@ -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,