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 c22bcc91..ff7701e3 100644 --- a/src/main/java/kcc/kccadr/cmm/innorix/web/InnorixFileController.java +++ b/src/main/java/kcc/kccadr/cmm/innorix/web/InnorixFileController.java @@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; import kcc.com.cmm.LoginVO; +import kcc.com.cmm.util.StringUtil; import kcc.com.utl.fcc.service.EgovStringUtil; import kcc.kccadr.accdnt.ans.service.AnsVO; import kcc.kccadr.cmm.RestResponse; @@ -155,7 +156,9 @@ public class InnorixFileController { if(userId.equals("")) { return ResponseEntity.ok(new RestResponse(HttpStatus.UNAUTHORIZED, "로그인이 필요합니다.", LocalDateTime.now())); } - adrInnorixFileVO.setUniqId(userId); + if(StringUtil.isEmpty(adrInnorixFileVO.getUniqId())) { + adrInnorixFileVO.setUniqId(userId); + } return ResponseEntity.ok(innorixService.insertInnorixLctrPlanFile(adrInnorixFileVO)); } @@ -301,8 +304,9 @@ public class InnorixFileController { if(userId.equals("")) { return ResponseEntity.ok(new RestResponse(HttpStatus.UNAUTHORIZED, "로그인이 필요합니다.", LocalDateTime.now())); } - adrInnorixFileVO.setUniqId(userId); - + if(StringUtil.isEmpty(adrInnorixFileVO.getUniqId())) { + adrInnorixFileVO.setUniqId(userId); + } return ResponseEntity.ok(innorixService.insertInnorixDocAtchFile(adrInnorixFileVO)); } } \ No newline at end of file diff --git a/src/main/java/kcc/let/uss/notify/service/impl/NotifyManageServiceImpl.java b/src/main/java/kcc/let/uss/notify/service/impl/NotifyManageServiceImpl.java index 9aadfc08..9c7dae8c 100644 --- a/src/main/java/kcc/let/uss/notify/service/impl/NotifyManageServiceImpl.java +++ b/src/main/java/kcc/let/uss/notify/service/impl/NotifyManageServiceImpl.java @@ -99,7 +99,6 @@ public class NotifyManageServiceImpl extends EgovAbstractServiceImpl implements // for(String chasi : eduChasiOrdList) { NotifyManageVO notifyManageVO = new NotifyManageVO(); - notifyManageVO.setCmmNotifyOrd(veaCmmNotifyOrdGnrService.getNextStringId()); notifyManageVO.setLctrDivCd(lctrDivCd); notifyManageVO.setNotifyCn("["+loginVO.getId()+"]["+eduChasiOrdList.size()+"개 차시] 교육신청을 하였습니다."); String notifyPath = ""; @@ -116,6 +115,7 @@ public class NotifyManageServiceImpl extends EgovAbstractServiceImpl implements notifyManageVO.setFrstRegisterId(loginVO.getUniqId()); for(NotifyManageVO vo : notifyManageListVO) { notifyManageVO.setToUserId(vo.getMngUserId()); + notifyManageVO.setCmmNotifyOrd(veaCmmNotifyOrdGnrService.getNextStringId()); notifyManageDAO.insertNotifyInfo(notifyManageVO); } // } diff --git a/src/main/java/kcc/ve/aplct/adultVisitEdu/eduAplct/web/EduAplctAdultController.java b/src/main/java/kcc/ve/aplct/adultVisitEdu/eduAplct/web/EduAplctAdultController.java index 5668a10a..aecfd432 100644 --- a/src/main/java/kcc/ve/aplct/adultVisitEdu/eduAplct/web/EduAplctAdultController.java +++ b/src/main/java/kcc/ve/aplct/adultVisitEdu/eduAplct/web/EduAplctAdultController.java @@ -192,6 +192,7 @@ public class EduAplctAdultController { vEPrcsDetailVO.setMode(VeConstants.MODE_CRT); //온라인차시 리스트 vEPrcsDetailVO.setUseYn("Y"); + vEPrcsDetailVO.setUserId(loginVO.getUniqId()); List vEPrcsDetailVOList = vEPrcsService.selectList(vEPrcsDetailVO); //대상 리스트, 페이징 정보 전달 model.addAttribute("list", vEPrcsDetailVOList); diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEAPrcsAplctPrdInstrAsgnmVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEAPrcsAplctPrdInstrAsgnmVO.java index dd8339a7..cd469a5d 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEAPrcsAplctPrdInstrAsgnmVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEAPrcsAplctPrdInstrAsgnmVO.java @@ -43,6 +43,7 @@ public class VEAPrcsAplctPrdInstrAsgnmVO extends ComDefaultVO implements Seriali // ve_instr_detail private String instrNm; // 강사 이름 private String phone; // phone + private String rprtFileType; // 첨부파일 종류 public String getPrcsAplctPrdOrd() { return prcsAplctPrdOrd; @@ -156,6 +157,14 @@ public class VEAPrcsAplctPrdInstrAsgnmVO extends ComDefaultVO implements Seriali this.phone = phone; } + public String getRprtFileType() { + return rprtFileType; + } + + public void setRprtFileType(String rprtFileType) { + this.rprtFileType = rprtFileType; + } + diff --git a/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnStateMng/web/OprtnStateMngController.java b/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnStateMng/web/OprtnStateMngController.java index 5178e38f..b437ddff 100644 --- a/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnStateMng/web/OprtnStateMngController.java +++ b/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnStateMng/web/OprtnStateMngController.java @@ -656,6 +656,19 @@ public class OprtnStateMngController { return "oprtn/cpyrgExprnClsrm/popup/auldtRsltRprtfileInsertPopup"; } + + /* 관리자 결과보고 등록 팝업(실무) + * + * + * */ + @RequestMapping(value = "popup/fndthRsltRprtfileInsertPopup.do") + public String fndthRsltRprtfileInsertPopup( + @ModelAttribute("vEAPrcsAplctPrdInstrAsgnmVO") VEAPrcsAplctPrdInstrAsgnmVO vEAPrcsAplctPrdInstrAsgnmVO, ModelMap model + ) throws Exception { + + + return "oprtn/cpyrgExprnClsrm/popup/fndthRsltRprtfileInsertPopup"; + } /** * 교육실적통계 화면 */ diff --git a/src/main/webapp/WEB-INF/decorators.xml b/src/main/webapp/WEB-INF/decorators.xml index 500bcd69..b6e25065 100644 --- a/src/main/webapp/WEB-INF/decorators.xml +++ b/src/main/webapp/WEB-INF/decorators.xml @@ -51,8 +51,7 @@ */ve/oprtn/instr/adultVisitEdu/instrInfo/instrMdfyRqstPopup.do */kccadr/oprtn/cpyrgExprnClsrm/popup/slctnTeacherPopup.do */kccadr/oprtn/cpyrgExprnClsrm/popup/slctnTeacherChkPopup.do - */kccadr/oprtn/cpyrgExprnClsrm/popup/rsltRprtfileInsertNewPopup.do - */kccadr/oprtn/cpyrgExprnClsrm/popup/auldtRsltRprtfileInsertPopup.do + */kccadr/oprtn/cpyrgExprnClsrm/popup/**Popup.do diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/popup/eduAplctMngDetailPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/popup/eduAplctMngDetailPopup.jsp index 86dcbce3..0138a5e2 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/popup/eduAplctMngDetailPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/popup/eduAplctMngDetailPopup.jsp @@ -118,34 +118,35 @@ - -

