2024-03-06 16:16 추가강의요청 상세 내용 수정

src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java

@@ -478,58 +478,63 @@ public class FndtnEnhanceTrnController {
 				, HttpServletRequest request ) throws Exception {
 			
 
-			
-		    // 확인 체크
-		    if(StringUtils.isNotEmpty(vEPrcsDetailVO.getCmmNotifyOrd()))
-		    {
-		        notifyManageService.updateNotifyChkWhereCmmNotifyOrd(vEPrcsDetailVO.getCmmNotifyOrd());
-		    }
+			try {
+			    // 확인 체크
+			    if(StringUtils.isNotEmpty(vEPrcsDetailVO.getCmmNotifyOrd()))
+			    {
+			        notifyManageService.updateNotifyChkWhereCmmNotifyOrd(vEPrcsDetailVO.getCmmNotifyOrd());
+			    }
 
-			
-			
-			
-			//로그인 처리==================================== 
-			LoginVO loginVO = checkLoginUtil.getAuthLoginVO();				//권한에 따른 로그인 정보 가져오기
-			SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request);	//SSO 로그인 정보 가져오기
-			
-			/*
-			if (loginVO == null || ssoLoginVO == null) {
-				//이전 url 처리(beforeSiteUrl)_이준호_220228추가
-				return checkLoginUtil.getUserLoginPage(model, request);	//로그인 정보가 없으면 로그인 페이지로 이동한다.
-			}
-			*/	
-						
-			//1.pageing step1
-	        //과정 조회
-	        VEPrcsDetailVO vEPrcsDetailVODetail = vEPrcsAplctPrdService.selectDetailNewOne4Fndth(vEPrcsDetailVO);
-	        VEEduAplctVO vEEduAplctReqVO = new VEEduAplctVO();
-	        
-	        try {
-	        	vEEduAplctReqVO.setUserId(loginVO.getUniqId());	
-	        	model.addAttribute("userSe", "Y");
-	        }catch(Exception ex) {
-	        	model.addAttribute("userSe", "N");
-	        	ex.printStackTrace();
-	        }	        
-			
-			vEEduAplctReqVO.setLctrDivCd(vEPrcsDetailVODetail.getLctrDivCd());
-			vEEduAplctReqVO.setPrcsAplctPrdOrd(vEPrcsDetailVODetail.getPrcsAplctPrdOrd());
-			vEEduAplctReqVO.setLctrDivCd(VeConstants.LCTR_DIV_CD_50);
-			VEEduAplctVO vEEduAplctVO = fndtnEnhanceTrnService.findByAprvlCd(vEEduAplctReqVO);
-				// VO를 먼저 null 체크 후 진행해야 에러안남
-				// vEEduAplctVO != null && 
-			if(vEEduAplctVO != null && StringUtils.isNotEmpty(vEEduAplctVO.getAprvlCd())) {
-				vEPrcsDetailVODetail.setAprvlCd(vEEduAplctVO.getAprvlCd());
-			}
+				
+				
+				
+				//로그인 처리==================================== 
+				LoginVO loginVO = checkLoginUtil.getAuthLoginVO();				//권한에 따른 로그인 정보 가져오기
+				SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request);	//SSO 로그인 정보 가져오기
+				
+				/*
+				if (loginVO == null || ssoLoginVO == null) {
+					//이전 url 처리(beforeSiteUrl)_이준호_220228추가
+					return checkLoginUtil.getUserLoginPage(model, request);	//로그인 정보가 없으면 로그인 페이지로 이동한다.
+				}
+				*/	
+							
+				//1.pageing step1
+		        //과정 조회
+		        VEPrcsDetailVO vEPrcsDetailVODetail = vEPrcsAplctPrdService.selectDetailNewOne4Fndth(vEPrcsDetailVO);
+		        VEEduAplctVO vEEduAplctReqVO = new VEEduAplctVO();
+		        
+		        try {
+		        	vEEduAplctReqVO.setUserId(loginVO.getUniqId());	
+		        	model.addAttribute("userSe", "Y");
+		        }catch(Exception ex) {
+		        	model.addAttribute("userSe", "N");
+		        	ex.printStackTrace();
+		        }	        
+				
+				vEEduAplctReqVO.setLctrDivCd(vEPrcsDetailVODetail.getLctrDivCd());
+				vEEduAplctReqVO.setPrcsAplctPrdOrd(vEPrcsDetailVODetail.getPrcsAplctPrdOrd());
+				vEEduAplctReqVO.setLctrDivCd(VeConstants.LCTR_DIV_CD_50);
+				VEEduAplctVO vEEduAplctVO = fndtnEnhanceTrnService.findByAprvlCd(vEEduAplctReqVO);
+					// VO를 먼저 null 체크 후 진행해야 에러안남
+					// vEEduAplctVO != null && 
+				if(vEEduAplctVO != null && StringUtils.isNotEmpty(vEEduAplctVO.getAprvlCd())) {
+					vEPrcsDetailVODetail.setAprvlCd(vEEduAplctVO.getAprvlCd());
+				}
+
+		        VEPrcsDetailVO vEPrcsEtcDetail = vEPrcsAplctPrdService.selectEtc(vEPrcsDetailVODetail.getPrcsAplctPrdOrd());
+		        if(vEPrcsEtcDetail != null)
+		        {
+		        	vEPrcsDetailVODetail.setPrpsCn(vEPrcsEtcDetail.getPrpsCn());               
+		        	vEPrcsDetailVODetail.setChrctCn(vEPrcsEtcDetail.getChrctCn());  
+		        	vEPrcsDetailVODetail.setPrcsAplctPrdEtcOrd(vEPrcsEtcDetail.getPrcsAplctPrdEtcOrd());
+		        }
+				model.addAttribute("info", vEPrcsDetailVODetail);				
+			}catch(Exception ex) {
+				ex.printStackTrace();
+			}
+			
 
