From bb6fbff7d4d308093177e27fcabce1c12b4950b9 Mon Sep 17 00:00:00 2001 From: myname Date: Tue, 27 Feb 2024 18:28:59 +0900 Subject: [PATCH] =?UTF-8?q?2024-02-27=2018:28=20=EC=B2=B4=ED=97=98?= =?UTF-8?q?=EA=B5=90=EC=8B=A4=20=EC=95=8C=EB=A6=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/InnorixFileServiceImpl.java | 46 ++++++++++ .../service/impl/NotifyManageServiceImpl.java | 83 ++++++++++++++++++- .../impl/ExprnClsrmAplctServiceImpl.java | 45 ++++++++++ .../web/ExprnClsrmEndController.java | 64 +++++++++++++- .../comweb/CommonManageWebController.java | 83 ++++++++++++++++++- .../cpyrgExprnClsrm/oprtnStateMngDetail.jsp | 1 + .../exprnClsrmEnd/exprnClsrmEndRslt.jsp | 2 + .../exprnClsrmInfo/exprnRprtDashboard.jsp | 2 + 8 files changed, 321 insertions(+), 5 deletions(-) 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 2ad6451d..8148650f 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 @@ -306,7 +306,30 @@ public class InnorixFileServiceImpl extends EgovAbstractServiceImpl implements I //저장 vEEduMIXService.insertExprnClsrmEndInfo(vEEduAplctVO); + + System.out.println("vEEduAplctVO.getLctrDivCd()"); + System.out.println(adrInnorixFileVO.getLctrDivCd()); + System.out.println(adrInnorixFileVO.getAprvlCd()); + if( + "30".equals(adrInnorixFileVO.getLctrDivCd()) + && "10".equals(adrInnorixFileVO.getAprvlCd()) //결과보고 제출 + ){ + try { + iTNotiUtil.insertNotifyNew( + adrInnorixFileVO.getLctrDivCd(), + adrInnorixFileVO.getUniqId(), + VeConstants.NOTI_STATUS_60, + adrInnorixFileVO.getEduAplctOrd(), + adrInnorixFileVO.getEduChasiOrd(), + "1", + "1" + ); + }catch(Exception ex) { + ex.printStackTrace(); + } + } + } catch (Exception e) { e.printStackTrace(); return new RestResponse(HttpStatus.BAD_REQUEST, "등록에 실패하였습니다.", LocalDateTime.now()); @@ -427,6 +450,29 @@ public class InnorixFileServiceImpl extends EgovAbstractServiceImpl implements I //저장 vEEduMIXService.updateRsltRprtFileId(vEEduAplctVO); + System.out.println("vEEduAplctVO.getLctrDivCd()"); + System.out.println(adrInnorixFileVO.getLctrDivCd()); + System.out.println(adrInnorixFileVO.getAprvlCd()); + + if( + "30".equals(adrInnorixFileVO.getLctrDivCd()) + && "10".equals(adrInnorixFileVO.getAprvlCd()) //결과보고 제출 + ){ + try { + iTNotiUtil.insertNotifyNew( + adrInnorixFileVO.getLctrDivCd(), + adrInnorixFileVO.getUniqId(), + VeConstants.NOTI_STATUS_60, + adrInnorixFileVO.getEduAplctOrd(), + adrInnorixFileVO.getEduChasiOrd(), + "1", + "1" + ); + }catch(Exception ex) { + ex.printStackTrace(); + } + } + } catch (Exception e) { e.printStackTrace(); return new RestResponse(HttpStatus.BAD_REQUEST, "등록에 실패하였습니다.", LocalDateTime.now()); 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 cf5af5c2..c2143cb7 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 @@ -652,7 +652,35 @@ public class NotifyManageServiceImpl extends EgovAbstractServiceImpl implements } else if( "30".equals(p_lctrDivCd) ) { //체험 - notifyPath = "/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDetail.do"; + notifyPath = "/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDashboard.do"; + + if ( + "11".equals(p_noti_status) //수정요청 - to 신청자 + ||"20".equals(p_noti_status) //운영확정 + ||"40".equals(p_noti_status) //서류제출요청 + ||"70".equals(p_noti_status) //검토중 + ||"80".equals(p_noti_status) //운영종료 + /* + ||"12".equals(p_noti_status) 문자 & 메일은 이동 대상 페이지 없음 + ||"13".equals(p_noti_status) + */ + ) { + notifyPath = "/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDashboard.do"; //사용자 - 나의강의실- 상세 + + }else if ( + "13".equals(p_noti_status) //수정완료 - to 운영자 - 상세 + || "50".equals(p_noti_status) //서류제출 - to 운영자 - 상세 + || "60".equals(p_noti_status) //결과보고제출 - to 운영자 - 상세 + ) { + notifyPath = "/kccadr/oprtn/cpyrgExprnClsrm/oprtnAplctMngDetail.do"; //운영자 - 처리상태관리 - 상세 + + }else if ( + "60".equals(p_noti_status) //결과보고제출 - to 운영자 - 상세 + ) { + notifyPath = "/kccadr/oprtn/cpyrgExprnClsrm/oprtnStateMngDetail.do"; //운영자 - 운영현황관리 - 상세 + + } + } else if( "50".equals(p_lctrDivCd) ) { //실무 notifyPath = "/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDetail.do"; @@ -870,6 +898,31 @@ public class NotifyManageServiceImpl extends EgovAbstractServiceImpl implements } + }else if( "30".equals(p_lctrDivCd) ) { //체험교실 + if ( + "13".equals(p_noti_status) //13-수정완료 + || "50".equals(p_noti_status) //50-서류제출 + || "60".equals(p_noti_status) //60-결과보고제출 + + ) { //10-교육신청 + //담당 관리자에게 모두 알림 + p_notifyManageVO.setFirstIndex(0); + p_notifyManageVO.setRecordCountPerPage(1000); + // 담당자 조회 + notifyManageListVO = notifyManageDAO.selectMngPagingList(p_notifyManageVO); + + }else if ( + "11".equals(p_noti_status) //11-교육상태변경(수정요청) + || "20".equals(p_noti_status) //20-상태변경(운영확정) + || "40".equals(p_noti_status) //40-상태변경(서류제출요청) + || "70".equals(p_noti_status) //70-상태변경(검토중) + || "80".equals(p_noti_status) //80-상태변경(운영종료) + ) { + + //해당 신청자에게 알림 + p_notifyManageVO.setToUserId(notifyManageDAO.findByUserIdFromVE_EDU_APLCT(p_notifyManageVO.getEduAplctOrd())); + + } }else if( "50".equals(p_lctrDivCd) ) { //실무역량 if ( "10".equals(p_noti_status) //10-교육신청 @@ -1093,7 +1146,33 @@ public class NotifyManageServiceImpl extends EgovAbstractServiceImpl implements } } else if( "30".equals(p_lctrDivCd) ) { //체험 - notifyCn = "/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDetail.do"; + notifyCn = "교육 상태가 변경 되었습니다."; + + if ("11".equals(p_noti_status)) { + notifyCn = "교육 상태가 변경[수정요청] 되었습니다."; + + }else if ("13".equals(p_noti_status)) { + notifyCn = "교육 상태가 변경[수정완료] 되었습니다."; + + }else if ("20".equals(p_noti_status)) { + notifyCn = "교육 상태가 변경[운영확정] 되었습니다."; + + }else if ("40".equals(p_noti_status)) { + notifyCn = "교육 상태가 변경[서류제출 요청] 되었습니다."; + + }else if ("50".equals(p_noti_status)) { + notifyCn = "교육 상태가 변경[서류제출] 되었습니다."; + + }else if ("60".equals(p_noti_status)) { + notifyCn = "교육 상태가 변경[결과보고 제출] 되었습니다."; + + }else if ("70".equals(p_noti_status)) { + notifyCn = "교육 상태가 변경[검토중] 되었습니다."; + + }else if ("80".equals(p_noti_status)) { + notifyCn = "교육 상태가 변경[운영종료] 되었습니다."; + + } } else if( "50".equals(p_lctrDivCd) ) { //실무 if ("10".equals(p_noti_status)) { diff --git a/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/service/impl/ExprnClsrmAplctServiceImpl.java b/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/service/impl/ExprnClsrmAplctServiceImpl.java index 850f6826..27b8c096 100644 --- a/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/service/impl/ExprnClsrmAplctServiceImpl.java +++ b/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/service/impl/ExprnClsrmAplctServiceImpl.java @@ -18,6 +18,7 @@ import kcc.com.utl.user.service.CheckFileUtil; import kcc.com.utl.user.service.CheckLoginUtil; import kcc.let.uss.notify.service.NotifyManageService; import kcc.let.utl.fcc.service.EgovCryptoUtil; +import kcc.let.utl.fcc.service.ITNotiUtil; import kcc.ve.aplct.cpyrgExprnClsrm.exprnClsrmAplct.service.ExprnClsrmAplctService; import kcc.ve.cmm.VeConstants; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctOnlnService; @@ -96,6 +97,9 @@ public class ExprnClsrmAplctServiceImpl implements ExprnClsrmAplctService { @Resource(name = "vEEduChasiDAO") private VEEduChasiDAO vVEEduChasiDAO; + //알림 + @Resource(name = "iTNotiUtil") + private ITNotiUtil iTNotiUtil; @Override @@ -265,6 +269,47 @@ public class ExprnClsrmAplctServiceImpl implements ExprnClsrmAplctService { vEEduChasiVO.setLrnCn(s_lrnCn[i]); vEEduChasiVO.setRmrks(s_rmrks[i]); vVEEduChasiDAO.insert(vEEduChasiVO); + + if( + "50".equals(vEEduAplctVO.getAprvlCd()) //서류제출 + ){ + try { + iTNotiUtil.insertNotifyNew( + vEEduAplctVO.getLctrDivCd(), + loginVO.getUniqId(), + VeConstants.NOTI_STATUS_50, + vEEduAplctVO.getEduAplctOrd(), + vEEduAplctVO.getEduChasiOrd(), + "1", + "1" + ); + }catch(Exception ex) { + ex.printStackTrace(); + } + } + } + + }else if("30".equals(vEEduAplctVO.getLctrDivCd()) + && "13".equals(vEEduAplctVO.getAprvlCd()) + ) { //체험교실 수정 요청에 대한 수정 완료시 + + if( + "13".equals(vEEduAplctVO.getAprvlCd()) + ) { //체험교실 수정 요청에 대한 수정 완료시 + + try { + iTNotiUtil.insertNotifyNew( + vEEduAplctVO.getLctrDivCd(), + loginVO.getUniqId(), + VeConstants.NOTI_STATUS_13, + vEEduAplctVO.getEduAplctOrd(), + vEEduAplctVO.getEduChasiOrd(), + "1", + "1" + ); + }catch(Exception ex) { + ex.printStackTrace(); + } } } diff --git a/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/web/ExprnClsrmEndController.java b/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/web/ExprnClsrmEndController.java index 1635914e..275a1b74 100644 --- a/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/web/ExprnClsrmEndController.java +++ b/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/web/ExprnClsrmEndController.java @@ -34,9 +34,9 @@ import kcc.let.uss.olp.qri.service.QustnrRespondInfoVO; import kcc.let.uss.olp.qrm.service.EgovQustnrRespondManageService; import kcc.let.uss.olp.qrm.service.QustnrRespondManageVO; import kcc.let.utl.fcc.service.EgovCryptoUtil; +import kcc.let.utl.fcc.service.ITNotiUtil; import kcc.ve.aplct.cpyrgExprnClsrm.exprnClsrmAplct.service.ExprnClsrmAplctService; import kcc.ve.cmm.VeConstants; -import kcc.ve.cmm.VeSendMail; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctOnlnService; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctService; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; @@ -154,6 +154,10 @@ public class ExprnClsrmEndController { @Resource(name = "vEPrcsAplctPrdService") private VEPrcsAplctPrdService vEPrcsAplctPrdService; + //알림 + @Resource(name = "iTNotiUtil") + private ITNotiUtil iTNotiUtil; + /** * 체험교실 완료목록 */ @@ -587,6 +591,64 @@ public class ExprnClsrmEndController { vEEduAplctVO.setLastUpdusrId(loginVO.getUniqId()); int rs = vEEduAplctService.statusUpdate(vEEduAplctVO); + if( + "30".equals(vEEduAplctVO.getLctrDivCd()) + ){ + + if( + "60".equals(vEEduAplctVO.getAprvlCd()) //결과보고 제출 + ){ + + try { + iTNotiUtil.insertNotifyNew( + vEEduAplctVO.getLctrDivCd(), + loginVO.getUniqId(), + VeConstants.NOTI_STATUS_60, + vEEduAplctVO.getEduAplctOrd(), + vEEduAplctVO.getEduChasiOrd(), + "1", + "1" + ); + }catch(Exception ex) { + ex.printStackTrace(); + } + + }else if( + "70".equals(vEEduAplctVO.getAprvlCd()) //검토중 + ){ + try { + iTNotiUtil.insertNotifyNew( + vEEduAplctVO.getLctrDivCd(), + loginVO.getUniqId(), + VeConstants.NOTI_STATUS_70, + vEEduAplctVO.getEduAplctOrd(), + vEEduAplctVO.getEduChasiOrd(), + "1", + "1" + ); + }catch(Exception ex) { + ex.printStackTrace(); + } + + }else if( + "80".equals(vEEduAplctVO.getAprvlCd()) //운영종료 + ){ + try { + iTNotiUtil.insertNotifyNew( + vEEduAplctVO.getLctrDivCd(), + loginVO.getUniqId(), + VeConstants.NOTI_STATUS_80, + vEEduAplctVO.getEduAplctOrd(), + vEEduAplctVO.getEduChasiOrd(), + "1", + "1" + ); + }catch(Exception ex) { + ex.printStackTrace(); + } + } + } + modelAndView.addObject("rsCnt", rs); modelAndView.addObject("result", "success"); return modelAndView; diff --git a/src/main/java/kcc/ve/oprtn/comweb/CommonManageWebController.java b/src/main/java/kcc/ve/oprtn/comweb/CommonManageWebController.java index 5778285d..830e8a68 100644 --- a/src/main/java/kcc/ve/oprtn/comweb/CommonManageWebController.java +++ b/src/main/java/kcc/ve/oprtn/comweb/CommonManageWebController.java @@ -180,8 +180,87 @@ public class CommonManageWebController { System.out.println(vEEduAplctVO.getLctrDivCd()); // 알림 insert if( - "20".equals(vEEduAplctVO.getLctrDivCd()) //성인 - || "30".equals(vEEduAplctVO.getLctrDivCd()) + "30".equals(vEEduAplctVO.getLctrDivCd()) //체험 + ) { + + if ("11".equals(vEEduAplctVO.getAprvlCd())) { //수정요청 + try { + iTNotiUtil.insertNotifyNew( + vEEduAplctVO.getLctrDivCd(), + loginVO.getUniqId(), + VeConstants.NOTI_STATUS_11, + vEEduAplctVO.getEduAplctOrd(), + vEEduAplctVO.getEduChasiOrd(), + "1", + "1" + ); + }catch(Exception ex) { + ex.printStackTrace(); + } + + }else if ("20".equals(vEEduAplctVO.getAprvlCd())) { //선청처리 + try { + iTNotiUtil.insertNotifyNew( + vEEduAplctVO.getLctrDivCd(), + loginVO.getUniqId(), + VeConstants.NOTI_STATUS_20, + vEEduAplctVO.getEduAplctOrd(), + vEEduAplctVO.getEduChasiOrd(), + "1", + "1" + ); + }catch(Exception ex) { + ex.printStackTrace(); + } + + }else if ("40".equals(vEEduAplctVO.getAprvlCd())) { //서류제출요청 + try { + iTNotiUtil.insertNotifyNew( + vEEduAplctVO.getLctrDivCd(), + loginVO.getUniqId(), + VeConstants.NOTI_STATUS_40, + vEEduAplctVO.getEduAplctOrd(), + vEEduAplctVO.getEduChasiOrd(), + "1", + "1" + ); + }catch(Exception ex) { + ex.printStackTrace(); + } + + }else if ("70".equals(vEEduAplctVO.getAprvlCd())) { //검토중 + try { + iTNotiUtil.insertNotifyNew( + vEEduAplctVO.getLctrDivCd(), + loginVO.getUniqId(), + VeConstants.NOTI_STATUS_70, + vEEduAplctVO.getEduAplctOrd(), + vEEduAplctVO.getEduChasiOrd(), + "1", + "1" + ); + }catch(Exception ex) { + ex.printStackTrace(); + } + + }else if ("80".equals(vEEduAplctVO.getAprvlCd())) { //운영종료 + try { + iTNotiUtil.insertNotifyNew( + vEEduAplctVO.getLctrDivCd(), + loginVO.getUniqId(), + VeConstants.NOTI_STATUS_80, + vEEduAplctVO.getEduAplctOrd(), + vEEduAplctVO.getEduChasiOrd(), + "1", + "1" + ); + }catch(Exception ex) { + ex.printStackTrace(); + } + } + + }else if( + "20".equals(vEEduAplctVO.getLctrDivCd()) //성인 ) { //old diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnStateMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnStateMngDetail.jsp index e373249b..4ed10718 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnStateMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnStateMngDetail.jsp @@ -109,6 +109,7 @@ data: { "eduAplctOrd" : $("#eduAplctOrd").val() , "aprvlCd" : statusVal, + "lctrDivCd" : $("#lctrDivCd").val() }, dataType:'json', success:function(returnData){ diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndRslt.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndRslt.jsp index 85fc369c..0a1ae1ae 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndRslt.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndRslt.jsp @@ -304,6 +304,7 @@ , "trgtPrsnlReal" : $('#trgtPrsnlRealTxt').val() , "innorixFileListVO": data , "successMsg" : msg + , "lctrDivCd" : "30" } if(fn_innorixCmmAjax(sendData, url) == "OK") @@ -371,6 +372,7 @@ , "aprvlCd" : $('#aprvlCd').val() , "trgtPrsnlReal" : $('#trgtPrsnlRealTxt').val() , "successMsg" : "제출 완료되었습니다." + , "lctrDivCd" : "30" } if(fn_innorixCmmAjax(sendData, url) == "OK") { diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnRprtDashboard.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnRprtDashboard.jsp index 5ff562b8..6e479830 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnRprtDashboard.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnRprtDashboard.jsp @@ -305,6 +305,7 @@ , "trgtPrsnlReal" : $('#trgtPrsnlRealTxt').val() , "innorixFileListVO": data , "successMsg" : msg + , "lctrDivCd" : "30" } if(fn_innorixCmmAjax(sendData, url) == "OK") @@ -370,6 +371,7 @@ , "aprvlCd" : $('#aprvlCd').val() , "trgtPrsnlReal" : $('#trgtPrsnlRealTxt').val() , "successMsg" : "제출 완료되었습니다." + , "lctrDivCd" : "30" } if(fn_innorixCmmAjax(sendData, url) == "OK") {