diff --git a/src/main/java/kcc/let/uss/notify/service/NotifyManageService.java b/src/main/java/kcc/let/uss/notify/service/NotifyManageService.java index 38137c33..dd49f4bc 100644 --- a/src/main/java/kcc/let/uss/notify/service/NotifyManageService.java +++ b/src/main/java/kcc/let/uss/notify/service/NotifyManageService.java @@ -63,7 +63,7 @@ public interface NotifyManageService { void updateChkedUseYnN(NotifyManageVO notifyManageVO); - + void insertNotifyForUser(NotifyManageVO notifyManageVO) throws FdlException; } 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 639b1763..56893fcc 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 @@ -364,6 +364,14 @@ public class NotifyManageServiceImpl extends EgovAbstractServiceImpl implements } + // 관리자가 사용자에게 알림 등록 + @Override + public void insertNotifyForUser(NotifyManageVO notifyManageVO) throws FdlException { + notifyManageVO.setCmmNotifyOrd(veaCmmNotifyOrdGnrService.getNextStringId()); + notifyManageVO.setNotifyChk("N"); + notifyManageDAO.insertNotifyInfo(notifyManageVO); + + } private String getCodeNm(String code, String codeId) { ComDefaultCodeVO codeParam = new ComDefaultCodeVO(); diff --git a/src/main/java/kcc/ve/aplct/adultVisitEdu/eduEnd/web/EduEndAdultController.java b/src/main/java/kcc/ve/aplct/adultVisitEdu/eduEnd/web/EduEndAdultController.java index 446b0eb8..b835c9fd 100644 --- a/src/main/java/kcc/ve/aplct/adultVisitEdu/eduEnd/web/EduEndAdultController.java +++ b/src/main/java/kcc/ve/aplct/adultVisitEdu/eduEnd/web/EduEndAdultController.java @@ -5,6 +5,7 @@ import java.util.List; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; @@ -23,6 +24,7 @@ import kcc.com.utl.user.service.CheckFileUtil; import kcc.com.utl.user.service.CheckLoginUtil; import kcc.com.utl.user.service.QustnrCommonUtil; import kcc.let.uat.uia.service.SsoLoginVO; +import kcc.let.uss.notify.service.NotifyManageService; import kcc.let.uss.olp.qri.service.EgovQustnrRespondInfoService; import kcc.let.uss.olp.qri.service.QustnrRespondInfoVO; import kcc.let.uss.olp.qrm.service.EgovQustnrRespondManageService; @@ -142,6 +144,9 @@ public class EduEndAdultController { @Resource(name = "qustnrCommonUtil") private QustnrCommonUtil qustnrCommonUtil; + @Resource(name = "NotifyManageService") + private NotifyManageService notifyManageService; + /* // 교육신청 서비스단 @@ -399,7 +404,12 @@ public class EduEndAdultController { //로그인 처리==================================== - + // 확인 체크 + if(StringUtils.isNotEmpty(vEEduAplctVO.getCmmNotifyOrd())) + { + notifyManageService.updateNotifyChkWhereCmmNotifyOrd(vEEduAplctVO.getCmmNotifyOrd()); + } + //기본데이터 불러오기 vEEduAplctVO = vEEduAplctService.selectDetail(vEEduAplctVO); diff --git a/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java index 33ec89fc..0e19b0c4 100644 --- a/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java +++ b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java @@ -206,6 +206,12 @@ public class FndtnEnhanceTrnController { } vEPrcsDetailVO.setUserId(loginVO.getUniqId()); + // 확인 체크 + if(StringUtils.isNotEmpty(vEPrcsDetailVO.getCmmNotifyOrd())) + { + notifyManageService.updateNotifyChkWhereCmmNotifyOrd(vEPrcsDetailVO.getCmmNotifyOrd()); + } + //1.pageing step1 //5개만 select을 위한 설정 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 d0e04ad8..5cd0585a 100644 --- a/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java +++ b/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java @@ -959,6 +959,12 @@ public class SspnIdtmtController { } //로그인 처리==================================== + // 확인 체크 + if(StringUtils.isNotEmpty(vEPrcsDetailVO.getCmmNotifyOrd())) + { + notifyManageService.updateNotifyChkWhereCmmNotifyOrd(vEPrcsDetailVO.getCmmNotifyOrd()); + } + //FAQ 조회 BoardVO boardVO = new BoardVO(); boardVO.setBbsId("BBSMSTR_000000000030"); //기소유예 FAQ bbsID diff --git a/src/main/java/kcc/ve/cmm/VeSendMail.java b/src/main/java/kcc/ve/cmm/VeSendMail.java index 3e021723..52edb1e9 100644 --- a/src/main/java/kcc/ve/cmm/VeSendMail.java +++ b/src/main/java/kcc/ve/cmm/VeSendMail.java @@ -317,7 +317,7 @@ public class VeSendMail { + "" + "" + "" - + "\"한국저작권위원회-통합회원" + + "\"한국저작권위원회-통합회원" + "" + "" + "" diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java index 0b73f333..a048174d 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java @@ -210,7 +210,7 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable { private String qestnrId30Cnt; private String loginId; - + private String prcsCnTwo; //과정내용 public String getEduPrcsOrd() { return eduPrcsOrd; @@ -1028,6 +1028,12 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable { public void setLoginId(String loginId) { this.loginId = loginId; } + public String getPrcsCnTwo() { + return prcsCnTwo; + } + public void setPrcsCnTwo(String prcsCnTwo) { + this.prcsCnTwo = prcsCnTwo; + } } diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java index 35d819d4..30fdfddf 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java @@ -778,26 +778,24 @@ public class CndtnTrgtMngController { //병합이면 대상을 찾아서 넣는다. System.out.println("cndtnTrgtMngVO.getMergeStatus()"); System.out.println(cndtnTrgtMngVO.getMergeStatus()); + + //병합요청인지 확인 if (cndtnTrgtMngVO.getMergeStatus()!=null && !"".equals(cndtnTrgtMngVO.getMergeStatus())) { + //가능한 병합대상을 찾는다. CndtnTrgtMngVO cndtnTrgtMergeVO = cndtnTrgtInfoMngService.selectDetail4Merge(cndtnTrgtMngVO); - if (cndtnTrgtMergeVO!=null && cndtnTrgtMergeVO.getTrgtNm().equals(cndtnTrgtMngVO.getTrgtNm())) { + + //자기 자신으로 병합되지는 않는다. + if (cndtnTrgtMergeVO!=null && !cndtnTrgtMergeVO.getReqNmbr().equals(cndtnTrgtMngVO.getReqNmbr())) { cndtnTrgtMngVO.setPrcsAplctPrdOrdCmplt(cndtnTrgtMergeVO.getSspnIdtmtTrgtOrd()); } } + //excel 데이터를 넣거나, 업데이트 한다. i+=cndtnTrgtInfoMngService.insert4Merge(cndtnTrgtMngVO); - } - - /* - for (int i=0;i 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 0337f64f..826fe15d 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 @@ -2540,6 +2540,7 @@ a.email AS email , a.hope_sbjct AS hopeSbjct, a.phone AS phone, + a.frst_register_id AS frstRegisterId, a.edu_md AS eduMd, a.edu_md_cd AS eduMdCd, b.edu_chasi_ord AS eduChasiOrd , 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 66f22e37..3b8aed39 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 @@ -590,6 +590,7 @@ ,a.edu_strt_pnttm AS eduStrtPnttm ,a.edu_ddln_pnttm AS eduDdlnPnttm ,a.prcs_cn AS prcsCn + ,b.prcs_cn AS prcsCnTwo
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/excelUploadPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/excelUploadPopup.jsp index 3294c91d..1b7a0ecf 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/excelUploadPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/excelUploadPopup.jsp @@ -65,9 +65,9 @@ success:function(returnData){ console.log('returnData :: ', returnData); if(returnData.result == "success"){ - alert("등록되었습니다."); + alert(returnData.resultCnt+"건 등록되었습니다."); // fncGoList(); - $('#sspnIdtmtTrgtOrd').val(returnData.sspnIdtmtTrgtOrd); + //$('#sspnIdtmtTrgtOrd').val(returnData.sspnIdtmtTrgtOrd); // 중복체크 ajax // fn_duplChk(); }else if(returnData.result == "fail"){ 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 30d10319..d6fe6a4d 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp @@ -280,7 +280,7 @@ sendEmail( $(this).data('email'), - "교육운영 관리 시스템입니다.\n기반강화 교육이 확정되었습니다.", + "저작권배움터 담당자입니다.\n\n신청하신 실무자역량강화 교육 대상자로 확정되었습니다.\n시스템을 통하여 교육장소 및 교육기간 확인하시어 일정에 차질이 없도록 부탁드립니다.\n관련해서 궁금하신 사항은 아래 연락처 또는 교육문의를 통해 질의 부탁드립니다.\n\n감사합니다.", $(this).val(), $(this).data('userid'), "A", // 기반강화 diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngDetail.jsp index cc868d0d..b0faa52e 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngDetail.jsp @@ -320,7 +320,7 @@ 상세교육내용 - + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngMdfy.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngMdfy.jsp index be1c81c0..9712dba9 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngMdfy.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngMdfy.jsp @@ -269,7 +269,7 @@ 상세교육내용 - + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsMngReg.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsMngReg.jsp index 3291f478..efd50b6a 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsMngReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsMngReg.jsp @@ -71,8 +71,8 @@ } function fncPhotoPopup() { - var pop = document.createForm; - commonPopWindowopenForm("${pageContext.request.contextPath}/kccadr/oprtn/fndthEnhanceTrn/popup/fndthEduPhotoRegPopup.do", "750", "660", "fncPhotoPopup", $('#createForm')); + var pop = document.vEPrcsDetailVO; + commonPopWindowopenForm("${pageContext.request.contextPath}/kccadr/oprtn/fndthEnhanceTrn/popup/fndthEduPhotoRegPopup.do", "750", "660", "fncPhotoPopup", $('#vEPrcsDetailVO')); } diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduQnaMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduQnaMngDetail.jsp index aacb3ce0..5e2eb0db 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduQnaMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduQnaMngDetail.jsp @@ -55,6 +55,17 @@ success:function(returnData){ if(returnData.result == "success"){ alert("저장 되었습니다."); + + //답변 알림 + insertNoty( + $("#prcsAplctPrdQnaOrd").val(), + '', + '[실무역량강화] 문의 답변이 등록되었습니다.', + '/web/ve/aplct/fndtnEnhanceTrn/main.do', + $("#frstRegisterId").val(), + '50' + ) + // location.reload(); fncGoList(); } @@ -64,6 +75,41 @@ } }); } + + function insertNoty(eduAplctOrd, eduChasiOrd, notifyCn, notifyPath, toUserId, lctrDivCd){ + + var notiForm = new FormData(); + + var notiFields = [ + 'eduAplctOrd', + 'eduChasiOrd', + 'notifyCn', + 'notifyPath', + 'toUserId', + 'lctrDivCd' + ] + + notiFields.forEach(function(fieldName){ + notiForm.append(fieldName, eval(fieldName)); + }); + + + $.ajax({ + type:"POST", + url: "${pageContext.request.contextPath}/kccadr/oprtn/comm/insertNotifyForUserAjax.do", + data: notiForm, + dataType:'json', + async: false, + processData: false, + contentType: false, + cache: false, + success:function(returnData){ + }, + error:function(request , status, error){ + alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error); + } + }); + } @@ -72,6 +118,7 @@ +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/popup/fndthEduPhotoRegPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/popup/fndthEduPhotoRegPopup.jsp index 1f4a8c6c..bb0596e8 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/popup/fndthEduPhotoRegPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/popup/fndthEduPhotoRegPopup.jsp @@ -129,7 +129,7 @@ function fncPopClose(){
-
+
diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webCommonNaviWrap.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webCommonNaviWrap.jsp index 386841ce..96b5ac1e 100644 --- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonNaviWrap.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonNaviWrap.jsp @@ -87,6 +87,9 @@ function snsShare(snsName) { + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctDetail.jsp index 99a52b23..661d7e92 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctDetail.jsp @@ -255,7 +255,7 @@ diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduAplctPopList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduAplctPopList.jsp index 48f2a441..f77e8d37 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduAplctPopList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduAplctPopList.jsp @@ -248,11 +248,14 @@ $(document).ready(function(){
상세교육내용 - + <%--
--%>
주민번호앞자리
- +
<%-- --%> diff --git a/src/main/webapp/visitEdu/usr/publish/script/duetdatepicker.js b/src/main/webapp/visitEdu/usr/publish/script/duetdatepicker.js index b9308724..d55cd093 100644 --- a/src/main/webapp/visitEdu/usr/publish/script/duetdatepicker.js +++ b/src/main/webapp/visitEdu/usr/publish/script/duetdatepicker.js @@ -206,6 +206,7 @@ $(window).on('load',function(){ function calendarSetting(){ $('.calendar_wrap').each(function(){ $(this).find('.duet-date__input').attr('onkeydown','this.value=dateSetting(this.value);'); + $(this).find('.duet-date__input').attr('onblur','this.value=dateSettingHere(this.value);'); }); }