From 738e218e7fec43c50ab760e93ea5d19693095bda Mon Sep 17 00:00:00 2001 From: hylee Date: Fri, 7 Jul 2023 16:52:40 +0900 Subject: [PATCH] =?UTF-8?q?feat:=EA=B5=90=EC=9C=A1=EC=8B=A0=EC=B2=AD=20?= =?UTF-8?q?=EC=A7=84=ED=96=89=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/EduRsltMngTngrController.java | 22 ++++++++++++++++++- .../tngrVisitEdu/eduAplct/eduAplctReg.jsp | 17 +++++++++----- 2 files changed, 32 insertions(+), 7 deletions(-) diff --git a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduRsltMng/web/EduRsltMngTngrController.java b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduRsltMng/web/EduRsltMngTngrController.java index 1e573d45..8903fcac 100644 --- a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduRsltMng/web/EduRsltMngTngrController.java +++ b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduRsltMng/web/EduRsltMngTngrController.java @@ -1243,6 +1243,7 @@ public class EduRsltMngTngrController { vEEduAplctVO.setMode(VeConstants.MODE_EXCEL); List list = vEEduMIXService.selectExcelList(vEEduAplctVO); + System.out.println("============="); List atchFileIdList = new ArrayList(); //zip파일 이름 @@ -1258,9 +1259,26 @@ public class EduRsltMngTngrController { FileVO fileVO = new FileVO(); fileVO.setDownloadType(downloadType); + if(atchFileIdList.size() < 1) { + response.setContentType("application/x-msdownload"); + PrintWriter printwriter = response.getWriter(); + printwriter.println(""); + printwriter.println("


Could not get file name:

"); + printwriter.println("


Back

"); + printwriter.println("


© webAccess"); + printwriter.println(""); + printwriter.flush(); + printwriter.close(); + return ; + + } + + fileVO.setAtchFileIdList(atchFileIdList); List fvoList = fileService.selectZipFileList(fileVO); // 해당 기능에 맞게 파일 조회 + System.out.println("=========================="); + if(fvoList.size() == 0){ response.setContentType("application/x-msdownload"); PrintWriter printwriter = response.getWriter(); @@ -1279,12 +1297,14 @@ public class EduRsltMngTngrController { int size = 1024; byte[] buf = new byte[size]; - String outZipNm = fvoList.get(0).getFileStreCours()+File.separator + orgnZipNm; +// String outZipNm = fvoList.get(0).getFileStreCours()+File.separator + orgnZipNm; + String outZipNm = "/usr/local/tomcat/file/sht/"+File.separator + orgnZipNm; FileInputStream fis = null; ZipArchiveOutputStream zos = null; BufferedInputStream bis = null; try { + System.out.println("outZipNm : "+ outZipNm); // Zip 파일생성 zos = new ZipArchiveOutputStream(new BufferedOutputStream(new FileOutputStream(outZipNm))); diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp index 9cb435e3..de3ca7a5 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp @@ -650,8 +650,11 @@ var psblFlag = "Y";//학생 신청가능기간여부 체크 } $("#eduPlace").val(info.eduPlace); - $('input[name=corpsEdu][value='+info.corpsEdu+']').prop('checked', true); - $('input[name=broadroomEdu][value='+info.broadroomEdu+']').prop('checked', true); + if(isNotEmpty(info.corpsEdu)) + $('input[name=corpsEdu][value='+info.corpsEdu+']').prop('checked', true); + + if(isNotEmpty(info.broadroomEdu)) + $('input[name=broadroomEdu][value='+info.broadroomEdu+']').prop('checked', true); if(isNotEmpty(info.eduCn)){ $.each(info.eduCn.split(','), function(idx, value){ @@ -672,11 +675,12 @@ var psblFlag = "Y";//학생 신청가능기간여부 체크 if(idx > defaultRow){ // alert(idx); // alert(defaultRow); - addEduClassCopy('addClassRow'); +// addEduClassCopy('addClassRow'); + addEduClassCopyTngr('addClassRow'); } - - var tr = $('.addClassRow').find('tbody > tr').not('.calendar_wrap tr').eq(idx); - tr.find('input[name=eduHopeDt]').val(dateFormat(value.eduHopeDt, 'date')); + + var tr = $('.addClassRow').find('tbody > tr').not('.calendar_wrap tr').eq(idx); + tr.find('input[name=eduHopeDt]').val(dateFormat(value.eduHopeDt.replaceAll('.',''), 'date')); tr.find('input[name=eduHopeDt]').val(value.eduHopeDt); tr.find('input[name=strtTm]').val(timeFomat(value.strtTm)); tr.find('input[name=endTm]').val(timeFomat(value.endTm)); @@ -684,6 +688,7 @@ var psblFlag = "Y";//학생 신청가능기간여부 체크 tr.find('select[name=divCd]').val(value.divCd); tr.find('input[name=trgt]').val(value.trgt); tr.find('input[name=prsnl]').val(value.prsnl); + }); }