From 35ebc68f49b8822c2bda717555ef1bb874eac0a4 Mon Sep 17 00:00:00 2001 From: jiwoo Date: Fri, 16 Feb 2024 19:02:06 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EC=8B=A4?= =?UTF-8?q?=EB=AC=B4=EC=97=AD=EB=9F=89=EA=B0=95=ED=99=94=20=EA=B3=BC?= =?UTF-8?q?=EC=A0=95=EA=B4=80=EB=A6=AC=20>=20=EC=83=81=EC=84=B8=EA=B5=90?= =?UTF-8?q?=EC=9C=A1=EB=82=B4=EC=9A=A9=20pdf=20=EC=97=85=EB=A1=9C=EB=93=9C?= =?UTF-8?q?=20=EB=B0=8F=20=EC=82=AC=EC=9A=A9=EC=9E=90=20pdf=20=EB=AF=B8?= =?UTF-8?q?=EB=A6=AC=EB=B3=B4=EA=B8=B0=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cmm/web/EgovFileMngController.java | 24 +++++ .../web/CndtnPrcsInfoMngController.java | 23 +++++ .../web/FndthPrcsInfoMngController.java | 35 ++++++- .../ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml | 1 + .../sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml | 12 ++- .../jsp/cmm/fms/EgovFndtnDetailCnFile.jsp | 51 ++++++++++ .../fndthEnhanceTrn/fndthEduPrcsMngDetail.jsp | 11 ++- .../fndthEnhanceTrn/fndthEduPrcsMngMdfy.jsp | 93 ++++++++++++++++++- .../fndthEnhanceTrn/fndthEduPrcsMngReg.jsp | 92 +++++++++++++++++- .../aplct/fndtnEnhanceTrn/eduAplctDetail.jsp | 29 ++++-- 10 files changed, 352 insertions(+), 19 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/cmm/fms/EgovFndtnDetailCnFile.jsp diff --git a/src/main/java/kcc/com/cmm/web/EgovFileMngController.java b/src/main/java/kcc/com/cmm/web/EgovFileMngController.java index fabe7bf4..24b63d6a 100644 --- a/src/main/java/kcc/com/cmm/web/EgovFileMngController.java +++ b/src/main/java/kcc/com/cmm/web/EgovFileMngController.java @@ -561,4 +561,28 @@ public class EgovFileMngController { return "cmm/fms/EgovBBSFileListCustom"; } + + /* + * 실무역량강화 교육신청 상세 pdf 미리보기용 + * + * @param fileVO + * @param commandMap + * @param model + * @return + * @throws Exception + */ + @RequestMapping("/cmm/fms/selectFndtnDetailCnFile.do") + public String selectFndtnDetailCnFile(@ModelAttribute("searchVO") FileVO fileVO, @RequestParam Map commandMap, ModelMap model) throws Exception { + String atchFileId = (String) commandMap.get("param_atchFileId"); + String pdfView = (String) commandMap.get("pdf_view"); //'Y' 이면 pdf 직접 보여주기 + + fileVO.setAtchFileId(atchFileId); + List result = fileService.selectFileInfs(fileVO); + model.addAttribute("fileList", result); + model.addAttribute("fileListCnt", result.size()); + model.addAttribute("atchFileId", atchFileId); + + return "cmm/fms/EgovFndtnDetailCnFile"; + + } } diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java index e91d28cd..1c6bbf79 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.Comparator; import java.util.List; import java.util.Locale; +import java.util.Map; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; @@ -17,6 +18,8 @@ import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.support.RedirectAttributes; @@ -28,6 +31,8 @@ import kcc.com.cmm.ComDefaultVO; import kcc.com.cmm.LoginVO; import kcc.com.cmm.service.EgovCmmUseService; import kcc.com.cmm.service.EgovFileMngService; +import kcc.com.cmm.service.EgovFileMngUtil; +import kcc.com.cmm.service.FileVO; import kcc.com.cmm.service.impl.CmmUseDAO; import kcc.com.cmm.spring.data.util.ExcelUtil; import kcc.com.cmm.util.StringUtil; @@ -151,6 +156,13 @@ public class CndtnPrcsInfoMngController { @Resource(name = "iTNotiUtil") private ITNotiUtil iTNotiUtil; + //파일 처리 egov + @Resource(name="EgovFileMngUtil") + private EgovFileMngUtil egovFileMngUtil; + + + + /** * 기반강화연수 과정 관리 목록 화면 */ @@ -212,6 +224,7 @@ public class CndtnPrcsInfoMngController { , ModelMap model //, RedirectAttributes redirectAttributes , HttpServletRequest request + , final MultipartHttpServletRequest multiRequest ) throws Exception { ModelAndView modelAndView = new ModelAndView(); @@ -232,6 +245,16 @@ public class CndtnPrcsInfoMngController { LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 + //상세교육 첨부파일 체크 + String atchFileId = ""; + final Map files = multiRequest.getFileMap(); + if (!files.isEmpty()) { + //XXX_로 첨부파일 네이밍 + List result = egovFileMngUtil.parseFileInf(files, "DETAILCN_", 0, "", "", ""); + atchFileId = fileService.insertFileInfs(result); + vEPrcsDetailVO.setCnAtchFileId(atchFileId); + } + vEPrcsDetailVO.setLastUpdusrId(loginVO.getUniqId()); //esntl_id vEPrcsService.update(vEPrcsDetailVO); diff --git a/src/main/java/kcc/ve/oprtn/fndtnEnhanceTrn/prcsInfoMng/web/FndthPrcsInfoMngController.java b/src/main/java/kcc/ve/oprtn/fndtnEnhanceTrn/prcsInfoMng/web/FndthPrcsInfoMngController.java index 0f617b35..f1f1e1ed 100644 --- a/src/main/java/kcc/ve/oprtn/fndtnEnhanceTrn/prcsInfoMng/web/FndthPrcsInfoMngController.java +++ b/src/main/java/kcc/ve/oprtn/fndtnEnhanceTrn/prcsInfoMng/web/FndthPrcsInfoMngController.java @@ -1,5 +1,7 @@ package kcc.ve.oprtn.fndtnEnhanceTrn.prcsInfoMng.web; +import java.util.HashMap; +import java.util.Iterator; import java.util.List; import java.util.Map; @@ -26,6 +28,7 @@ import kcc.com.cmm.service.EgovFileMngService; import kcc.com.cmm.service.EgovFileMngUtil; import kcc.com.cmm.service.FileVO; import kcc.com.cmm.util.StringUtil; +import kcc.com.utl.user.service.CheckFileUtil; import kcc.com.utl.user.service.CheckLoginUtil; import kcc.let.uat.uia.service.SsoLoginVO; import kcc.let.utl.fcc.service.EgovCryptoUtil; @@ -119,6 +122,11 @@ public class FndthPrcsInfoMngController { //파일 처리 egov @Resource(name = "EgovFileMngService") private EgovFileMngService fileMngService; + + //파일 체크 util + @Resource(name = "checkFileUtil") + private CheckFileUtil checkFileUtil; + /* // 교육신청 서비스단 @@ -295,6 +303,7 @@ public class FndthPrcsInfoMngController { , ModelMap model //, RedirectAttributes redirectAttributes , HttpServletRequest request + , final MultipartHttpServletRequest multiRequest ) throws Exception { ModelAndView modelAndView = new ModelAndView(); @@ -315,7 +324,23 @@ public class FndthPrcsInfoMngController { LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 - + //파일 제한 수량 가져오기, 없으면 기본값 사용 + int i_file_limit = 1; // file count + int i_limit_size = 100; // file MB + String s_file_exts = "pdf"; // file exts + + String atchFileId = ""; + final Map files = multiRequest.getFileMap(); + + if (!files.isEmpty()) { + //교육신청_로 첨부파일 네이밍 + List result = fileUtil.parseFileInf(files, "DETAILCN_", 0, "", "", ""); + atchFileId = fileMngService.insertFileInfs(result); + //첨부파일Id(atchFileId)를 해당 VO atchFileId변수에 저장 + vEPrcsDetailVO.setCnAtchFileId(atchFileId); + } + + String prcsOrd = prcsGnrService.getNextStringId(); // 고유ID vEPrcsDetailVO.setPrcsOrd(prcsOrd); vEPrcsDetailVO.setLctrDivCd("50"); //강의구분코드 VE0011 10-청소년강의, 20-성인강의, 30-체험, 50-기반강화, 60-조건부 @@ -428,6 +453,14 @@ public class FndthPrcsInfoMngController { //과정 조회 VEPrcsDetailVO vEPrcsDetailVODetail = vEPrcsService.selectDetail(vEPrcsDetailVO); model.addAttribute("info", vEPrcsDetailVODetail); + + //파일 정보 가져오기 + FileVO fileVO = new FileVO(); + fileVO.setAtchFileId(vEPrcsDetailVODetail.getCnAtchFileId()); + List result = fileService.selectFileInfs(fileVO); + model.addAttribute("fileList", result); + model.addAttribute("fileListCnt", result.size()); + //세부과정 목록 조회 // VEPrcsCntntVO vePrcsCntntVO = new VEPrcsCntntVO(); // vePrcsCntntVO.setPrcsOrd(vEPrcsDetailVO.getPrcsOrd()); diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml index f76669c9..9e81a82f 100644 --- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml @@ -608,6 +608,7 @@ AS lctrPlanRsltAtchFileId --> ,'' AS lctrPlanRsltAtchFileId ,a.prvt_memo_cn AS prvtMemoCn + ,b.cn_atch_file_id AS cnAtchFileId FROM ve_prcs_aplct_prd a , ve_prcs b diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml index a36e22db..1aa9ee24 100644 --- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml @@ -25,7 +25,8 @@ last_updusr_id, lctr_div_cd, use_yn, - image_atch_file_id + image_atch_file_id, + cn_atch_file_id @@ -43,7 +44,8 @@ A.LAST_UPDUSR_ID AS lastUpdusrId, A.LCTR_DIV_CD AS lctrDivCd, A.USE_YN AS useYn, - A.IMAGE_ATCH_FILE_ID AS imageAtchFileId + A.IMAGE_ATCH_FILE_ID AS imageAtchFileId, + A.CN_ATCH_FILE_ID AS cnAtchFileId @@ -65,7 +67,8 @@ #lastUpdusrId#, #lctrDivCd#, #useYn#, - #imageAtchFileId# + #imageAtchFileId#, + #cnAtchFileId# ) @@ -109,6 +112,9 @@ ,prcs_sort_no = #prcsSortNo# + + ,cn_atch_file_id = #cnAtchFileId# + WHERE prcs_ord = #prcsOrd# diff --git a/src/main/webapp/WEB-INF/jsp/cmm/fms/EgovFndtnDetailCnFile.jsp b/src/main/webapp/WEB-INF/jsp/cmm/fms/EgovFndtnDetailCnFile.jsp new file mode 100644 index 00000000..88ad0e67 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/cmm/fms/EgovFndtnDetailCnFile.jsp @@ -0,0 +1,51 @@ +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> + +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<% + +/** + * @Class Name : EgovFileList.jsp + * @Description : 파일 목록화면 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ---------- ------ --------------------------- + * @ 2009.03.26 이삼섭 최초 생성 + * @ 2011.07.20 옥찬우 Tag id속성 추가( Line : 68 ) + * + * @author 공통서비스 개발팀 이삼섭 + * @since 2009.03.26 + * @version 1.0 + * @see + * + */ +%> + + + + + + + + + <%-- ','')" class="file_download_a" title="다운로드"> + + --%> +   + + + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsMngDetail.jsp index faf0b815..aaf83594 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsMngDetail.jsp @@ -111,7 +111,7 @@ - 과정설명 + 교육내용 @@ -121,6 +121,15 @@ <%-- --%> + + 상세교육내용 + + + + + + + 사용여부 diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsMngMdfy.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsMngMdfy.jsp index f4baf35d..fe3efe09 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsMngMdfy.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsMngMdfy.jsp @@ -30,6 +30,11 @@ 기반강화연수관리