2024-02-23 16:26 서류 제출 문서 교육일 이후 안보이도록 처리

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

@@ -985,19 +985,6 @@ 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())) {
@@ -1020,6 +1007,22 @@ public class CommonWebController {
 				vEEduChasiVO.setStrtTm(vEEduChasiVO.getStrtTm().substring(0,2) + ":" + vEEduChasiVO.getStrtTm().substring(2));
 				vEEduChasiVO.setEndTm(vEEduChasiVO.getEndTm().substring(0,2) + ":" + vEEduChasiVO.getEndTm().substring(2));
 				vEEduChasiVOList.add(vEEduChasiVO);
+				
+				
+				//교육확정알림 
+				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();
+				}				
 			}
 			
         }

src/main/java/kcc/ve/aplct/tngrVisitEdu/eduAplct/web/EduAplctTngrController.java

@@ -852,7 +852,7 @@ public class EduAplctTngrController {
     	//서류 요청 목록
     	VEEduAplctVO veEduDocReqVO = new VEEduAplctVO(); 
     	veEduDocReqVO.setEduAplctOrd(vEEduAplctVO.getEduAplctOrd());
-    	List<VEEduAplctVO> vEEduDocReqList = vEEduAplctService.selectDocReqList(veEduDocReqVO);
+    	List<VEEduAplctVO> vEEduDocReqList = vEEduAplctService.selectDocReqList4User(veEduDocReqVO);
     	//복호화
     	vEEduDocReqList	=	egovCryptoUtil.decryptVEEduAplctVOList(vEEduDocReqList);
     	model.addAttribute("docReqList", vEEduDocReqList);

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

@@ -542,7 +542,7 @@ public class EduEndTngrController {
 	    	//서류 요청 목록
 	    	VEEduAplctVO veEduDocReqVO = new VEEduAplctVO(); 
 	    	veEduDocReqVO.setEduAplctOrd(vEEduAplctVO.getEduAplctOrd());
-	    	List<VEEduAplctVO> vEEduDocReqList = vEEduAplctService.selectDocReqList(veEduDocReqVO);
+	    	List<VEEduAplctVO> vEEduDocReqList = vEEduAplctService.selectDocReqList4User(veEduDocReqVO);
 	    	//복호화
 	    	vEEduDocReqList	=	egovCryptoUtil.decryptVEEduAplctVOList(vEEduDocReqList);
 	    	model.addAttribute("docReqList", vEEduDocReqList);			

src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctService.java

@@ -57,6 +57,9 @@ public interface VEEduAplctService {
 	//서류요청 목록 조회
 	List<VEEduAplctVO> selectDocReqList(VEEduAplctVO paramVO) throws Exception;
 
+	//서류요청 목록 조회 - 사용자 페이지용 희망일 이후에는 보여지지 않는다.
+	List<VEEduAplctVO> selectDocReqList4User(VEEduAplctVO paramVO) throws Exception;
+	
 	//요청서류 제출
 	void updateSbmtAtchFileId(VEEduAplctVO paramVO) throws Exception;
 

src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduAplctDAO.java

@@ -157,6 +157,10 @@ public class VEEduAplctDAO extends EgovAbstractDAO {
 		return (List<VEEduAplctVO>) list("VEEduAplctDAO.selectDocReqList", paramVO);
 	}
 	
+	public List<VEEduAplctVO> selectDocReqList4User(VEEduAplctVO paramVO) throws Exception {
+		return (List<VEEduAplctVO>) list("VEEduAplctDAO.selectDocReqList4User", paramVO);
+	}
+	
 	public void updateSbmtAtchFileId(VEEduAplctVO paramVO) throws Exception {
 		insert("VEEduAplctDAO.updateSbmtAtchFileId", paramVO);
 	}

src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduAplctServiceImpl.java

@@ -183,6 +183,10 @@ public class VEEduAplctServiceImpl implements VEEduAplctService {
 		return vEEduAplctDAO.selectDocReqList(paramVO);
 	}
 	
+	public List<VEEduAplctVO> selectDocReqList4User(VEEduAplctVO paramVO) throws Exception{
+		return vEEduAplctDAO.selectDocReqList4User(paramVO);
+	}
+	
 	public void updateSbmtAtchFileId(VEEduAplctVO paramVO) throws Exception {
 		vEEduAplctDAO.updateSbmtAtchFileId(paramVO);
 	}

src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml

@@ -1465,6 +1465,49 @@
 			</isNotEmpty>
 
 					
+	</select>
+	
+	<select id="VEEduAplctDAO.selectDocReqList4User" parameterClass="VEEduAplctVO" resultClass="VEEduAplctVO">
+		/*	VEEduAplctDAO.selectDocReqList4User	*/
+		SELECT			
+			A.EDU_APLCT_ORD				AS	eduAplctOrd,
+			A.EDU_DOC_REQ_ORD			AS	eduDocReqOrd,
+			A.DOC_REQ_NM				AS	docReqNm,
+			A.DOC_FORM_ATCH_FILE_ID		AS	docFormAtchFileId,
+			TO_CHAR(A.FRST_REGIST_PNTTM, 'YYYY-MM-DD')	AS	frstRegistPnttm,
+			A.FRST_REGISTER_ID			AS	frstRegisterId,
+			A.SBMT_ATCH_FILE_ID			AS	sbmtAtchFileId,
+			TO_CHAR(A.SBMT_PNTTM,'YYYY-MM-DD')	AS	sbmtPnttm,
+			A.SBMT_ID					AS	sbmtId,
+			B.INSTR_NM					AS	instrNm,
+			B.PHONE						AS phone,
+			B.EMAIL						AS email
+		FROM 
+			VE_EDU_DOC_REQ A
+		LEFT JOIN VE_INSTR_DETAIL B
+			ON B.USER_ID = A.SBMT_ID
+			AND B.USE_YN = 'Y'
+		WHERE
+			1=1
+			<isNotEmpty property="eduAplctOrd">
+				AND EDU_APLCT_ORD = #eduAplctOrd#
+				
+				/*	사용자의 요청서류 목록은 희망일 이후에는 보여지지 않는다.	*/
+				AND (
+						SELECT count(*)
+						FROM ve_edu_chasi a
+						WHERE 1=1
+							AND EDU_APLCT_ORD = #eduAplctOrd#
+							AND edu_hope_dt>=to_char(sysdate, 'YYYY.MM.DD')			
+					)>0				
+				
+			</isNotEmpty>
+			<isNotEmpty property="sbmtId">
+				AND SBMT_ID = #sbmtId#
+			</isNotEmpty>
+
+
+					
 	</select>
 		
 	<update id="VEEduAplctDAO.updateSbmtAtchFileId" parameterClass="VEEduAplctVO">

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

@@ -678,6 +678,7 @@
 				data: {
 					"eduAplctOrd" : varEduAplctOrd ,
 					"asgnmAprvlCd"	:	"30",
+					"lctrDivCd" : "10"
 					//"instrDiv" : "10" ,
 					
 				},