From 7619ca4b819f552fdc2f5e20bb829634097e5582 Mon Sep 17 00:00:00 2001 From: jiwoo Date: Mon, 6 Nov 2023 15:13:06 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EC=B2=AD?= =?UTF-8?q?=EC=86=8C=EB=85=84=20=EA=B5=90=EC=9C=A1=20=EC=84=9C=EB=A5=98?= =?UTF-8?q?=EC=9A=94=EC=B2=AD(=EB=B2=94=EC=A3=84=EC=A1=B0=ED=9A=8C?= =?UTF-8?q?=EB=8F=99=EC=9D=98=EC=84=9C)=20=EC=82=AC=EC=9A=A9=EC=9E=90=20?= =?UTF-8?q?=EC=9A=94=EC=B2=AD,=20=EA=B0=95=EC=82=AC=20=EC=97=85=EB=A1=9C?= =?UTF-8?q?=EB=93=9C,=20=EA=B4=80=EB=A6=AC=EC=9E=90=20=EC=A1=B0=ED=9A=8C?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cmm/innorix/service/AdrInnorixFileVO.java | 9 + .../innorix/service/InnorixFileService.java | 2 + .../service/impl/InnorixFileServiceImpl.java | 26 +++ .../innorix/web/InnorixFileController.java | 25 +++ .../ve/aplct/comweb/CommonWebController.java | 23 +++ .../eduEnd/web/EduEndTngrController.java | 7 + .../asgnmInfo/web/VEAsgnmController.java | 13 ++ .../eduInfo/service/VEEduAplctService.java | 3 + .../eduInfo/service/impl/VEEduAplctDAO.java | 4 + .../service/impl/VEEduAplctServiceImpl.java | 4 + .../endInfo/web/VEEduEndController.java | 13 ++ .../web/EduAplctMngTngrController.java | 14 ++ .../web/EduRsltMngTngrController.java | 8 + .../sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml | 17 +- .../oprtn/tngrVisitEdu/eduAplctMngDetail.jsp | 77 ++++++++ .../oprtn/tngrVisitEdu/eduRsltMngDetail.jsp | 78 +++++++- .../popup/eduDocReqAlertPopup.jsp | 112 +++++++++++ .../tngrVisitEdu/eduAplct/eduAplctDetail.jsp | 6 +- .../tngrVisitEdu/eduEnd/eduEndDetail.jsp | 65 ++++++ .../jsp/web/ve/comm/docFileUploadPop.jsp | 186 ++++++++++++++++++ .../asgnmInfo/instrAsgnmDetail.jsp | 78 ++++++++ .../endInfo/instrEduEndDetail.jsp | 127 ++++++++++++ 22 files changed, 891 insertions(+), 6 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/eduDocReqAlertPopup.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/web/ve/comm/docFileUploadPop.jsp diff --git a/src/main/java/kcc/kccadr/cmm/innorix/service/AdrInnorixFileVO.java b/src/main/java/kcc/kccadr/cmm/innorix/service/AdrInnorixFileVO.java index 61d304ff..7ba566bb 100644 --- a/src/main/java/kcc/kccadr/cmm/innorix/service/AdrInnorixFileVO.java +++ b/src/main/java/kcc/kccadr/cmm/innorix/service/AdrInnorixFileVO.java @@ -62,6 +62,7 @@ public class AdrInnorixFileVO extends ComDefaultVO implements Serializable { //서류요청 기능 public String docReqNm = ""; //요청 서류명 public String sbmtId = ""; //제출 강사 ID + public String eduDocReqOrd = "";//서류요청 순번 public String getFileType() { @@ -160,6 +161,14 @@ public class AdrInnorixFileVO extends ComDefaultVO implements Serializable { this.sbmtId = sbmtId; } + public String getEduDocReqOrd() { + return eduDocReqOrd; + } + + public void setEduDocReqOrd(String eduDocReqOrd) { + this.eduDocReqOrd = eduDocReqOrd; + } + diff --git a/src/main/java/kcc/kccadr/cmm/innorix/service/InnorixFileService.java b/src/main/java/kcc/kccadr/cmm/innorix/service/InnorixFileService.java index 51e380d8..fa3ea7bf 100644 --- a/src/main/java/kcc/kccadr/cmm/innorix/service/InnorixFileService.java +++ b/src/main/java/kcc/kccadr/cmm/innorix/service/InnorixFileService.java @@ -36,4 +36,6 @@ public interface InnorixFileService { RestResponse insertInnorixReqFile(AdrInnorixFileVO adrInnorixFileVO); + RestResponse insertInnorixDocFile(AdrInnorixFileVO adrInnorixFileVO); + } diff --git a/src/main/java/kcc/kccadr/cmm/innorix/service/impl/InnorixFileServiceImpl.java b/src/main/java/kcc/kccadr/cmm/innorix/service/impl/InnorixFileServiceImpl.java index 20e8c983..28ef9abc 100644 --- a/src/main/java/kcc/kccadr/cmm/innorix/service/impl/InnorixFileServiceImpl.java +++ b/src/main/java/kcc/kccadr/cmm/innorix/service/impl/InnorixFileServiceImpl.java @@ -432,6 +432,32 @@ public class InnorixFileServiceImpl extends EgovAbstractServiceImpl implements I } + } catch (Exception e) { + e.printStackTrace(); + return new RestResponse(HttpStatus.BAD_REQUEST, "등록에 실패하였습니다.", LocalDateTime.now()); + } + + return new RestResponse(HttpStatus.OK, adrInnorixFileVO.getSuccessMsg(), LocalDateTime.now()); + } + + @Override + public RestResponse insertInnorixDocFile(AdrInnorixFileVO adrInnorixFileVO) { + + List result = null; + try { + // 파일 저장 후 저장할 file 정보를 받아옴 + result = this.insertFileData(adrInnorixFileVO); + + // 파일 정보 insert + String atchFileId = fileManageDAO.insertFileInfs(result); + + //VE_EDU_DOC_REQ 서류요청테이블 insert + VEEduAplctVO vEEduAplctVO = new VEEduAplctVO(); + vEEduAplctVO.setEduDocReqOrd(adrInnorixFileVO.getEduDocReqOrd()); + vEEduAplctVO.setSbmtAtchFileId(atchFileId); + vEEduAplctService.updateSbmtAtchFileId(vEEduAplctVO); + + } catch (Exception e) { e.printStackTrace(); return new RestResponse(HttpStatus.BAD_REQUEST, "등록에 실패하였습니다.", LocalDateTime.now()); diff --git a/src/main/java/kcc/kccadr/cmm/innorix/web/InnorixFileController.java b/src/main/java/kcc/kccadr/cmm/innorix/web/InnorixFileController.java index 4a2d3fd8..b47e3727 100644 --- a/src/main/java/kcc/kccadr/cmm/innorix/web/InnorixFileController.java +++ b/src/main/java/kcc/kccadr/cmm/innorix/web/InnorixFileController.java @@ -184,4 +184,29 @@ public class InnorixFileController { return ResponseEntity.ok(innorixService.insertInnorixReqFile(adrInnorixFileVO)); } + + /** + * @methodName : insertReqDocInnorixFile + * @author : 이지우 + * @date : 2023.11.06 + * @description : 파일 insert 전용 + * @param adrInnorixFileVO + * @return + * @throws Exception + * 청소년 교육 강사 요청 서류 업로드 + */ + @RequestMapping(value = {"/web/common/insertInnorixDocFileAjax.do"}, method = RequestMethod.POST) + public ResponseEntity insertReqDocInnorixFile(@RequestBody AdrInnorixFileVO adrInnorixFileVO) throws Exception { + + //로그인 권한정보 불러오기 + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; + String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId()); + + if(userId.equals("")) { + return ResponseEntity.ok(new RestResponse(HttpStatus.UNAUTHORIZED, "로그인이 필요합니다.", LocalDateTime.now())); + } + adrInnorixFileVO.setUniqId(userId); + + return ResponseEntity.ok(innorixService.insertInnorixDocFile(adrInnorixFileVO)); + } } \ No newline at end of file diff --git a/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java b/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java index d59bb6e4..40fbed82 100644 --- a/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java +++ b/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java @@ -901,6 +901,29 @@ public class CommonWebController { return modelAndView; } + // 강사 요청 서류 업르도 팝업 + @RequestMapping("/popup/docFileUploadPop.do") + public String reqFileUploadPop(@ModelAttribute("vEEduAplctVO") VEEduAplctVO vEEduAplctVO, ModelMap model, HttpServletRequest request) throws Exception{ + try { + + + //로그인 정보 가져오기 + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); + vEEduAplctVO.setUserId(loginVO.getUniqId()); + System.out.println("===================== loginVO.getUniqId() :: " + loginVO.getUniqId()); + + String fileType = request.getParameter("fileType"); + System.out.println("=====================" + fileType); + model.addAttribute("fileType", fileType); + + String eduDocReqOrd = request.getParameter("eduDocReqOrd"); + model.addAttribute("eduDocReqOrd", eduDocReqOrd); + } catch (Exception e) { + e.printStackTrace(); + // TODO: handle exception + } + return "/web/ve/comm/docFileUploadPop"; + } //////////////////////////////////////////////////////////////////////// // // diff --git a/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java b/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java index 36cc948e..a1fe02a0 100644 --- a/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java +++ b/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java @@ -484,6 +484,13 @@ public class EduEndTngrController { egovQustnrRespondManageService.selectQustnrRespondManageListCnt(searchVO); model.addAttribute("cryptoUtil", egovCryptoUtil); + //서류 요청 목록 + VEEduAplctVO veEduDocReqVO = new VEEduAplctVO(); + veEduDocReqVO.setEduAplctOrd(vEEduAplctVO.getEduAplctOrd()); + List vEEduDocReqList = vEEduAplctService.selectDocReqList(veEduDocReqVO); + //복호화 + vEEduDocReqList = egovCryptoUtil.decryptVEEduAplctVOList(vEEduDocReqList); + model.addAttribute("docReqList", vEEduDocReqList); return "/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail"; } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/web/VEAsgnmController.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/web/VEAsgnmController.java index d5903fc4..c74b31dd 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/web/VEAsgnmController.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/web/VEAsgnmController.java @@ -29,6 +29,8 @@ import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEAsgnmMIXService; import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEInstrAsgnmVO; import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEInstrFeeAcmdtVO; import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEInstrFeeService; +import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctService; +import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduChasiVO; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduMIXService; import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailService; @@ -86,6 +88,9 @@ public class VEAsgnmController { @Resource(name = "vEEduMIXService") private VEEduMIXService vEEduMIXService; + @Resource(name = "vEEduAplctService") + private VEEduAplctService vEEduAplctService; + //청소년강사 강의 요청 목록 @RequestMapping("/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmRqstList.do") public String instrAsgnmRqstList( @@ -573,6 +578,14 @@ public class VEAsgnmController { model.addAttribute("vEEduChasiCompanionVOList", vEEduChasiCompanionVOList); + //요청서류 목록 + VEEduAplctVO veEduDocReqVO = new VEEduAplctVO(); + veEduDocReqVO.setEduAplctOrd(vEInstrAsgnmVOInfo.getEduAplctOrd()); + veEduDocReqVO.setSbmtId(loginVO.getUniqId()); + List vEEduDocReqList = vEEduAplctService.selectDocReqList(veEduDocReqVO); + //복호화 + vEEduDocReqList = egovCryptoUtil.decryptVEEduAplctVOList(vEEduDocReqList); + model.addAttribute("docReqList", vEEduDocReqList); }catch(Exception ex) { ex.printStackTrace(); diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctService.java index e13a0a21..c0edb85f 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctService.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctService.java @@ -54,4 +54,7 @@ public interface VEEduAplctService { //서류요청 목록 조회 List selectDocReqList(VEEduAplctVO paramVO) throws Exception; + + //요청서류 제출 + void updateSbmtAtchFileId(VEEduAplctVO paramVO) throws Exception; } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduAplctDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduAplctDAO.java index ab17483c..2958bd2d 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduAplctDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduAplctDAO.java @@ -147,4 +147,8 @@ public class VEEduAplctDAO extends EgovAbstractDAO { public List selectDocReqList(VEEduAplctVO paramVO) throws Exception { return (List) list("VEEduAplctDAO.selectDocReqList", paramVO); } + + public void updateSbmtAtchFileId(VEEduAplctVO paramVO) throws Exception { + insert("VEEduAplctDAO.updateSbmtAtchFileId", paramVO); + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduAplctServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduAplctServiceImpl.java index 89059355..5c7917b7 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduAplctServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduAplctServiceImpl.java @@ -171,4 +171,8 @@ public class VEEduAplctServiceImpl implements VEEduAplctService { public List selectDocReqList(VEEduAplctVO paramVO) throws Exception{ return vEEduAplctDAO.selectDocReqList(paramVO); } + + public void updateSbmtAtchFileId(VEEduAplctVO paramVO) throws Exception { + vEEduAplctDAO.updateSbmtAtchFileId(paramVO); + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/endInfo/web/VEEduEndController.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/endInfo/web/VEEduEndController.java index e0c2594d..474b5fb0 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/endInfo/web/VEEduEndController.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/endInfo/web/VEEduEndController.java @@ -46,6 +46,7 @@ import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEAsgnmMIXService; import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEInstrAsgnmVO; import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEInstrFeeAcmdtVO; import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEInstrFeeService; +import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctService; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailService; import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO; @@ -112,6 +113,9 @@ public class VEEduEndController { @Resource(name="vEAsgnmNotiService") private VEAsgnmNotiService vEAsgnmNotiService; + @Resource(name = "vEEduAplctService") + private VEEduAplctService vEEduAplctService; + private static final Logger LOGGER = LoggerFactory.getLogger(EgovFileDownloadController.class); /** @@ -324,6 +328,15 @@ public class VEEduEndController { vEAsgnmNotiVO.setTblUniqOrd(vEInstrAsgnmVO.getEduChasiOrd()); vEAsgnmNotiVO.setFrstRegisterId(loginVO.getUniqId()); + //요청서류 목록 + VEEduAplctVO veEduDocReqVO = new VEEduAplctVO(); + veEduDocReqVO.setEduAplctOrd(vEInstrAsgnmVOInfo.getEduAplctOrd()); + veEduDocReqVO.setSbmtId(loginVO.getUniqId()); + List vEEduDocReqList = vEEduAplctService.selectDocReqList(veEduDocReqVO); + //복호화 + vEEduDocReqList = egovCryptoUtil.decryptVEEduAplctVOList(vEEduDocReqList); + model.addAttribute("docReqList", vEEduDocReqList); + try { System.out.println("session.getAttribute(menuNo).toString()"); System.out.println(session.getId()); diff --git a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAplctMng/web/EduAplctMngTngrController.java b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAplctMng/web/EduAplctMngTngrController.java index a73775df..097b77b0 100644 --- a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAplctMng/web/EduAplctMngTngrController.java +++ b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAplctMng/web/EduAplctMngTngrController.java @@ -463,6 +463,13 @@ public class EduAplctMngTngrController { System.out.println(session.toString()); System.out.println(session.getAttribute("menuNo").toString()); + //서류 요청 목록 + VEEduAplctVO veEduDocReqVO = new VEEduAplctVO(); + veEduDocReqVO.setEduAplctOrd(vEEduAplctVO.getEduAplctOrd()); + List vEEduDocReqList = vEEduAplctService.selectDocReqList(veEduDocReqVO); + //복호화 + vEEduDocReqList = egovCryptoUtil.decryptVEEduAplctVOList(vEEduDocReqList); + model.addAttribute("docReqList", vEEduDocReqList); return "oprtn/tngrVisitEdu/eduAplctMngDetail"; } @@ -964,6 +971,13 @@ public class EduAplctMngTngrController { } + /** + * 교육신청관리 상세 화면 + */ + @RequestMapping("popup/eduDocReqAlertPopup.do") + public String eduDocReqAlertPopup( @ModelAttribute("vEEduAplctVO") VEEduAplctVO vEEduAplctVO , ModelMap model , HttpServletRequest request ) throws Exception { + return "oprtn/tngrVisitEdu/popup/eduDocReqAlertPopup"; + } ////////////////////////////////////////////////////////////////////////////////////////////////////////////// // // 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 a0c435fa..77fc08a3 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 @@ -697,6 +697,14 @@ public class EduRsltMngTngrController { vEAsgnmNotiService.insertAsgnmNotiInfo(vEAsgnmNotiVO); + //서류 요청 목록 + VEEduAplctVO veEduDocReqVO = new VEEduAplctVO(); + veEduDocReqVO.setEduAplctOrd(vEEduAplctVO.getEduAplctOrd()); + List vEEduDocReqList = vEEduAplctService.selectDocReqList(veEduDocReqVO); + //복호화 + vEEduDocReqList = egovCryptoUtil.decryptVEEduAplctVOList(vEEduDocReqList); + model.addAttribute("docReqList", vEEduDocReqList); + }catch(Exception ex) { ex.printStackTrace(); } diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml index 6eb678ef..18fdaa43 100644 --- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml @@ -1247,10 +1247,10 @@ A.EDU_DOC_REQ_ORD AS eduDocReqOrd, A.DOC_REQ_NM AS docReqNm, A.DOC_FORM_ATCH_FILE_ID AS docFormAtchFileId, - A.FRST_REGIST_PNTTM AS frstRegistPnttm, + TO_CHAR(A.FRST_REGIST_PNTTM, 'YYYY-MM-DD') AS frstRegistPnttm, A.FRST_REGISTER_ID AS frstRegisterId, A.SBMT_ATCH_FILE_ID AS sbmtAtchFileId, - A.SBMT_PNTTM AS sbmtPnttm, + TO_CHAR(A.SBMT_PNTTM,'YYYY-MM-DD') AS sbmtPnttm, A.SBMT_ID AS sbmtId, B.INSTR_NM AS instrNm FROM @@ -1263,7 +1263,20 @@ AND EDU_APLCT_ORD = #eduAplctOrd# + + AND SBMT_ID = #sbmtId# + + + + /* VEEduAplctDAO.updateSbmtAtchFileId */ + UPDATE VE_EDU_DOC_REQ + SET + SBMT_ATCH_FILE_ID = #sbmtAtchFileId#, + SBMT_PNTTM = SYSDATE + WHERE + EDU_DOC_REQ_ORD = #eduDocReqOrd# + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngDetail.jsp index 0626a2b4..41f37633 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngDetail.jsp @@ -289,6 +289,13 @@ }); } + // 서류요청 SMS, EMAIL 알림 팝업 + function alertPopup(userId,type) { //메뉴생성 화면 호출 + document.popForm.action = ""; + window.open("#", "_eduDocReqAlertPopup", "scrollbars = no, top=100px, left=100px, height=550px, width=750px"); + document.popForm.target = "_eduDocReqAlertPopup"; + document.popForm.submit(); + } @@ -570,6 +577,76 @@ + + +
+

요청서류 목록

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
강사명서류명요청일양식제출일제출서류 및 알림
+ + + + + + + + + + + + + + + - + + + + + + + + + + + <%-- + --%> + +
+
+ +

알림정보

diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngDetail.jsp index 39a9d1b9..cff989b1 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngDetail.jsp @@ -271,7 +271,13 @@ function replyCalculation(){ - + // 서류요청 SMS, EMAIL 알림 팝업 + function alertPopup(userId,type) { //메뉴생성 화면 호출 + document.popForm.action = ""; + window.open("#", "_eduDocReqAlertPopup", "scrollbars = no, top=100px, left=100px, height=550px, width=750px"); + document.popForm.target = "_eduDocReqAlertPopup"; + document.popForm.submit(); + } @@ -521,6 +527,76 @@ function replyCalculation(){
+ + +
+

요청서류 목록

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
강사명서류명요청일양식제출일제출서류 및 알림
+ + + + + + + + + + + + + + + - + + + + + + + + + + + <%-- + --%> + +
+
+ +

결과보고

diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/eduDocReqAlertPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/eduDocReqAlertPopup.jsp new file mode 100644 index 00000000..1d5c26fc --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/eduDocReqAlertPopup.jsp @@ -0,0 +1,112 @@ + +<%@ 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="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> + +<% + /** + * @Class Name : eduAplctMngDetailPopup.jsp + * @Description : 신청 상세 보기 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2021.12.16 조용준 최초 생성 + * @author 조용준 + * @since 2021.12.16 + * @version 1.0 + * @see + * + */ +%> + + +교육신청 상세 + + + + + + + + + + " /> + +
+ " /> + +
+ +
+
+ +

SMS|EMIAL 발송 - 개발전

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

수신자

+ 		청소년강사1(010-1111-2222)
+

내용

+
+ + +
+
+
+
+
+ + +
+
+ +
+
+
+ +
+
+
+ + + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctDetail.jsp index 854c4c60..1f4f24cf 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctDetail.jsp @@ -232,7 +232,7 @@ return false; } //첨부파일 체크 및 요청 - if(confirm("서류 요청을 등록하시겠습니까?")){ + if(confirm("양식을 업로드 하시겠습니까?")){ if(control.getUploadFiles().length > 0){ var postObj = new Object(); postObj.innoDirPath = $('#innoDirPath').val(); @@ -402,7 +402,7 @@
-

강사 연락처

+

양식 업로드

@@ -1013,7 +1013,7 @@
-
+

요청서류 목록

diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp index 293215ca..188cdc95 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp @@ -1043,6 +1043,71 @@ + + +
+
+

요청서류 목록

+
+
+
+ + <%-- --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + +
교육차시 정보 교육희망일, 시간, 구분, 대상, 배정강사, 인원 을/를 제공하는 표
서류명강사명양식제출여부제출일
+ + + + + + + + + + + + + + + 미제출 + + + + + + + - + +
+

* 확정된 교육에 대한 변경은 위원회를 통해 진행 부탁드립니다.

+
+
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/comm/docFileUploadPop.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/comm/docFileUploadPop.jsp new file mode 100644 index 00000000..39019f6d --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/ve/comm/docFileUploadPop.jsp @@ -0,0 +1,186 @@ + +<%@ 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="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ 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="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> +<%-- --%> + + + + + + + +
+ + + " /> +
+
+
+

+ 요청서류 + 업로드 +

+ +
+
+
+
+ + +
+

+
+
+
+
+ + +
+
+
+
+
+
+
+ + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmDetail.jsp index b9af714a..df6f50ce 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmDetail.jsp @@ -11,6 +11,9 @@ 강사프로필 목록 + + + @@ -774,6 +787,71 @@
+ +
+
+

요청서류 목록

+
+
+
+ + <%-- --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + +
교육차시 정보 교육희망일, 시간, 구분, 대상, 배정강사, 인원 을/를 제공하는 표
서류명요청일양식제출여부제출일
+ + + + + + + + + + + + + + + + + + + + + + - + +
+

* 확정된 교육에 대한 변경은 위원회를 통해 진행 부탁드립니다.

+
+ +
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/endInfo/instrEduEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/endInfo/instrEduEndDetail.jsp index c615dd44..24ab2b54 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/endInfo/instrEduEndDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/endInfo/instrEduEndDetail.jsp @@ -518,6 +518,133 @@ $( document ).ready(function() {
+
+
+

동반강사리스트

+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
번호교육일자강사명차시학교(기관)명교육장소교육대상
+ + + ${list.eduHopeDt} + + ${list.instrNm} + + + ~ + (분) + + + + + + +
+
+ + +
+
+

요청서류 목록

+
+
+
+ + <%-- --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + +
교육차시 정보 교육희망일, 시간, 구분, 대상, 배정강사, 인원 을/를 제공하는 표
서류명요청일양식제출여부제출일
+ + + + + + + + + + + + + + + - + + + + + + + - + +
+

* 확정된 교육에 대한 변경은 위원회를 통해 진행 부탁드립니다.

+
+ +