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 e527905c..36d8c4f2 100644 --- a/src/main/java/kcc/kccadr/cmm/innorix/service/AdrInnorixFileVO.java +++ b/src/main/java/kcc/kccadr/cmm/innorix/service/AdrInnorixFileVO.java @@ -68,6 +68,23 @@ public class AdrInnorixFileVO extends ComDefaultVO implements Serializable { public String instrDetailOrd = "";//강사 고유PK + public String lctrSbjct; //강의주제 + public String lctrPlace; //강의장소 + public String lctrTrgt; //교육대상 + public String nos; //인원 + public String instrNm; //강사명(소속) + + public String lctrDay; + public String lctrStrtH; + public String lctrStrtM; + public String lctrEndH; + public String lctrEndM; + + + + + + //강의활동확인서 컬럼 추가 private String sex = ""; //성별 @@ -236,6 +253,86 @@ public class AdrInnorixFileVO extends ComDefaultVO implements Serializable { public void setDocuNmbr(String docuNmbr) { this.docuNmbr = docuNmbr; } + + public String getLctrSbjct() { + return lctrSbjct; + } + + public void setLctrSbjct(String lctrSbjct) { + this.lctrSbjct = lctrSbjct; + } + + public String getLctrPlace() { + return lctrPlace; + } + + public void setLctrPlace(String lctrPlace) { + this.lctrPlace = lctrPlace; + } + + public String getLctrTrgt() { + return lctrTrgt; + } + + public void setLctrTrgt(String lctrTrgt) { + this.lctrTrgt = lctrTrgt; + } + + public String getNos() { + return nos; + } + + public void setNos(String nos) { + this.nos = nos; + } + + public String getInstrNm() { + return instrNm; + } + + public void setInstrNm(String instrNm) { + this.instrNm = instrNm; + } + + public String getLctrDay() { + return lctrDay; + } + + public void setLctrDay(String lctrDay) { + this.lctrDay = lctrDay; + } + + public String getLctrStrtH() { + return lctrStrtH; + } + + public void setLctrStrtH(String lctrStrtH) { + this.lctrStrtH = lctrStrtH; + } + + public String getLctrStrtM() { + return lctrStrtM; + } + + public void setLctrStrtM(String lctrStrtM) { + this.lctrStrtM = lctrStrtM; + } + + public String getLctrEndH() { + return lctrEndH; + } + + public void setLctrEndH(String lctrEndH) { + this.lctrEndH = lctrEndH; + } + + public String getLctrEndM() { + return lctrEndM; + } + + public void setLctrEndM(String lctrEndM) { + this.lctrEndM = lctrEndM; + } 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 09955147..f8804d1e 100644 --- a/src/main/java/kcc/kccadr/cmm/innorix/service/InnorixFileService.java +++ b/src/main/java/kcc/kccadr/cmm/innorix/service/InnorixFileService.java @@ -41,5 +41,7 @@ public interface InnorixFileService { RestResponse insertInnorixSspnCnClAjax(AdrInnorixFileVO adrInnorixFileVO); RestResponse insertInnorixInstrActvtAjax(AdrInnorixFileVO adrInnorixFileVO); + + RestResponse insertInnorixReqRsltAjax(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 736a4860..ce04f66f 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 @@ -88,6 +88,10 @@ public class InnorixFileServiceImpl extends EgovAbstractServiceImpl implements I @Resource(name="docReqOrdGnrService") private EgovIdGnrService docReqOrdGnrService; + //성인 결과보고 테이블 + @Resource(name="veaRsltRprtOrdGnrService") + private EgovIdGnrService veaRsltRprtOrdGnrService; + //서류요청 순번 @Resource(name="instrActvtHstryOrdGnrService") private EgovIdGnrService instrActvtHstryOrdGnrService; @@ -562,4 +566,43 @@ public class InnorixFileServiceImpl extends EgovAbstractServiceImpl implements I return new RestResponse(HttpStatus.OK, adrInnorixFileVO.getSuccessMsg(), LocalDateTime.now()); } + + @Override + public RestResponse insertInnorixReqRsltAjax(AdrInnorixFileVO adrInnorixFileVO) { + + List result = null; + try { + // 파일 저장 후 저장할 file 정보를 받아옴 + result = this.insertFileData(adrInnorixFileVO); + + // 파일 정보 insert + String atchFileId = fileManageDAO.insertFileInfs(result); + + VEEduAplctVO vEEduAplctVO = new VEEduAplctVO(); + vEEduAplctVO.setVeaRsltRprtOrd(veaRsltRprtOrdGnrService.getNextStringId()); + vEEduAplctVO.setEduAplctOrd(adrInnorixFileVO.getEduAplctOrd()); + vEEduAplctVO.setLctrSbjct(adrInnorixFileVO.getLctrSbjct()); + + vEEduAplctVO.setLctrDay(adrInnorixFileVO.getLctrDay()); + vEEduAplctVO.setLctrStrtH(adrInnorixFileVO.getLctrStrtH()); + vEEduAplctVO.setLctrStrtM(adrInnorixFileVO.getLctrStrtM()); + vEEduAplctVO.setLctrEndH(adrInnorixFileVO.getLctrEndH()); + vEEduAplctVO.setLctrEndM(adrInnorixFileVO.getLctrEndM()); + + vEEduAplctVO.setLctrPlace(adrInnorixFileVO.getLctrPlace()); + vEEduAplctVO.setLctrTrgt(adrInnorixFileVO.getLctrTrgt()); + vEEduAplctVO.setNos(adrInnorixFileVO.getNos()); + vEEduAplctVO.setInstrNm(adrInnorixFileVO.getInstrNm()); + vEEduAplctVO.setAtchFileId(atchFileId); + vEEduAplctVO.setFrstRegisterId(adrInnorixFileVO.getUniqId()); + + vEEduAplctService.insertRslt(vEEduAplctVO); + + } catch (Exception e) { + e.printStackTrace(); + return new RestResponse(HttpStatus.BAD_REQUEST, "등록에 실패하였습니다.", LocalDateTime.now()); + } + + return new RestResponse(HttpStatus.OK, adrInnorixFileVO.getSuccessMsg(), 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 c2a31051..f3a345b7 100644 --- a/src/main/java/kcc/kccadr/cmm/innorix/web/InnorixFileController.java +++ b/src/main/java/kcc/kccadr/cmm/innorix/web/InnorixFileController.java @@ -185,6 +185,30 @@ public class InnorixFileController { return ResponseEntity.ok(innorixService.insertInnorixReqFile(adrInnorixFileVO)); } + /** + * @methodName : insertInnorixReqFileAjax + * @author : 이호영 + * @date : 2023.12.21 + * @description : 성인 찾교 > 완료상세 > 결과보고 업로드 버튼 팝업에 등록 + * @param adrInnorixFileVO + * @return + * @throws Exception + */ + @RequestMapping(value = {"/web/common/insertInnorixReqRsltAjax.do"}, method = RequestMethod.POST) + public ResponseEntity insertInnorixReqRsltAjax(@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.insertInnorixReqRsltAjax(adrInnorixFileVO)); + } + /** * @methodName : insertInnorixSspnCnClAjax * @author : 이호영 diff --git a/src/main/java/kcc/ve/adv/tngr/stngInfo/service/VEAStngVO.java b/src/main/java/kcc/ve/adv/tngr/stngInfo/service/VEAStngVO.java index 4074c18c..64e38ff8 100644 --- a/src/main/java/kcc/ve/adv/tngr/stngInfo/service/VEAStngVO.java +++ b/src/main/java/kcc/ve/adv/tngr/stngInfo/service/VEAStngVO.java @@ -224,6 +224,13 @@ public class VEAStngVO extends ComDefaultVO implements Serializable { */ private boolean allDay; + + + private String atchFileId; + + + + public String getYr() { return yr; @@ -1031,5 +1038,11 @@ public class VEAStngVO extends ComDefaultVO implements Serializable { public void setDdlnDt(String ddlnDt) { this.ddlnDt = ddlnDt; } + public String getAtchFileId() { + return atchFileId; + } + public void setAtchFileId(String atchFileId) { + this.atchFileId = atchFileId; + } } 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 4e7a4f59..36a8ba8e 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 @@ -59,4 +59,6 @@ public interface VEEduAplctService { //요청서류 제출 void updateSbmtAtchFileId(VEEduAplctVO paramVO) throws Exception; + + void insertRslt(VEEduAplctVO vEEduAplctVO); } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java index 8febb5b7..14b4cac2 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java @@ -428,6 +428,20 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable { private String cmmNotifyOrd; // 알림 PK + private String veaRsltRprtOrd; + private String lctrSbjct; + private String lctrPnttm; + private String lctrPlace; + private String lctrTrgt; + private String nos; + + public String lctrDay; + public String lctrStrtH; + public String lctrStrtM; + public String lctrEndH; + public String lctrEndM; + + public String getSpecialWorkAllow() { return specialWorkAllow; } @@ -1857,6 +1871,72 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable { public void setCmmNotifyOrd(String cmmNotifyOrd) { this.cmmNotifyOrd = cmmNotifyOrd; } + public String getLctrSbjct() { + return lctrSbjct; + } + public void setLctrSbjct(String lctrSbjct) { + this.lctrSbjct = lctrSbjct; + } + public String getLctrPnttm() { + return lctrPnttm; + } + public void setLctrPnttm(String lctrPnttm) { + this.lctrPnttm = lctrPnttm; + } + public String getLctrPlace() { + return lctrPlace; + } + public void setLctrPlace(String lctrPlace) { + this.lctrPlace = lctrPlace; + } + public String getLctrTrgt() { + return lctrTrgt; + } + public void setLctrTrgt(String lctrTrgt) { + this.lctrTrgt = lctrTrgt; + } + public String getNos() { + return nos; + } + public void setNos(String nos) { + this.nos = nos; + } + public String getVeaRsltRprtOrd() { + return veaRsltRprtOrd; + } + public void setVeaRsltRprtOrd(String veaRsltRprtOrd) { + this.veaRsltRprtOrd = veaRsltRprtOrd; + } + public String getLctrDay() { + return lctrDay; + } + public void setLctrDay(String lctrDay) { + this.lctrDay = lctrDay; + } + public String getLctrStrtH() { + return lctrStrtH; + } + public void setLctrStrtH(String lctrStrtH) { + this.lctrStrtH = lctrStrtH; + } + public String getLctrStrtM() { + return lctrStrtM; + } + public void setLctrStrtM(String lctrStrtM) { + this.lctrStrtM = lctrStrtM; + } + public String getLctrEndH() { + return lctrEndH; + } + public void setLctrEndH(String lctrEndH) { + this.lctrEndH = lctrEndH; + } + public String getLctrEndM() { + return lctrEndM; + } + public void setLctrEndM(String lctrEndM) { + this.lctrEndM = lctrEndM; + } } 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 08ead63e..044e3bc1 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 @@ -169,5 +169,9 @@ public class VEEduAplctDAO extends EgovAbstractDAO { return (List) list("VEEduAplctDAO.selectVeEduQna", vEPrcsDetailVO); } + public void insertRslt(VEEduAplctVO paramVO) { + insert("VEEduAplctDAO.insertRslt", 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 b1ecea11..50eb3816 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 @@ -192,4 +192,9 @@ public class VEEduAplctServiceImpl implements VEEduAplctService { vo.setClphone(egovCryptoUtil.decrypt(vo.getClphone())); vo.setEmail(egovCryptoUtil.decrypt(vo.getEmail())); } + + @Override + public void insertRslt(VEEduAplctVO paramVO) { + vEEduAplctDAO.insertRslt(paramVO); + } } diff --git a/src/main/java/kcc/ve/oprtn/instr/adultVisitEdu/instrInfo/web/OprtnInstrAdultPrflContoller.java b/src/main/java/kcc/ve/oprtn/instr/adultVisitEdu/instrInfo/web/OprtnInstrAdultPrflContoller.java index 775cba15..9903404e 100644 --- a/src/main/java/kcc/ve/oprtn/instr/adultVisitEdu/instrInfo/web/OprtnInstrAdultPrflContoller.java +++ b/src/main/java/kcc/ve/oprtn/instr/adultVisitEdu/instrInfo/web/OprtnInstrAdultPrflContoller.java @@ -1813,6 +1813,62 @@ public class OprtnInstrAdultPrflContoller { return modelAndView; } + /** + * 2. 강사신청 수정 + */ + @RequestMapping("/ve/oprtn/instr/adultVisitEdu/instrInfo/instrAplctMngDetailUpdateAjax.do") + public ModelAndView instrAplctMngDetailUpdateAjax( + @ModelAttribute("vEInstrDetailVO") VEInstrDetailVO vEInstrDetailVO + , final MultipartHttpServletRequest multiRequest + , ModelMap model + , RedirectAttributes redirectAttributes + , HttpSession session + , HttpServletRequest request + ) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + //로그인 처리==================================== + //로그인 정보 가져오기 + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + + String atchFileId = ""; + final Map files = multiRequest.getFileMap(); + + if (!files.isEmpty()) { + //XXX_로 첨부파일 네이밍 + List result = egovFileMngUtil.parseFileInf(files, "PHT_", 0, "", "", ""); + atchFileId = fileMngService.insertFileInfs(result); + } + //첨부파일Id(atchFileId)를 해당 VO atchFileId변수에 저장 + vEInstrDetailVO.setPhtAtchFileId(atchFileId); + + //세션 ID 가져오기 + vEInstrDetailVO.setLastUpdusrId(loginVO.getUniqId()); + + //제출, 승인요청 일시 + SimpleDateFormat format1 = new SimpleDateFormat ( "yyyy-MM-dd HH:mm:ss"); + Date time = new Date(); + String now = format1.format(time); + if("Y".equals(vEInstrDetailVO.getSbmtYn())) { + vEInstrDetailVO.setSbmtPnttm(now); + } + + vEInstrService.update(vEInstrDetailVO); + //등록 요청, 재요청일 시 반려사유 삭제 + if("10".equals(vEInstrDetailVO.getAprvlCd())) { + vEInstrDetailVO.setAprvlCn(""); + } + + //암호화 + vEInstrDetailVO = egovCryptoUtil.encryptVEInstrDetailVO(vEInstrDetailVO);/*이름, 번호 복호화*/ + vEInstrDetailService.update(vEInstrDetailVO); + modelAndView.addObject("result", "success"); + + return modelAndView; + } + //////////////////////////////////////////////////////////////// // // private function diff --git a/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/instrInfo/web/OprtnInstrTngrPrflContoller.java b/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/instrInfo/web/OprtnInstrTngrPrflContoller.java index 61f0643c..34881f45 100644 --- a/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/instrInfo/web/OprtnInstrTngrPrflContoller.java +++ b/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/instrInfo/web/OprtnInstrTngrPrflContoller.java @@ -2728,6 +2728,7 @@ public class OprtnInstrTngrPrflContoller { public ModelAndView instrHstryMngPopupAjax( ModelMap model , HttpServletRequest request + , final MultipartHttpServletRequest multiRequest ) throws Exception { ModelAndView modelAndView = new ModelAndView(); @@ -2749,12 +2750,37 @@ public class OprtnInstrTngrPrflContoller { //System.out.println(request.getParameter("ddlnStateCd")); try { + + + + //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 + + String atchFileId = checkFileUtil.fileValCheckNdbInsert( + multiRequest, modelAndView + , "InstrH_" //file_name_prefix + , s_file_exts + , i_limit_size + , i_file_limit + ); //EXT, MB size and ea + + if ("ERROR".equals(atchFileId)) return modelAndView; + + + + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 String s_ord = instrHstryOrdGnrService.getNextStringId(); VEAStngVO vEAStngVO = new VEAStngVO(); + System.out.println("atchFileId : "+ atchFileId); vEAStngVO.setInstrHstryOrd(s_ord); vEAStngVO.setUserId(request.getParameter("userId")); @@ -2763,6 +2789,7 @@ public class OprtnInstrTngrPrflContoller { vEAStngVO.setStrtDt(request.getParameter("rgstrStrtPnttm_dt")); vEAStngVO.setDdlnDt(request.getParameter("rgstrDdlnPnttm_dt")); vEAStngVO.setFrstRegisterId(loginVO.getUniqId()); + vEAStngVO.setAtchFileId(atchFileId); vEAStngService.insert_VEAIHM(vEAStngVO); diff --git a/src/main/resources/egovframework/spring/com/context-idgen.xml b/src/main/resources/egovframework/spring/com/context-idgen.xml index 785ebe5c..d854b8ba 100644 --- a/src/main/resources/egovframework/spring/com/context-idgen.xml +++ b/src/main/resources/egovframework/spring/com/context-idgen.xml @@ -3059,5 +3059,21 @@ + + + + + + + + + + + + + + + + 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 591e3f9c..273e314f 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 @@ -475,15 +475,29 @@ @@ -1446,6 +1460,44 @@ ) + + /* VEEduAplctDAO.insertRslt */ + INSERT INTO VEA_RSLT_RPRT + ( + VEA_RSLT_RPRT_ORD + , EDU_APLCT_ORD + , LCTR_SBJCT + , LCTR_DAY + , LCTR_STRT_H + , LCTR_STRT_M + , LCTR_END_H + , LCTR_END_M + , LCTR_PLACE + , LCTR_TRGT + , NOS + , INSTR_NM + , ATCH_FILE_ID + , FRST_REGIST_PNTTM + , FRST_REGISTER_ID + )VALUES( + #veaRsltRprtOrd# + , #eduAplctOrd# + , #lctrSbjct# + , #lctrDay# + , #lctrStrtH# + , #lctrStrtM# + , #lctrEndH# + , #lctrEndM# + , #lctrPlace# + , #lctrTrgt# + , #nos# + , #instrNm# + , #atchFileId# + , SYSDATE + , #frstRegisterId# + ) + + + @@ -357,6 +390,7 @@
+ <%-- <%-- selectedValue="" --%> <%-- /> --%> diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrAplctMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrAplctMngDetail.jsp index 7c263e95..50496cbc 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrAplctMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrAplctMngDetail.jsp @@ -28,7 +28,114 @@ 전자교육신청 상세 + + @@ -160,6 +366,9 @@ + + +
@@ -196,7 +405,8 @@

강사명

- + +
@@ -215,69 +425,121 @@

연락처(핸드폰)

- + + + - + + - + +

e-mail

- + + + <%-- --%> + + @ + + + +

주소

-
-   + + + +
+ + + + +

거주지

- + + + + +

생년월일

- + + + + + + + --%> + +

소속

- + + +

직위

- + + +

위촉년도

- + + +

구분

- + + + - + <%--

위촉구분${info.apptDiv}

- + --%>

전문분야

- + @@ -299,6 +561,7 @@ + +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngList.jsp index 2b271620..802e5334 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngList.jsp @@ -34,6 +34,7 @@ background-color: #ededed; } + 신청관리 @@ -448,7 +478,10 @@ + data-lctr="${list.userId}" value="${list.eduAplctOrd}@${list.eduChasiOrd}" data-phone="" data-cnt="" + data-date=" ~ " + data-email="" data-chrgnm="" data-userId="" + title="Check" type="checkbox"/> @@ -519,6 +552,7 @@
+
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctMngDetail.jsp index bbfb924b..127bcf4e 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctMngDetail.jsp @@ -28,6 +28,8 @@ 강사정보 상세 + + @@ -284,6 +365,10 @@ + + + +
@@ -450,7 +535,7 @@

구분

- + @@ -459,7 +544,7 @@

위촉구분

- + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctReg.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctReg.jsp index 4552c076..5cb0b52f 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctReg.jsp @@ -251,11 +251,13 @@ $( document ).ready(function(){ function fncRsdnePopup() { //거주지 팝업 - document.createForm.action = ""; - window.open("#", "_rsdnePopup", "scrollbars = no, top=200px, left=2500px, height=500px, width=700px"); + /* document.createForm.action = ""; + window.open('', "_rsdnePopup", "scrollbars = no, top=200px, left=2500px, height=500px, width=700px"); document.createForm.target = "_rsdnePopup"; document.createForm.formId.value = "createForm"; - document.createForm.submit(); + document.createForm.submit(); */ + + commonPopWindowopenForm("${pageContext.request.contextPath}/ve/oprtn/instr/tngrVisitEdu/popup/instrRsdnePopup.do", "750", "660", "rsdnePopup", $('#createForm')); } function fncPhotoPopup() { diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctRegExcel.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctRegExcel.jsp index d8922b71..17cdc462 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctRegExcel.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctRegExcel.jsp @@ -410,7 +410,7 @@ $( document ).ready(function(){ - ※ 컴퓨터 파일(엑셀)만 등록 가능합니다.sample + ※ 컴퓨터 파일(엑셀)만 등록 가능합니다.sample diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctStngExcel.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctStngExcel.jsp index 81f11d43..6e7f1ef1 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctStngExcel.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctStngExcel.jsp @@ -410,7 +410,7 @@ $( document ).ready(function(){ - ※ 컴퓨터 파일(엑셀)만 등록 가능합니다.sample + ※ 컴퓨터 파일(엑셀)만 등록 가능합니다.sample diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrMngDetail.jsp index 7cdfe515..4f33fd01 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrMngDetail.jsp @@ -922,6 +922,7 @@ + @@ -932,6 +933,7 @@ 비고 등록자 등록일 + 첨부파일 삭제 @@ -945,7 +947,12 @@ - + + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrHstryMngPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrHstryMngPopup.jsp index 23a9efd5..97a1e25b 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrHstryMngPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrHstryMngPopup.jsp @@ -46,13 +46,20 @@ $("input[type=checkbox],textarea").not("textarea[name=rejtReson]").attr("disabled" , true); } + $("#filebutton").on('click', function(){ + $("#file_temp").click(); + }); }); function fncAprooval(){ //var msg = "강의가능시간 변경"; var data1 = new FormData(document.getElementById("createForm")); - + //첨부파일 등록 처리-step2 + _fileForm2.forEach(function(obj, idx) { + if (obj) data1.append("file"+idx, obj.fileObj); + + }); //console.log(data); console.log(data1); @@ -390,7 +397,86 @@ value='' onkeyDown="press(event);">
- + + + + +

첨부파일

+ + + + + +

첨부파일 가능 용량은 20MB입니다.

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

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

+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
첨부파일 리스트 : 파일명, 종류, 크기, 삭제
파일 명종류크기삭제
+ + + + "> + + "> + + +
+
+ + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp index 9e48eade..0603a6ef 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp @@ -31,6 +31,7 @@ + @@ -44,6 +45,13 @@ input:read-only { background-color: #f9f9f9 !important; } + #fileControl{margin: 8px 0 0 0; border: 1px solid #d5d5d5; border-radius: 5px; height: 150px !important; background-color: #fafafa;} + .innorix_basic div.irx_filetree.empty-uploader{background: url(/offedu/visitEdu/usr/publish/images/content/dropzone_file_before.png) no-repeat center; height: 150px !important;} + .irx_filetree,.innorix_basic div.irx_infoBox{height: 150px !important; + } + tbody#rsltId input { + width: 100%; + } @@ -1161,6 +1298,15 @@

결과보고

+ + + + + + + + +<%-- @@ -1171,7 +1317,7 @@ - + --%> @@ -1345,3 +1491,289 @@
+ + + + +
+ +
+ + + +
+ +
+ + + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/instrPrflDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/instrPrflDetail.jsp index af56a8e9..a834ff3d 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/instrPrflDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/instrPrflDetail.jsp @@ -982,6 +982,7 @@ + @@ -990,6 +991,7 @@ 교육기간 비고 등록자 + 첨부파일 등록일 @@ -1000,6 +1002,14 @@ ~ + + + + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/popup/instrInfoChkPop.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/popup/instrInfoChkPop.jsp index 6bd32327..422c8acc 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/popup/instrInfoChkPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/popup/instrInfoChkPop.jsp @@ -13,8 +13,6 @@