2024-02-06 09:32 성인찾교 알림 수정

src/main/java/kcc/com/utl/user/service/QustnrCommonUtil.java

@@ -109,11 +109,12 @@ public class QustnrCommonUtil {
     	VEAQestnrVO	vEAQestnrVO	=	new VEAQestnrVO();
     	vEAQestnrVO.setSiteId(p_siteId);	//청소년 
     	vEAQestnrVO.setSiteIdCd(p_siteIdCd);						//10-기본설문, 20-신청자설문, 30-강사설문
+    	vEAQestnrVO.setEduAplctOrd(p_eduAplctOrd);
+    	vEAQestnrVO.setEduChasiOrd(p_eduChasiOrd);
     	vEAQestnrVO	=	p_vEALettnQestnrMIXService.selectDetail_MIX_LQI_02(vEAQestnrVO);
     	
     	vEAQestnrVO.setEduAplctOrd(p_eduAplctOrd);
     	vEAQestnrVO.setEduChasiOrd(p_eduChasiOrd);
-    	
     	List<VEAQestnrVO> chasiSrvyList = p_vEALettnQestnrMIXService.selectDetail_MIX_LQI_04(vEAQestnrVO);
     	
     	if(chasiSrvyList.size() > 0) {

src/main/java/kcc/kccadr/cmm/innorix/service/AdrInnorixFileVO.java

@@ -37,6 +37,7 @@ public class AdrInnorixFileVO extends ComDefaultVO implements Serializable {
 	// 파일 등록 후 리턴 메세지 jsp에서 넘겨줌
 	public String successMsg = "";
 	public String eduAplctOrd = "";
+	public String eduChasiOrd = "";
 	public String prcsAplctPrdOrd = ""; //기반강화 강의계획서용
 	
 	// 컨트롤 엘리먼트 ID - 멀티 업로드 시 jsp에서 사용하는 el 값
@@ -334,6 +335,14 @@ public class AdrInnorixFileVO extends ComDefaultVO implements Serializable {
 		this.lctrEndM = lctrEndM;
 	}
 
+	public String getEduChasiOrd() {
+		return eduChasiOrd;
+	}
+
+	public void setEduChasiOrd(String eduChasiOrd) {
+		this.eduChasiOrd = eduChasiOrd;
+	}
+
 	
 	
 	

src/main/java/kcc/kccadr/cmm/innorix/service/impl/InnorixFileServiceImpl.java

@@ -27,7 +27,9 @@ import kcc.kccadr.cmm.innorix.service.AdrInnorixFileVO;
 import kcc.kccadr.cmm.innorix.service.InnorixFileService;
 import kcc.kccadr.cmm.innorix.service.InnorixFileVO;
 import kcc.let.utl.fcc.service.EgovStringUtil;
+import kcc.let.utl.fcc.service.ITNotiUtil;
 import kcc.ve.aplct.sspnIdtmt.service.SspnIdtmtService;
+import kcc.ve.cmm.VeConstants;
 import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctService;
 import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO;
 import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduMIXService;
@@ -112,6 +114,9 @@ public class InnorixFileServiceImpl extends EgovAbstractServiceImpl implements I
     @Resource(name = "vEInstrDetailActvtHstryDAO")
     private VEInstrDetailActvtHstryDAO vEInstrDetailActvtHstryDAO;
     
+	//알림
+	@Resource(name = "iTNotiUtil")
+	private ITNotiUtil	iTNotiUtil;
     
 	/** 
 	 * @methodName	: fileDataUpload 
@@ -238,6 +243,26 @@ public class InnorixFileServiceImpl extends EgovAbstractServiceImpl implements I
 			//저장
 			vEEduAplctService.update(vEEduAplctVO);
 			
+			
+    		//알림등록
+			try {
+				if("ATTEND".equals(fileType)) {
+					//강사 참석 확인서 첨부파일 알림
+		        	iTNotiUtil.insertNotifyNew(
+		        			"20", 
+		        			adrInnorixFileVO.getUniqId(), 
+		        			VeConstants.NOTI_STATUS_41, 
+		        			adrInnorixFileVO.getEduAplctOrd(), 
+		        			adrInnorixFileVO.getEduChasiOrd(),	        			 
+		        			"2", 
+		        			"2"
+		        			);
+				}				
+					
+			}catch(Exception ex) {
+				ex.printStackTrace();
+			}
+			
 		} catch (Exception e) {
 			e.printStackTrace();
 			return new RestResponse(HttpStatus.BAD_REQUEST, "등록에 실패하였습니다.", LocalDateTime.now());
@@ -560,6 +585,21 @@ public class InnorixFileServiceImpl extends EgovAbstractServiceImpl implements I
 			
 			vEInstrDetailActvtHstryDAO.insert(vEInstrActvtHstryVO);
 			
+			//강사활동확인서 신청 알림
+			try {
+	        	iTNotiUtil.insertNotifyNew(
+	        			"20", 
+	        			adrInnorixFileVO.getUniqId(), 
+	        			VeConstants.NOTI_STATUS_71, 
+	        			adrInnorixFileVO.getEduAplctOrd(), 
+	        			adrInnorixFileVO.getEduChasiOrd(),	        			 
+	        			"0", 
+	        			"0"
+	        			);					
+			}catch(Exception ex) {
+				ex.printStackTrace();
+			}
+			
 		} catch (Exception e) {
 			e.printStackTrace();
 			return new RestResponse(HttpStatus.BAD_REQUEST, "등록에 실패하였습니다.", LocalDateTime.now());
@@ -600,6 +640,21 @@ public class InnorixFileServiceImpl extends EgovAbstractServiceImpl implements I
 			
 			vEEduAplctService.insertRslt(vEEduAplctVO);
 			
+			//결과보고서 알림
+			try {
+	        	iTNotiUtil.insertNotifyNew(
+	        			"20", 
+	        			adrInnorixFileVO.getUniqId(), 
+	        			VeConstants.NOTI_STATUS_51, 
+	        			adrInnorixFileVO.getEduAplctOrd(), 
+	        			adrInnorixFileVO.getEduChasiOrd(),	        			 
+	        			"2", 
+	        			"2"
+	        			);					
+			}catch(Exception ex) {
+				ex.printStackTrace();
+			}
+			
 		} catch (Exception e) {
 			e.printStackTrace();
 			return new RestResponse(HttpStatus.BAD_REQUEST, "등록에 실패하였습니다.", LocalDateTime.now());

src/main/java/kcc/let/uss/notify/service/impl/NotifyManageServiceImpl.java

@@ -511,7 +511,9 @@ public class NotifyManageServiceImpl extends EgovAbstractServiceImpl implements
 		// 교육 담당자 조회 - 노티 받을 대상
 		//notifyManageVO.setToUserId(notifyManageDAO.findByUserIdFromVE_EDU_APLCT(eduAplctOrd));
 		//notifyManageDAO.insertNotifyInfo(p_notifyManageVO);
+		
 		this._findToUserIdNInsertNoti(p_notifyManageVO, s_lctrDivCd, p_noti_status);
+		
 	}
 	
 	//알림 링크 정보 만들기
@@ -547,8 +549,48 @@ public class NotifyManageServiceImpl extends EgovAbstractServiceImpl implements
         			*/
         			) {
         		notifyPath = "/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctDetail.do";	//사용자 - 교육신청목록 - 상세
-        	}
         		
+        	}else if (
+        			"21".equals(p_noti_status)			//강사 - 교육수락요청 - 상세
+        			||"100".equals(p_noti_status)			//강사 - 교육확정 - 상세
+        			) {
+        		notifyPath = "/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmRqstDetail.do";	//강사 - 교육수락요청 - 상세
+        		
+        	}else if (
+        			"22".equals(p_noti_status)			//교육수락
+        			|| "23".equals(p_noti_status)		//교육거절
+        			|| "24".equals(p_noti_status)		//변경요청
+        			) {
+        		notifyPath = "/kccadr/oprtn/adultVisitEdu/eduCnfrmMngList.do";	//운영자 - 교육배치관리 - 리스트
+        		
+        	}else if (
+        			"31".equals(p_noti_status)		//강의 계획서
+        			|| "41".equals(p_noti_status)		//강사참석확인서
+        			|| "62".equals(p_noti_status)		//강의만족도제출
+        			) {	
+        		notifyPath = "/kccadr/oprtn/adultVisitEdu/eduRsltMngDetail.do";	//사용자 - 교육신청목록 - 상세
+
+        	}else if (
+        			"61".equals(p_noti_status)		//강의만족도제출요청
+        			) {	
+        		notifyPath = "/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.do";	//사용자 - 교육신청목록 - 상세
+
+        	}else if (
+        			"71".equals(p_noti_status)		//강사활동확인서 신청
+        			) {	
+        		notifyPath = "/kccadr/oprtn/adultVisitEdu/instrActvtHstryMngList.do";	//사용자 - 교육신청목록 - 상세
+        	
+        	}else if (
+        			"72".equals(p_noti_status)		//강사활동확인서 승인
+        			) {	
+        		notifyPath = "/web/ve/instr/adultVisitEdu/instrInfo/instrPrflDetail.do";	//강사 - 성인강사신청상세
+        	
+        	}else if (
+        			"81".equals(p_noti_status)		//강사정보수정요청
+        			) {	
+        		notifyPath = "/ve/oprtn/instr/adultVisitEdu/instrInfo/instrMngList.do";		//운영자 - 강사목록
+        		
+        	}
         	
         }
         else if( "30".equals(p_lctrDivCd) ) {	//체험
@@ -586,7 +628,21 @@ public class NotifyManageServiceImpl extends EgovAbstractServiceImpl implements
         	
         	
         }else if( "20".equals(p_lctrDivCd) ) {	//성인
-        	if ("10".equals(p_noti_status)) {	//10-교육신청
+        	if (
+        			"10".equals(p_noti_status)		//10-교육신청
+        			||"22".equals(p_noti_status)		//22-교육수락
+        			||"23".equals(p_noti_status)		//23-교육거절
+        			||"24".equals(p_noti_status)		//24-교육변경요청
+        			
+        			||"31".equals(p_noti_status)		//31-강의계획서제출
+        			||"41".equals(p_noti_status)		//41-강사참석확인서
+        			
+        			||"62".equals(p_noti_status)		//62-강의만족도 제출
+        			
+        			||"71".equals(p_noti_status)		//71-강사활동확인서 신청
+        			
+        			||"81".equals(p_noti_status)		//81-정보수정요청
+        			) {	//10-교육신청
         		//담당 관리자에게 모두 알림
         		p_notifyManageVO.setFirstIndex(0);
         		p_notifyManageVO.setRecordCountPerPage(1000);
@@ -594,10 +650,13 @@ public class NotifyManageServiceImpl extends EgovAbstractServiceImpl implements
         		notifyManageListVO = notifyManageDAO.selectMngPagingList(p_notifyManageVO);
         		
         	}else if (
-        			"11".equals(p_noti_status)	
+        			"11".equals(p_noti_status)		//11-교육상태변경, 12-교육문자발송, 13-교육메일발송
         			||"12".equals(p_noti_status)
         			||"13".equals(p_noti_status)
-        			) {								//11-교육상태변경, 12-교육문자발송, 13-교육메일발송
+        				
+        			||"61".equals(p_noti_status)	//강의만족도 제출 요청건
+        			) {							
+        		
         		//해당 신청자에게 알림
         		p_notifyManageVO.setToUserId(notifyManageDAO.findByUserIdFromVE_EDU_APLCT(p_notifyManageVO.getEduAplctOrd()));        		
         		        		
@@ -608,6 +667,13 @@ public class NotifyManageServiceImpl extends EgovAbstractServiceImpl implements
         		// 강사 ID 가져오기
         		notifyManageListVO = notifyManageDAO.selectInstrList(p_notifyManageVO);
 
+        	}else if (
+        			"72".equals(p_noti_status)		//71-강사활동확인서 승인
+        			) {        	
+        		// 강사 ID 가져오기
+        		p_notifyManageVO.setToUserId(p_notifyManageVO.getEduAplctOrd());
+        		//notifyManageListVO = notifyManageDAO.selectInstrList(p_notifyManageVO);
+        		
         	}
         }
         
@@ -616,7 +682,7 @@ public class NotifyManageServiceImpl extends EgovAbstractServiceImpl implements
 			//관리자 배열에 값이 있으면 해당 대상자들에게 알림 등록
 			if (notifyManageListVO==null) {
 				//신청자에게 알림을 등록한다.
-				p_notifyManageVO.setToUserId(notifyManageDAO.findByUserIdFromVE_EDU_APLCT(p_notifyManageVO.getEduAplctOrd()));
+				//p_notifyManageVO.setToUserId(notifyManageDAO.findByUserIdFromVE_EDU_APLCT(p_notifyManageVO.getEduAplctOrd()));
 				notifyManageDAO.insertNotifyInfo(p_notifyManageVO);
 				
 			}else {
@@ -671,6 +737,42 @@ public class NotifyManageServiceImpl extends EgovAbstractServiceImpl implements
         		notifyCn	=	"교육 문자 발송되었습니다.";
         	}else if ("13".equals(p_noti_status)) {
         		notifyCn	=	"교육 메일 발송되었습니다.";
+        		
+        	}else if ("21".equals(p_noti_status)) {
+        		notifyCn	=	"교육수락 요청건이 있습니다.";   
+
+        	}else if ("22".equals(p_noti_status)) {
+        		notifyCn	=	"교육수락 건이 있습니다.";
+        	
+        	}else if ("23".equals(p_noti_status)) {
+        		notifyCn	=	"교육거절 건이 있습니다.";
+        		
+        	}else if ("24".equals(p_noti_status)) {
+        		notifyCn	=	"교육 변경 요청 건이 있습니다.";
+        	
+        	}else if ("100".equals(p_noti_status)) {
+        		notifyCn	=	"교육 확정 건이 있습니다.";
+        		
+        	}else if ("31".equals(p_noti_status)) {	//강의 계획서
+        		notifyCn	=	"강의계획서 제출건이 있습니다.";
+        		
+        	}else if ("41".equals(p_noti_status)) {	//강사참석확인서
+        		notifyCn	=	"강사참석확인서 제출 건이 있습니다.";
+        		
+        	}else if ("61".equals(p_noti_status)) {	//강의만족도제출요청	
+        		notifyCn	=	"강의만족도 제출 요청 건이 있습니다.";
+        		
+        	}else if ("62".equals(p_noti_status)) {	//강의만족도제출	
+        		notifyCn	=	"강의만족도 제출건이 있습니다.";     
+        	
+        	}else if ("71".equals(p_noti_status)) {	//강사활동확인서신청	
+        		notifyCn	=	"강사활동확인서 신청 건이 있습니다.";
+
+        	}else if ("72".equals(p_noti_status)) {	//강사활동확인서승인	
+        		notifyCn	=	"강사활동확인서 승인 건이 있습니다.";
+        		
+        	}else if ("81".equals(p_noti_status)) {	//정보수정요청	
+        		notifyCn	=	"정보수정 요청 건이 있습니다.";
         	}
         }
         else if( "30".equals(p_lctrDivCd) ) {	//체험

src/main/java/kcc/let/utl/fcc/service/ITNotiUtil.java

@@ -79,15 +79,18 @@ public class ITNotiUtil {
 
         	
         	//알림 대상자 선정에 필요한 파라미터 설정
-        	if("1".equals(p_move_param_type)) {
+        	if("1".equals(p_noti_param_type)) {
         		notifyManageVO.setEduAplctOrd(p_eduAplctOrd);        		
             	
-        	}else if("2".equals(p_move_param_type)) {
+        	}else if("2".equals(p_noti_param_type)) {
         		notifyManageVO.setEduAplctOrd(p_eduAplctOrd);
         		notifyManageVO.setEduChasiOrd(p_eduChasiOrd);
         	}
         	        	
  	
+        	System.out.println("notifyManageVO.toString()");
+        	System.out.println(notifyManageVO.toString());
+        	
             //new 알림-2024.02.02
             notifyManageService.insertNotifyNew(notifyManageVO, p_noti_status_cd);	//교육신청 - 상태변경
             

src/main/java/kcc/ve/aplct/comweb/CommonWebController.java

@@ -19,6 +19,7 @@ import kcc.com.cmm.service.FileVO;
 import kcc.com.utl.fcc.service.EgovStringUtil;
 import kcc.com.utl.user.service.CheckLoginUtil;
 import kcc.let.utl.fcc.service.EgovCryptoUtil;
+import kcc.let.utl.fcc.service.ITNotiUtil;
 import kcc.ve.adv.tngr.stngInfo.service.VEAStngService;
 import kcc.ve.adv.tngr.stngInfo.service.VEAStngVO;
 import kcc.ve.cmm.VeConstants;
@@ -92,6 +93,9 @@ public class CommonWebController {
 	@Resource(name="vEInstrDetailService")
 	private VEInstrDetailService vEInstrDetailService;
     
+	//알림
+	@Resource(name = "iTNotiUtil")
+	private ITNotiUtil	iTNotiUtil;
 
     @RequestMapping("/popup/searchBeforeContent.do")
     public String searchBeforeContentPopup(@ModelAttribute("vEEduAplctVO") VEEduAplctVO vEEduAplctVO, ModelMap model, HttpServletRequest request) throws Exception{
@@ -977,6 +981,19 @@ public class CommonWebController {
 			vEEduChasiInstrAsgnmService.updateAsgnmY(vEInstrAsgnmVO);
 			vEEduChasiInstrAsgnmService.updateAsgnmN(vEInstrAsgnmVO);	
         	
+			try {
+	        	iTNotiUtil.insertNotifyNew(
+	        			"20", 
+	        			loginVO.getUniqId(), 
+	        			VeConstants.NOTI_STATUS_100, 
+	        			p_step01_list.get(i).getEduAplctOrd(), 
+	        			p_step01_list.get(i).getEduChasiOrd(),	        			 
+	        			"2", 
+	        			"2"
+	        			);					
+			}catch(Exception ex) {
+				ex.printStackTrace();
+			}
 			
 			//성인교육의 경우 배정 확정 된 강사의 ID와 메일 조회 후 안내 SMS, 메일 전송
 			if("20".equals(veEduAplctVO.getLctrDivCd())) {

src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java

@@ -33,6 +33,7 @@ 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.cmm.VeConstants;
 import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctOnlnService;
 import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctService;
@@ -159,6 +160,10 @@ public class EduEndTngrController {
 	@Resource(name = "NotifyManageService")
 	private NotifyManageService notifyManageService;
 	
+	//알림
+	@Resource(name = "iTNotiUtil")
+	private ITNotiUtil	iTNotiUtil;
+	
 	/*
 	
 	// 교육신청 서비스단
@@ -719,6 +724,21 @@ public class EduEndTngrController {
 				qustnrRespondInfoVO.getResultList().get(i).setEduAplctOrd(veEduAplctVO.getEduAplctOrd());
 				qustnrRespondInfoVO.getResultList().get(i).setEduChasiOrd(veEduAplctVO.getEduChasiOrd());
 				egovQustnrRespondInfoService.insertSrvyInfo(qustnrRespondInfoVO.getResultList().get(i));
+				
+	    		//알림 설문제출
+				try {
+		        	iTNotiUtil.insertNotifyNew(
+		        			"20", 
+		        			loginVO.getUniqId(), 
+		        			VeConstants.NOTI_STATUS_62, 
+		        			veEduAplctVO.getEduAplctOrd(), 
+		        			veEduAplctVO.getEduChasiOrd(),	        			 
+		        			"2", 
+		        			"2"
+		        			);					
+				}catch(Exception ex) {
+					ex.printStackTrace();
+				}
 			}
 		}catch(Exception ex) {
     		System.out.println("Exception vEEduAplctOnlnService.updateBulk");

src/main/java/kcc/ve/instr/adultVisitEdu/asgnmInfo/web/VEAdultAsgnmController.java

@@ -30,6 +30,7 @@ import kcc.com.utl.user.service.CheckLoginUtil;
 import kcc.let.uat.uia.service.SsoLoginVO;
 import kcc.let.utl.fcc.service.EgovCryptoUtil;
 import kcc.let.utl.fcc.service.EgovCryptoUtil4VO;
+import kcc.let.utl.fcc.service.ITNotiUtil;
 import kcc.let.utl.fcc.service.VisitEduTransUtil;
 import kcc.ve.cmm.VeConstants;
 import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEAcmdtAplctService;
@@ -106,6 +107,9 @@ public class VEAdultAsgnmController {
 		@Resource(name="veaLctrExchnOrdGnrService")
 		private EgovIdGnrService veaLctrExchnOrdGnrService;
 		
+		//알림
+		@Resource(name = "iTNotiUtil")
+		private ITNotiUtil	iTNotiUtil;
 		
 		//성인강사 강의 요청 목록
 		@RequestMapping("/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmRqstList.do")
@@ -437,7 +441,8 @@ public class VEAdultAsgnmController {
 			
 			vEAsgnmNotiVO.setUrlPath(IpUtil.getRequestURI(request));
 			
-			vEAsgnmNotiService.insertAsgnmNotiInfo(vEAsgnmNotiVO);
+			//상세 화면에서 처리함
+			//vEAsgnmNotiService.insertAsgnmNotiInfo(vEAsgnmNotiVO);
 			
 			return "/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmRqstDetail";
 		}
@@ -610,6 +615,21 @@ public class VEAdultAsgnmController {
 	    		
 	    		vEAsgnmMIXService.updateLctrPlan(vEInstrAsgnmVO);
 	    		
+	    		//알림등록
+				try {
+		        	iTNotiUtil.insertNotifyNew(
+		        			"20", 
+		        			loginVO.getUniqId(), 
+		        			VeConstants.NOTI_STATUS_31, 
+		        			vEInstrAsgnmVO.getEduAplctOrd(), 
+		        			vEInstrAsgnmVO.getEduChasiOrd(),	        			 
+		        			"2", 
+		        			"2"
+		        			);					
+				}catch(Exception ex) {
+					ex.printStackTrace();
+				}
+	        
 	    	}catch(Exception ex) {
 	    		System.out.println("Exception vEAsgnmMIXService.updateLctrPlan");
 	    	}
@@ -687,16 +707,62 @@ public class VEAdultAsgnmController {
 			vEInstrAsgnmVO.setUserId(loginVO.getUniqId());
 			vEAsgnmMIXService.updateAsgnmCode(vEInstrAsgnmVO);
 			//차시 테이블 확정 Y 업데이트 처리
-			if("30".equals(vEInstrAsgnmVO.getAsgnmAprvlCd())) {
+			if("30".equals(vEInstrAsgnmVO.getAsgnmAprvlCd())) {			//요청 수락
 				vEInstrAsgnmVO.setInstrCnfrmCd("Y");
 				vEInstrAsgnmVO.setInstrCnfrmId(loginVO.getUniqId());
 				vEAsgnmMIXService.updateChasiCode(vEInstrAsgnmVO);
+
+				try {
+		        	iTNotiUtil.insertNotifyNew(
+		        			"20", 
+		        			loginVO.getUniqId(), 
+		        			VeConstants.NOTI_STATUS_22, 
+		        			vEInstrAsgnmVO.getEduAplctOrd(), 
+		        			vEInstrAsgnmVO.getEduChasiOrd(),	        			 
+		        			"1", 
+		        			"0"
+		        			);					
+				}catch(Exception ex) {
+					ex.printStackTrace();
+				}
+
+				
 			}else if("40".equals(vEInstrAsgnmVO.getAsgnmAprvlCd())) { //요청 거절 시 강사배정내역 테이블에 insert. 요청 목록에서 거절한 항목 조회를 위해(VE0025)
 				vEInstrAsgnmVO.setHstryCd("10"); //거절
 				vEAsgnmMIXService.insertAsgnmHstry(vEInstrAsgnmVO);
+				
+				try {
+		        	iTNotiUtil.insertNotifyNew(
+		        			"20", 
+		        			loginVO.getUniqId(), 
+		        			VeConstants.NOTI_STATUS_23, 
+		        			vEInstrAsgnmVO.getEduAplctOrd(), 
+		        			vEInstrAsgnmVO.getEduChasiOrd(),	        			 
+		        			"1", 
+		        			"0"
+		        			);					
+				}catch(Exception ex) {
+					ex.printStackTrace();
+				}
+				
 			}else if("60".equals(vEInstrAsgnmVO.getAsgnmAprvlCd())) { //요청 거절 시 강사배정내역 테이블에 insert. 요청 목록에서 거절한 항목 조회를 위해(VE0025)
 				vEInstrAsgnmVO.setHstryCd("40"); //변경요청
 				vEAsgnmMIXService.insertAsgnmHstry(vEInstrAsgnmVO);
+				
+				try {
+		        	iTNotiUtil.insertNotifyNew(
+		        			"20", 
+		        			loginVO.getUniqId(), 
+		        			VeConstants.NOTI_STATUS_24, 
+		        			vEInstrAsgnmVO.getEduAplctOrd(), 
+		        			vEInstrAsgnmVO.getEduChasiOrd(),	        			 
+		        			"1", 
+		        			"0"
+		        			);					
+				}catch(Exception ex) {
+					ex.printStackTrace();
+				}
+				
 			}
 			modelAndView.addObject("result", "success");
 			

src/main/java/kcc/ve/instr/adultVisitEdu/instrInfo/web/InstrAdultPrflController.java

@@ -40,6 +40,8 @@ import kcc.kccadr.sch.service.SchduleManageVO;
 import kcc.let.uat.uia.service.SsoLoginVO;
 import kcc.let.utl.fcc.service.EgovCryptoUtil;
 import kcc.let.utl.fcc.service.EgovCryptoUtil4VO;
+import kcc.let.utl.fcc.service.ITNotiUtil;
+import kcc.ve.cmm.VeConstants;
 import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEAsgnmMIXService;
 import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEInstrAsgnmVO;
 import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailActvtHstryService;
@@ -146,6 +148,11 @@ public class InstrAdultPrflController {
 
 		@Resource(name = "vEInstrDetailActvtHstryService")
 		private VEInstrDetailActvtHstryService vEInstrDetailActvtHstryService;
+		
+		//알림
+		@Resource(name = "iTNotiUtil")
+		private ITNotiUtil	iTNotiUtil;
+		
 		/**
 		 * 0.성인 강사 대시보드 화면
 		 */
@@ -504,6 +511,22 @@ public class InstrAdultPrflController {
 				vEInstrService.insert(vEInstrDetailVO);
 			}
 			vEInstrDetailService.insert(vEInstrDetailVO);
+			
+			//강사 정보 수정요청
+			try {
+	        	iTNotiUtil.insertNotifyNew(
+	        			"20", 
+	        			loginVO.getUniqId(), 
+	        			VeConstants.NOTI_STATUS_81, 
+	        			"", 
+	        			"",	        			 
+	        			"0", 
+	        			"0"
+	        			);					
+			}catch(Exception ex) {
+				ex.printStackTrace();
+			}
+			
 			modelAndView.addObject("result", "success");
 			
 			return modelAndView;

src/main/java/kcc/ve/oprtn/adultVisitEdu/eduCnfrmMng/web/EduCnfrmMngAdultController.java

@@ -30,6 +30,7 @@ import kcc.com.cmm.util.KoreanRegionEnum;
 import kcc.com.utl.user.service.CheckLoginUtil;
 import kcc.kccadr.cmm.CmmUtil;
 import kcc.let.utl.fcc.service.EgovCryptoUtil;
+import kcc.let.utl.fcc.service.ITNotiUtil;
 import kcc.let.utl.fcc.service.VEPagingUtil;
 import kcc.ve.cmm.VeConstants;
 import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEAcmdtAplctService;
@@ -147,6 +148,10 @@ public class EduCnfrmMngAdultController {
 	@Resource(name = "vEPagingUtil")
 	private VEPagingUtil vEPagingUtil;		
 	
+	//알림
+	@Resource(name = "iTNotiUtil")
+	private ITNotiUtil	iTNotiUtil;
+	
 	/**
 	 * 교육확정관리 목록 화면
 	 */	
@@ -586,6 +591,8 @@ public class EduCnfrmMngAdultController {
 		//로그인 처리==================================== 
 		LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기
 		
+		System.out.println("================================================-------------------");
+		
 		try {
 			String[] splitChk = vEEduAplctVO.getChk().split(",");
 			
@@ -603,6 +610,21 @@ public class EduCnfrmMngAdultController {
 					vo.setAsgnmAprvlId(loginVO.getUniqId());
 					
 					vEEduChasiInstrAsgnmService.update(vo);
+					
+					try {
+			        	iTNotiUtil.insertNotifyNew(
+			        			"20", 
+			        			loginVO.getUniqId(), 
+			        			VeConstants.NOTI_STATUS_21, 
+			        			aplctChasi[0], 
+			        			aplctChasi[1], 
+			        			"2", 
+			        			"2"
+			        			);						
+					}catch(Exception ex) {
+						ex.printStackTrace();
+					}
+
 				}
 			}
 			

src/main/java/kcc/ve/oprtn/adultVisitEdu/instrActvtHstryMng/InstrActvtHstryAdultMngController.java

@@ -22,6 +22,7 @@ import kcc.com.cmm.service.EgovFileMngUtil;
 import kcc.com.utl.user.service.CheckLoginUtil;
 import kcc.let.uat.uia.service.SsoLoginVO;
 import kcc.let.utl.fcc.service.EgovCryptoUtil;
+import kcc.let.utl.fcc.service.ITNotiUtil;
 import kcc.ve.cmm.VeConstants;
 import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailActvtHstryService;
 import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailActvtHstryVO;
@@ -80,7 +81,9 @@ public class InstrActvtHstryAdultMngController {
 	@Resource(name = "egovCryptoUtil")
 	EgovCryptoUtil egovCryptoUtil;
 
-	
+	//알림
+	@Resource(name = "iTNotiUtil")
+	private ITNotiUtil	iTNotiUtil;
 
 	/**
 	 * 강사활동확인서신청관리 목록
@@ -223,6 +226,28 @@ public class InstrActvtHstryAdultMngController {
 		vEInstrDetailActvtHstryVO.setLastUpdusrId(loginVO.getUniqId());
 		vEInstrDetailActvtHstryService.updateStateCd(vEInstrDetailActvtHstryVO);
 		
+		VEInstrDetailActvtHstryVO	vEInstrDetailActvtHstryVOInfo	=	new VEInstrDetailActvtHstryVO();
+		vEInstrDetailActvtHstryVOInfo.setPrcsAplctPrdOrd(vEInstrDetailActvtHstryVO.getPrcsAplctPrdOrd());
+		vEInstrDetailActvtHstryVOInfo	=	vEInstrDetailActvtHstryService.findById(vEInstrDetailActvtHstryVO);
+		
+		
+		if ("30".equals(vEInstrDetailActvtHstryVO.getStateCd())) {
+			//강사활동확인서 승인 알림
+			try {
+	        	iTNotiUtil.insertNotifyNew(
+	        			"20", 
+	        			loginVO.getUniqId(), 
+	        			VeConstants.NOTI_STATUS_72, 
+	        			vEInstrDetailActvtHstryVOInfo.getUserId(), 
+	        			"",	        			 
+	        			"0", 
+	        			"1"
+	        			);					
+			}catch(Exception ex) {
+				ex.printStackTrace();
+			}
+		}
+		
 		modelAndView.addObject("result", "success");
 		
 		return modelAndView;

src/main/java/kcc/ve/oprtn/pblc/sndMng/web/SndMngController.java

@@ -33,6 +33,7 @@ import kcc.let.uss.ion.cnt.service.EgovCntManageService;
 import kcc.let.uss.notify.service.NotifyManageService;
 import kcc.let.uss.notify.service.NotifyManageVO;
 import kcc.let.utl.fcc.service.EgovCryptoUtil;
+import kcc.let.utl.fcc.service.ITNotiUtil;
 import kcc.ve.cmm.VeConstants;
 import kcc.ve.cmm.VeSendMail;
 import kcc.ve.cmm.VeSendSMS;
@@ -200,6 +201,10 @@ public class SndMngController {
 		
 	}
 	
+	//알림
+	@Resource(name = "iTNotiUtil")
+	private ITNotiUtil	iTNotiUtil;
+	
 	/**
 	 * sms 발송 
 	 */
@@ -620,6 +625,25 @@ public class SndMngController {
     		notifyManageService.insertNotifyNew(notifyManageVO, VeConstants.NOTI_STATUS_12);	//교육신청 - sms 발송	
     	}else if ("20".equals(vEEduAplctVO.getSndCd())) {
     		notifyManageService.insertNotifyNew(notifyManageVO, VeConstants.NOTI_STATUS_13);	//교육신청 - email 발송
+    	}else if ("61".equals(vEEduAplctVO.getSndCd())) {
+    		
+    		//알림 강의만족도 제출 요청
+			try {
+	        	iTNotiUtil.insertNotifyNew(
+	        			"20", 
+	        			loginVO.getUniqId(), 
+	        			VeConstants.NOTI_STATUS_61, 
+	        			vEEduAplctVO.getEduAplctOrd(), 
+	        			vEEduAplctVO.getEduChasiOrd(),	        			 
+	        			"2", 
+	        			"2"
+	        			);					
+			}catch(Exception ex) {
+				ex.printStackTrace();
+			}
+			
+    		//notifyManageService.insertNotifyNew(notifyManageVO, VeConstants.NOTI_STATUS_61);	//강의만족도 제출 요청
+    		
     	}
         
         

src/main/resources/egovframework/sqlmap/let/sym/ccm/notify/VEANotify_Mng_SQL_Tibero.xml

@@ -58,7 +58,7 @@
 	<select id="VEANotifyMngDAO.selectInstrList" parameterClass="notifyManageVO" resultClass="notifyManageVO">
 		/*	VEANotifyMngDAO.selectInstrList	*/
 		
-		SELECT user_id
+		SELECT user_id	AS	mngUserId
 		FROM vea_prcs_aplct_prd_instr_asgnm
 		WHERE prcs_aplct_prd_ord=#prcsAplctPrdOrd#
 		UNION all

src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduCnfrmMngList.jsp

@@ -148,6 +148,7 @@
 		}
 		
 		// 배정 상태 변경
+		/*
 		function fncModifyStat(flag) {
 			var chkLen = $(listForm).find("input[name=chk]:checked").length;
 			var chkStatCd = "";
@@ -206,6 +207,7 @@
 				});
 			}
 		}
+		*/
 		
 		//sms 발송
 		function fncSndSms(){
@@ -451,7 +453,7 @@
 			if(flag == 'new') {
 				chkStatCd = "10";
 				msg = "강의 수락 요청";
-				actionUrl = "${pageContext.request.contextPath}/kccadr/oprtn/tngrVisitEdu/instrAsgnmCnfrmAjax.do";
+				actionUrl = "${pageContext.request.contextPath}/kccadr/oprtn/adultVisitEdu/instrAsgnmCnfrmAjax.do";
 				
 				
 				var deadlineDt = $("#deadlineDt").val();
@@ -471,7 +473,7 @@
 			if(flag == 'add') {
 				chkStatCd = "40";
 				msg = "추가 강의 요청";
-				actionUrl = "${pageContext.request.contextPath}/kccadr/oprtn/tngrVisitEdu/lctrAddAjax.do";
+				actionUrl = "${pageContext.request.contextPath}/kccadr/oprtn/adultVisitEdu/lctrAddAjax.do";
 			}
 
 			var fnExit = false;

src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngList.jsp

@@ -229,6 +229,7 @@
 				);
 			
 			//강의만족도 제출 알림
+			/*
 			insertNoty(
 					$(this).val().split('@')[0],
 					$(this).val().split('@')[1],
@@ -237,12 +238,54 @@
 					$(this).data('frstregisterid'),
 					'20'
 					)
+					*/
+
+					fncNotiReg(
+							"${pageContext.request.contextPath}/kccadr/oprtn/pblc/notifyRegAjax.do"		
+							, "61"	
+							, $(this).val().split('@')[0]	//eduAplctOrd
+							, $(this).val().split('@')[1]	//eduChasiOrd
+							);
 			
 			});
 			alert("발송되었습니다.");
 			
 		}
 
+		//알림 등록용 함수-문자,메일 중 요청한 곳에만 추가한다.
+		function fncNotiReg(
+				p_url
+				, p_cd
+				, p_eduAplctOrd
+				, p_eduChasiOrd
+				){
+			
+			$.ajax({
+		        type: "POST",
+		    //    enctype: 'multipart/form-data',
+		        url:p_url,
+		        //data: data,
+				data:{
+						"eduAplctOrd"	:  p_eduAplctOrd,					
+						"eduChasiOrd"	:  p_eduChasiOrd,
+						"sndCd":  p_cd,
+						"lctrDivCd"		:  '20',
+					},	        
+		        dataType:'json',
+		        
+				success:function(returnData){
+					if(returnData.result == "success"){
+						//alert(returnData.message);
+					}else{
+						//alert(returnData.message);
+					}
+				},
+				error:function(request , status, error){
+					//alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error);
+				}
+			});
+		}	
+		
 		function fncReset(thisObj){
 			var targetObj = $(thisObj).closest('.list_top').find('select,input');
 			$.each(targetObj, function(){

src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp

@@ -579,6 +579,7 @@
 		
 		var sendData = {
 				"eduAplctOrd": '<c:out value='${info.eduAplctOrd}'/>'
+				, "eduChasiOrd": '<c:out value='${info.eduChasiOrd}'/>'
 				, "innorixFileListVO": data
 				, "lctrSbjct" : $('#lctrSbjct').val()
 				, "type" : "RSLT"

src/main/webapp/WEB-INF/jsp/web/ve/comm/fileUploadPop.jsp

@@ -254,6 +254,7 @@
 		var sendData = {
 				"fileType": $('#fileType').val()
 				, "eduAplctOrd": $('#eduAplctOrd').val()
+				, "eduChasiOrd": $('#eduChasiOrd').val()
 				, "innorixFileListVO": data
 				, "successMsg" : setMsg+" 등록이 완료되었습니다."
 		}
@@ -279,6 +280,7 @@
 	<form name="fileForm" id="fileForm" method="post" >
 		<input type="hidden" name="fileType" id="fileType" value="${fileType}" />
 		<input type="hidden" name="eduAplctOrd" id="eduAplctOrd" value="<c:out value='${info.eduAplctOrd}'/>"/>	<!-- 사용자 아이디 -->
+		<input type="hidden" name="eduChasiOrd" id="eduChasiOrd" value="<c:out value='${info.eduChasiOrd}'/>"/>	<!-- 사용자 아이디 -->
 		<input type="hidden" id="innoDirPath" value="<spring:eval expression="@globalSettings['Globals.Innorix.FilePath']"/>" />
 		<div class="tooltip-wrap">
 			<div class="popup_wrap popType03" tabindex="0" data-tooltip-con="sub35_pop01" data-focus="sub35_pop01" data-focus-prev="sub35_pop01_close">