교육매체

- - ${info.eduMd} - - - - -

교육매체

- - - - - - - - - -

주소

- - - (${info.post}) ${info.addr} ${info.addrDetail} - - - - + + + + +

교육매체

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

주소

+ + + (${info.post}) ${info.addr}  ${info.addrDetail} + + + + @@ -187,7 +188,7 @@ -

신청상태${info.aprvlCd}

+

신청상태

@@ -227,6 +228,12 @@ + + +

강의료지급기관

+ + + @@ -281,8 +288,8 @@ (${list.lrnTm}분) - - + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp index 9faba99e..3b4bd206 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp @@ -337,11 +337,17 @@ form.action = ""; openPopupAndSubmitForm('popupNewForm', 'popupNewForm', 900, 1200); } - - function fncAttachFileCreate(){ - alert("구현해야 합니다."); + + function fncAttachFileCreate(userId, rprtFileType){ + + document.instrForm.userId.value = userId; + document.instrForm.rprtFileType.value = rprtFileType; + document.instrForm.action = ""; + window.open("#", "_attachFileCreatePop", "scrollbars = no, top=100px, left=100px, height=550px, width=850px"); + document.instrForm.target = "_attachFileCreatePop"; + document.instrForm.submit(); + } - // 결과보고서 삭제 function fncAttachFileDelete( p_atchFileId @@ -409,6 +415,7 @@
+
@@ -589,7 +596,7 @@ - + @@ -603,7 +610,7 @@ - + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngReg.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngReg.jsp index bdf761ed..fb20f50e 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngReg.jsp @@ -353,7 +353,7 @@

필수입력 항목*

신청기간

- +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/popup/fndthRsltRprtfileInsertPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/popup/fndthRsltRprtfileInsertPopup.jsp new file mode 100644 index 00000000..375aa7a6 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/popup/fndthRsltRprtfileInsertPopup.jsp @@ -0,0 +1,188 @@ +<%@ 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 : filePopup.jsp + * @Description : 교육확정안 등록 팝업 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2021.08.09 김봉호 최초 생성 + * @author 김봉호 + * @since 2021.08.21 + * @version 1.0 + * @see + * + */ +%> + + + + + + + + " /> + " /> + " /> + + + + +
+
+ +
+

+ + 결과보고서 + + + 강의계획서 + + 등록 +

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

첨부파일

+ 		+
+
+
+ + +
+

+
+
+
+ +
+
+
+
+
+ + +
+
+ +
+
+
+ +
+
+ + + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp index 31a39c1a..0e0c8ee6 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp @@ -292,9 +292,6 @@ } - function fncAttachFileCreate(){ - alert("구현해야 합니다."); - } // 결과보고서 삭제 function fncAttachFileDelete( @@ -364,6 +361,17 @@ } }); } + + function fncAttachFileCreate(userId, rprtFileType){ + + document.instrForm.userId.value = userId; + document.instrForm.rprtFileType.value = rprtFileType; + document.instrForm.action = ""; + window.open("#", "_attachFileCreatePop", "scrollbars = no, top=100px, left=100px, height=550px, width=850px"); + document.instrForm.target = "_attachFileCreatePop"; + document.instrForm.submit(); + + } @@ -389,6 +397,7 @@ +
@@ -579,7 +588,7 @@ - + @@ -593,7 +602,7 @@ - + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsr.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsr.jsp index c2a89238..4daaa901 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsr.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsr.jsp @@ -156,6 +156,18 @@ function usrIdPassFind(choose){ + + + + + + + + + + + + +