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 6b469bee..a5e7481a 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 @@ -532,6 +532,21 @@ public class InnorixFileServiceImpl extends EgovAbstractServiceImpl implements I vEEduAplctVO.setSbmtAtchFileId(atchFileId); vEEduAplctService.updateSbmtAtchFileId(vEEduAplctVO); + //서류요청 제출 + try { + iTNotiUtil.insertNotifyNew( + "10", + adrInnorixFileVO.getUniqId(), + VeConstants.NOTI_STATUS_98, + vEEduAplctVO.getEduDocReqOrd(), + "", + "0", + "1" + ); + + }catch(Exception ex) { + ex.printStackTrace(); + } } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/kcc/let/uss/notify/service/impl/NotifyManageDAO.java b/src/main/java/kcc/let/uss/notify/service/impl/NotifyManageDAO.java index 52ce4058..5988f698 100644 --- a/src/main/java/kcc/let/uss/notify/service/impl/NotifyManageDAO.java +++ b/src/main/java/kcc/let/uss/notify/service/impl/NotifyManageDAO.java @@ -84,6 +84,10 @@ public class NotifyManageDAO extends EgovAbstractDAO { return (NotifyManageVO) select("VEANotifyDAO.findByUserIdFromVE_EDU_DOC_REQ", eduAplctOrd); } + public NotifyManageVO findByUserIdFromVE_EDU_DOC_REQ_2(String eduAplctOrd) { + return (NotifyManageVO) select("VEANotifyDAO.findByUserIdFromVE_EDU_DOC_REQ_2", eduAplctOrd); + } + public String selectNotifyInstr(NotifyManageVO notifyManageVO) { return (String) select("VEANotifyDAO.selectNotifyInstr", notifyManageVO); } 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 8029c367..118bcc35 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 @@ -586,7 +586,12 @@ public class NotifyManageServiceImpl extends EgovAbstractServiceImpl implements }else if ( "97".equals(p_noti_status) //서류요청 ) { - notifyPath = "/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmDetail.do"; //강사 - 강의내역상세 + notifyPath = "/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmDetail.do"; //강사 - 강의내역상세 + }else if ( + "98".equals(p_noti_status) //서류제출 + ) { + notifyPath = "/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.do"; //사용자 - 완료목록상세 + } @@ -735,6 +740,25 @@ public class NotifyManageServiceImpl extends EgovAbstractServiceImpl implements p_notifyManageVO.setEduAplctOrd(t_notifyManageVO.getEduAplctOrd()); p_notifyManageVO.setEduChasiOrd(t_notifyManageVO.getEduChasiOrd()); } + + }else if ( + "98".equals(p_noti_status) //98-서류제출 + ) { + + //해당 강사에게 알림 + NotifyManageVO t_notifyManageVO = notifyManageDAO.findByUserIdFromVE_EDU_DOC_REQ_2(p_notifyManageVO.getEduAplctOrd()); + + //p_notifyManageVO.setToUserId(notifyManageDAO.findByUserIdFromLETTNBBS(p_notifyManageVO.getEduAplctOrd())); + p_notifyManageVO.setToUserId(t_notifyManageVO.getToUserId()); + + //서류요청은 상세 페이지 데이터가 없어서 여기서 셋팅한다. + { + p_notifyManageVO.setParams("eduAplctOrd:"+t_notifyManageVO.getEduAplctOrd()+",eduChasiOrd:"+t_notifyManageVO.getEduChasiOrd()); + //ex)edu_aplct_ord:edu_001,edu_chasi_ord:edu_cha_001 + + p_notifyManageVO.setEduAplctOrd(t_notifyManageVO.getEduAplctOrd()); + p_notifyManageVO.setEduChasiOrd(t_notifyManageVO.getEduChasiOrd()); + } } diff --git a/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java b/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java index 26f88612..e25f1284 100644 --- a/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java +++ b/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java @@ -1409,7 +1409,7 @@ public class CommonWebController { //step3-4.월별시수대비할당이적은자 우선(필) - String s_orderByQuery = " NVL(aaa.instrSumChasi*10000,0)/(aaa.asgnmTm+1) asc "; + String s_orderByQuery = " NVL(aaa.instrSumChasi*10000,0)/(aaa.asgnmTm+1) asc, ccc0.areaCnt ASC, ccc0.weekCnt asc "; s_user_id = "'aaa'"; for (int j=0;j + +