-	        VEPrcsDetailVO vEPrcsEtcDetail = vEPrcsAplctPrdService.selectEtc(vEPrcsDetailVODetail.getPrcsAplctPrdOrd());
-	        if(vEPrcsEtcDetail != null)
-	        {
-	        	vEPrcsDetailVODetail.setPrpsCn(vEPrcsEtcDetail.getPrpsCn());               
-	        	vEPrcsDetailVODetail.setChrctCn(vEPrcsEtcDetail.getChrctCn());  
-	        	vEPrcsDetailVODetail.setPrcsAplctPrdEtcOrd(vEPrcsEtcDetail.getPrcsAplctPrdEtcOrd());
-	        }
-			model.addAttribute("info", vEPrcsDetailVODetail);
 			
 			
 			return "/web/ve/aplct/fndtnEnhanceTrn/eduAplctDetail";

src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEInstrAsgnmVO.java

@@ -19,6 +19,7 @@ public class VEInstrAsgnmVO extends ComDefaultVO implements Serializable {
 	private String	eduChasiOrd;	//교육차시순번
 		
 	private String	userId;			//사용자아이디
+	private String	euserId;		//사용자아이디(강의요청자 ID)
 	private String	userNm;			//사용자명(강사)
 	private String	pnltyCd;		//패널티코드
 	private String	pnltyPnttm;		//패널티일시
@@ -866,5 +867,11 @@ public class VEInstrAsgnmVO extends ComDefaultVO implements Serializable {
 	public void setFoodExpenses(String foodExpenses) {
 		this.foodExpenses = foodExpenses;
 	}
+	public String getEuserId() {
+		return euserId;
+	}
+	public void setEuserId(String euserId) {
+		this.euserId = euserId;
+	}
 	
 }

src/main/resources/egovframework/sqlmap/let/cmm/fms/EgovFile_SQL_Tibero.xml

@@ -42,6 +42,10 @@
 			SELECT 
 				a.ATCH_FILE_ID, b.FILE_CN, b.FILE_SN, b.FILE_STRE_COURS, b.STRE_FILE_NM,
 				b.FILE_EXTSN, b.ORIGNL_FILE_NM, b.FILE_SIZE, TO_CHAR(a.CREAT_DT, 'YYYY-MM-DD HH24:MI:SS' ) AS CREAT_DT
+				
+				, ''	AS scholInsttNm
+				, ''	AS chrgNm				
+				
 			FROM
 				LETTNFILE a, LETTNFILEDETAIL b
 			WHERE 1=1
@@ -60,6 +64,10 @@
 		SELECT 
 			a.ATCH_FILE_ID, b.FILE_CN, b.FILE_SN, b.FILE_STRE_COURS, b.STRE_FILE_NM,
 			b.FILE_EXTSN, b.ORIGNL_FILE_NM, b.FILE_SIZE, TO_CHAR(a.CREAT_DT, 'YYYY-MM-DD HH24:MI:SS' ) AS CREAT_DT
+			
+				, ''	AS scholInsttNm
+				, ''	AS chrgNm			
+			
 		FROM
 			LETTNFILE a, LETTNFILEDETAIL b
 		WHERE
@@ -219,7 +227,11 @@
  		<![CDATA[
 			SELECT 
 				a.ATCH_FILE_ID, b.FILE_CN, b.FILE_SN, b.FILE_STRE_COURS, b.STRE_FILE_NM,
-				b.FILE_EXTSN, b.ORIGNL_FILE_NM, b.FILE_SIZE, TO_CHAR(a.CREAT_DT, 'YYYY-MM-DD HH24:MI:SS' ) AS CREAT_DT 
+				b.FILE_EXTSN, b.ORIGNL_FILE_NM, b.FILE_SIZE, TO_CHAR(a.CREAT_DT, 'YYYY-MM-DD HH24:MI:SS' ) AS CREAT_DT
+				
+				, ''	AS scholInsttNm
+				, ''	AS chrgNm			
+			 
 			FROM
 				LETTNFILE a, LETTNFILEDETAIL b
 			WHERE
@@ -268,6 +280,10 @@
 			SELECT 
 				a.ATCH_FILE_ID, b.FILE_CN, b.FILE_SN, b.FILE_STRE_COURS, b.STRE_FILE_NM,
 				b.FILE_EXTSN, b.ORIGNL_FILE_NM, b.FILE_SIZE, a.CREAT_DT
+				
+				, ''	AS scholInsttNm
+				, ''	AS chrgNm				
+				
 			FROM
 				LETTNFILE a, LETTNFILEDETAIL b
 			WHERE
@@ -324,6 +340,10 @@
 		SELECT 
 			a.ATCH_FILE_ID, b.FILE_CN, b.FILE_SN, b.FILE_STRE_COURS, b.STRE_FILE_NM,
 			b.FILE_EXTSN, b.ORIGNL_FILE_NM, b.FILE_SIZE, TO_CHAR(a.CREAT_DT, 'YYYY-MM-DD HH24:MI:SS' ) AS CREAT_DT
+			
+				, ''	AS scholInsttNm
+				, ''	AS chrgNm			
+			
 		FROM
 			LETTNFILE a, LETTNFILEDETAIL b
 		WHERE

src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml

@@ -875,6 +875,7 @@
 			, a.trgt				AS trgt
 			, a.prsnl				AS prsnl
 			, b.user_id				AS userId
+			, e.user_id				AS euserId
 			, b.schol_instt_nm		AS scholInsttNm
 			, b.edu_slct_cd			AS eduSlctCd
 			, b.edu_slct_area_cd	AS eduSlctAreaCd
@@ -905,11 +906,13 @@
 				ON c.prcs_ord = b.edu_cn
 			LEFT OUTER JOIN ve_edu_chasi_instr_asgnm d
 				ON (a.edu_aplct_ord = d.edu_aplct_ord
-					AND a.edu_chasi_ord = d.edu_chasi_ord)		
+					AND a.edu_chasi_ord = d.edu_chasi_ord)
+					/*강의신청한 정보가 있는지?*/		
 			LEFT OUTER JOIN ve_edu_chasi_instr_asgnm_hstry e
 				ON	(a.edu_aplct_ord = e.edu_aplct_ord
 					AND a.edu_chasi_ord = e.edu_chasi_ord
 				  	AND e.user_id = #userId#
+				  	AND e.hstry_cd='50'		
 					)
 			WHERE  a.edu_aplct_ord        = #eduAplctOrd#
 			AND    a.edu_chasi_ord        = #eduChasiOrd#

src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmAddRqstDetail.jsp

@@ -130,7 +130,8 @@
 						<th scope="row">
 							<p>교육일시</p>
 						</th>
-						<td>${fn:substring(info.eduHopeDt,0,4)}년 ${fn:substring(info.eduHopeDt,4,6)}월 ${fn:substring(info.eduHopeDt,6,8)}일</td>
+<%-- 						<td>${fn:substring(info.eduHopeDt,0,4)}년 ${fn:substring(info.eduHopeDt,4,6)}월 ${fn:substring(info.eduHopeDt,6,8)}일</td> --%>
+						<td>${info.eduHopeDt}</td>
 						<th scope="row">
 							<p>차시</p>
 						</th>
@@ -143,8 +144,8 @@
 					<tr class="trLength2">
 						<th scope="row">
 							<p>교육일시</p>
-						</th>
-						<td colspan="3">${fn:substring(info.eduHopeDt,0,4)}년 ${fn:substring(info.eduHopeDt,4,6)}월 ${fn:substring(info.eduHopeDt,6,8)}일</td>
+						</th>						
+						<td colspan="3">${info.eduHopeDt}</td>
 					</tr>
 					<tr class="trLength2">
 						<th scope="row">
@@ -184,18 +185,19 @@
 						</th>
 						<td colspan="3">${info.addr}</td>
 					</tr>
-                          <tr>
+                    <tr>
 						<th scope="row">
-							<p>교육내용</p>
+							<p>교육장소</p>
 						</th>
-						<td colspan="3">
-							<c:forEach var="eduList" items="${eduList}" varStatus="status">
-								<c:if test="${fn:contains(info.eduCn, eduList.prcsOrd)}">
-									- ${eduList.prcsNm} <br/>
-								</c:if>
-							</c:forEach>
+						<td colspan="3">							
+							<c:if test="${info.eduPlaceCd eq '99'}">
+								${info.eduPlace}
+							</c:if>
+							<c:if test="${info.eduPlaceCd ne '99'}">
+								<ve:code codeId="VEA010" code="${info.eduPlaceCd}"/>
+							</c:if>							
 						</td>
-					</tr>
+					</tr>	
                     <tr class="trLength4">
 						<th scope="row">
 							<p>교육대상</p>
@@ -252,12 +254,6 @@
 						</th>
 						<td colspan="3">${info.email}</td>
 					</tr>
-                          <tr>
-						<th scope="row">
-							<p>신청마감일</p>
-						</th>
-						<td colspan="3">-</td>
-					</tr>
 				</tbody>
 			</table>
 		</div>
@@ -270,7 +266,9 @@
                   </div>
                   <div class="btn_center">
                   	<c:if test="${info.asgnmAprvlCd eq '50' and (empty info.hstryCd or info.hstryCd eq '10')}">
-                      <button type="button" class="btnType04 m_btn_block" onclick="fncRqst(); return false;">강의신청</button>
+                  		<c:if test="${info.euserId eq null}">
+                  			<button type="button" class="btnType04 m_btn_block" onclick="fncRqst(); return false;">강의신청</button>
+                  		</c:if>                      	
                   	</c:if>
                   </div>
                   <div class="btn_right">