From 2faf60b77d7b6ffbd4539c10aa9c838117581e3e Mon Sep 17 00:00:00 2001 From: myname Date: Tue, 19 Mar 2024 16:44:24 +0900 Subject: [PATCH] =?UTF-8?q?2024-03-19=2016:44=20=EA=B8=B0=EC=86=8C?= =?UTF-8?q?=EC=9C=A0=EC=98=88=20=EC=B7=A8=EC=86=8C=20=EC=9A=94=EC=B2=AD=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC=20=EC=9E=91=EC=97=85=20=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sspnIdtmt/web/SspnIdtmtController.java | 138 +++++++ .../web/CndtnPrcsInfoMngController.java | 44 ++- .../sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml | 7 +- .../oprtn/adultVisitEdu/eduAplctMngList.jsp | 2 +- .../cndtnEduPrcsAplctCfnMngDetail.jsp | 114 +++--- .../web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp | 56 ++- .../ve/aplct/sspnIdtmt/popup/eduAplctPop.jsp | 2 +- .../ve/aplct/sspnIdtmt/popup/eduCancelPop.jsp | 346 ++++++++++++++++++ 8 files changed, 639 insertions(+), 70 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduCancelPop.jsp diff --git a/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java b/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java index 5693ec2e..b60c8d42 100644 --- a/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java +++ b/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java @@ -15,6 +15,7 @@ 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.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; import egovframework.rte.fdl.idgnr.EgovIdGnrService; @@ -36,6 +37,7 @@ import kcc.ve.aplct.adultVisitEdu.eduAplct.service.EduAplctAdultService; import kcc.ve.aplct.fndtnEnhanceTrn.service.FndtnEnhanceTrnService; import kcc.ve.aplct.sspnIdtmt.service.SspnIdtmtService; import kcc.ve.cmm.VeConstants; +import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEInstrAsgnmVO; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctOnlnService; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctService; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; @@ -47,6 +49,7 @@ import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsMIXService; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsOnlnCntntService; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsService; +import kcc.ve.instr.tngrVisitEdu.rprtInfo.service.VEEduRprtVO; import kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service.CndtnTrgtMngService; import kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service.CndtnTrgtMngVO; @@ -746,8 +749,143 @@ public class SspnIdtmtController { return "/web/ve/aplct/sspnIdtmt/popup/eduAplctPop"; } + + /** + * 결과보고 팝업 + */ + @RequestMapping("/web/ve/aplct/sspnIdtmt/popup/eduCancelPop.do") + public String filePopup( + @ModelAttribute("vEEduRprtVO") VEEduRprtVO vEEduRprtVO + ,@ModelAttribute("vEInstrAsgnmVO") VEInstrAsgnmVO vEInstrAsgnmVO + , ModelMap model + , HttpServletRequest request + ) throws Exception { + + try { + /* + vEEduRprtVO = vEEduRsltRprtService.selectDetail(vEEduRprtVO); + + //파일 정보 가져오기 + int fileCnt = 0; + List result = null; + if (vEEduRprtVO != null) { + FileVO fileVO = new FileVO(); + fileVO.setAtchFileId(vEEduRprtVO.getAtchFileId()); + result = fileService.selectFileInfs(fileVO); + fileCnt = result.size(); + } + else { + fileCnt = 0; + } + model.addAttribute("fileList", result); + model.addAttribute("fileListCnt", fileCnt); + model.addAttribute("vEEduRprtVO", vEEduRprtVO); + model.addAttribute("vEInstrAsgnmVO", vEInstrAsgnmVO); + */ + } + catch(Exception ex) { + ex.printStackTrace(); + } + + return "/web/ve/aplct/sspnIdtmt/popup/eduCancelPop"; + } + + /** + * 결과보고 Ajax + */ + @RequestMapping("/web/ve/aplct/sspnIdtmt/popup/eduCancelPopupAjax.do") + public ModelAndView filePopupAjax( + @ModelAttribute("vEEduRprtVO") VEEduRprtVO vEEduRprtVO + , ModelMap model + //, RedirectAttributes redirectAttributes + , HttpServletRequest request + , final MultipartHttpServletRequest multiRequest + ) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + //로그인 처리==================================== + //로그인 정보 가져오기 + /* + String s_userCheckNInfo = checkLoginUtil.userCheckNInfo(model, request); + if (!"".equals(s_userCheckNInfo)) { + modelAndView.addObject("result", "loginFail"); + return modelAndView; + } + */ + + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + //SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 + + //로그인 처리==================================== + + + //step2.파일 처리==================================== + //파일 정상 처리 여부와 첨부 파일 정보 + //String atchFileId = this.takeFile(multiRequest, modelAndView, bmVO); + //파일 제한 수량 가져오기, 없으면 기본값 사용 + int i_file_limit = checkFileUtil.getLimitCount(request); // file count + int i_limit_size = checkFileUtil.getLimitSize(request); // file MB + String s_file_exts = checkFileUtil.getS_exts(); // file exts + + + //step2.기존 첨부파일 체크 후 저장 하기 + String s_atchFileId = ""; + + if ("".equals(s_atchFileId)) { + s_atchFileId = checkFileUtil.fileValCheckNdbInsert( + multiRequest, modelAndView + , "EDUCANCEL_" //file_name_prefix + , s_file_exts + , i_limit_size + , i_file_limit + ); //EXT, MB size and ea + }else { + s_atchFileId = checkFileUtil.fileValCheckNdbUpdate( + multiRequest, modelAndView + , "EDUCANCEL_" //file_name_prefix + , s_file_exts + , i_limit_size + , i_file_limit + , s_atchFileId + ); + } + + if ("ERROR".equals(s_atchFileId)) return modelAndView; + + //step2.파일 처리==================================== + + try { + + System.out.println("vEEduRprtVO.getAprvlCn()"); + System.out.println(vEEduRprtVO.getEduAplctOrd()); + System.out.println(vEEduRprtVO.getAprvlCn()); + System.out.println(s_atchFileId); + + VEEduAplctVO vEEduAplctVO = new VEEduAplctVO(); + vEEduAplctVO.setEduAplctOrd(vEEduRprtVO.getEduAplctOrd()); + + vEEduAplctVO.setAplctCn(vEEduRprtVO.getAprvlCn()); + vEEduAplctVO.setRsltAtchFileId(s_atchFileId); + vEEduAplctVO.setAprvlCd("35"); + vEEduAplctVO.setLastUpdusrId(loginVO.getUniqId()); + + //취소요청 정보 저장 + vEEduAplctService.update(vEEduAplctVO); + + + }catch(Exception ex) { + System.out.println("Exception vEEduRsltRprtService.insert"); + } + + modelAndView.addObject("result", "success"); + + return modelAndView; + } /** + * + * 기반강화연수과정 신청기간 등록 */ @RequestMapping("/web/ve/aplct/sspnIdtmt/cnclUpdateAjax.do") 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 55126acc..1de825cd 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java @@ -1304,8 +1304,12 @@ public class CndtnPrcsInfoMngController { // 이수 상태라면 이수번호 생성 if("20".equals(vEEduAplctVO.getAplctStateCd())) { vEEduAplctVO.setEduCmpltCrtfcNmbr(this.cmpltChkAndMakeNmber(vEEduAplctVO.getLctrDivCd())); - }else if("10".equals(vEEduAplctVO.getAplctStateCd())) { + }else if("10".equals(vEEduAplctVO.getAplctStateCd())) { //이미수 vEEduAplctVO.setEduCmpltCrtfcNmbr("DEL"); + vEEduAplctVO.setEduStateCd("40"); + }else if("60".equals(vEEduAplctVO.getAplctStateCd())) { //연기 + vEEduAplctVO.setEduCmpltCrtfcNmbr("DEL"); + vEEduAplctVO.setEduStateCd("50"); } // 신청상세정보 상태값 update @@ -1536,8 +1540,12 @@ public class CndtnPrcsInfoMngController { String eduCmpltCrtfcNmbr = ""; String currentYear = String.valueOf(java.time.Year.now()); - if("20".equals(vEPrcsDetailVO.getAplctStateCd())) { + if("20".equals(vEPrcsDetailVO.getAplctStateCd()) + || "10".equals(vEPrcsDetailVO.getAplctStateCd()) + || "60".equals(vEPrcsDetailVO.getAplctStateCd()) + ) { + int j=0; for(String eduAplctOrd : vEPrcsDetailVO.getEduAplctOrdList()) { VEEduAplctVO vEEduAplctVO = new VEEduAplctVO(); @@ -1545,7 +1553,14 @@ public class CndtnPrcsInfoMngController { vEEduAplctVO.setLastUpdusrId(loginVO.getUniqId()); vEEduAplctVO.setPrcsAplctPrdOrd(vEPrcsDetailVO.getPrcsAplctPrdOrd()); vEEduAplctVO.setEduAplctOrd(eduAplctOrd); + vEEduAplctVO.setLctrDivCd(vEPrcsDetailVO.getLctrDivCd()); + String s_sspnIdtmtTrgtOrd = vEPrcsDetailVO.getSspnIdtmtTrgtOrdList().get(j); + j++; + + vEEduAplctVO.setSspnIdtmtTrgtOrd(s_sspnIdtmtTrgtOrd); + + /* if(StringUtils.isEmpty(eduCmpltCrtfcNmbr)) { eduCmpltCrtfcNmbr = this.cmpltChkAndMakeNmber(vEPrcsDetailVO.getLctrDivCd()); @@ -1555,10 +1570,33 @@ public class CndtnPrcsInfoMngController { vEEduAplctVO.setEduCmpltCrtfcNmbr(eduCmpltCrtfcNmbr); vEEduMIXService.updateAplctStateCd(vEEduAplctVO); + */ + + + if("20".equals(vEEduAplctVO.getAplctStateCd())) { + vEEduAplctVO.setEduCmpltCrtfcNmbr(this.cmpltChkAndMakeNmber(vEEduAplctVO.getLctrDivCd())); + vEEduAplctVO.setEduStateCd("20"); + }else if("10".equals(vEEduAplctVO.getAplctStateCd())) { //이미수 + vEEduAplctVO.setEduCmpltCrtfcNmbr("DEL"); + vEEduAplctVO.setEduStateCd("40"); + }else if("60".equals(vEEduAplctVO.getAplctStateCd())) { //연기 + vEEduAplctVO.setEduCmpltCrtfcNmbr("DEL"); + vEEduAplctVO.setEduStateCd("50"); + } + + // 신청상세정보 상태값 update + vEEduAplctVO.setLastUpdusrId(loginVO.getUniqId()); + vEEduMIXService.updateAplctStateCd(vEEduAplctVO); + + + // 기소유예 대상자 상태값 udpate + vEEduMIXService.updateEduStateCd(vEEduAplctVO); } + /* }else { vEAPrcsAplctPrdInstrAsgnmService.updateAplctStateCdListAjax(vEPrcsDetailVO); + */ } @@ -1575,11 +1613,13 @@ public class CndtnPrcsInfoMngController { // 교육 신청 테이블에 신청자 상태값 update + /* if(vEPrcsDetailVO.getSspnIdtmtTrgtOrdList() != null && !vEPrcsDetailVO.getSspnIdtmtTrgtOrdList().isEmpty()) { // 대상자 테이블에 update vEAPrcsAplctPrdInstrAsgnmService.updateEduStateCdListAjax(vEPrcsDetailVO); } + */ modelAndView.addObject("result", "success"); } catch (Exception ex) { 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 2c83e3b3..4ab9c7b2 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 @@ -103,8 +103,9 @@ a.end_oprtn_dt AS endOprtnDt, a.rprt_sbmt_dt AS rprtSbmtDt, a.trans_atch_file_id AS transAtchFileId, - a.use_yn AS useYn - , a.aplct_cn AS aplctCn + a.use_yn AS useYn, + a.aplct_cn AS aplctCn, + a.rslt_atch_file_id AS rsltAtchFileId @@ -634,7 +635,7 @@ vsit.edu_state_cd AS eduStateCd, le.MBER_NM AS userNm, le.MBER_ID AS mberId, - , + , vsit.trgt_nm AS trgtNm, vsit.sspn_idtmt_trgt_ord AS sspnIdtmtTrgtOrd, vsit.clphone AS vs_clphone, diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngList.jsp index efcd14f3..a9e2dc91 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngList.jsp @@ -115,7 +115,7 @@ +

이메일

diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduCancelPop.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduCancelPop.jsp new file mode 100644 index 00000000..13950005 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduCancelPop.jsp @@ -0,0 +1,346 @@ +<%@ 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"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<% + /** + * @Class Name : eduCancelPop.jsp + * @Description : 교육취소요청 팝업 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2021.08.09 김봉호 최초 생성 + * @author 김봉호 + * @since 2021.08.21 + * @version 1.0 + * @see + * + */ +%> + + + " /> + " /> + " /> + + + + +
+
+

취소요청

+
+
+
+ + + + + + + + <%-- + + + --%> + + + + + +
첨부파일, 취소사유를 입력하는 표
+

첨부파일

+ 		+
+ + + + + +
+
+ + + + + + + + + + + + + + + + + +
첨부파일 리스트 : 파일명, 종류, 크기
파일 명종류크기
+

첨부하실 파일을 마우스끌어서 넣어주세요.

+
+
+ +
+
+

최대 3개

+

50MB제한

+
+
+
+

필수입력 항목*

+

취소사유

+ 		+ +
+
+ +
+
첨부파일
+
+
+ + + + + +
+
+ + + + + + + + + + + + + + + + + +
첨부파일 리스트 : 파일명, 종류, 크기
파일 명종류크기
+

첨부하실 파일을 마우스끌어서 넣어주세요.

+
+
+ +
+
+

최대 1개

+

50MB제한

+
+
+
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ + + + +