feat: pms - #3222 -강사별 숙박신청 기능 개선 종료

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

@@ -13,6 +13,8 @@ public interface VEAcmdtAplctService {
 	//R : 
 	VEInstrFeeAcmdtVO selectDetailByUser(VEInstrFeeAcmdtVO paramVO) throws Exception;	
 	
+	VEInstrFeeAcmdtVO selectDetailByUser_r2(VEInstrFeeAcmdtVO paramVO) throws Exception;	
+	
 	VEInstrFeeAcmdtVO selectDcmdtAplctYesterday(VEInstrFeeAcmdtVO paramVO) throws Exception;
 	
 	

src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAcmdtAplctDAO.java

@@ -39,6 +39,10 @@ public class VEAcmdtAplctDAO extends EgovAbstractDAO {
 		return (VEInstrFeeAcmdtVO) select("VEAcmdtAplctDAO.selectDetailByUser", paramVO);
 	}
 	
+	public VEInstrFeeAcmdtVO selectDetailByUser_r2(VEInstrFeeAcmdtVO paramVO) throws Exception {
+		return (VEInstrFeeAcmdtVO) select("VEAcmdtAplctDAO.selectDetailByUser_r2", paramVO);
+	}
+	
 	public VEInstrFeeAcmdtVO selectDcmdtAplctYesterday(VEInstrFeeAcmdtVO paramVO) throws Exception {
 		return (VEInstrFeeAcmdtVO) select("VEAcmdtAplctDAO.selectDcmdtAplctYesterday", paramVO);
 	}

src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAcmdtAplctServiceImpl.java

@@ -37,6 +37,11 @@ public class VEAcmdtAplctServiceImpl implements VEAcmdtAplctService {
 		return vEAcmdtAplctDAO.selectDetailByUser(paramVO);
 	}	
 	
+	//R
+	public VEInstrFeeAcmdtVO selectDetailByUser_r2(VEInstrFeeAcmdtVO paramVO) throws Exception {
+		return vEAcmdtAplctDAO.selectDetailByUser_r2(paramVO);
+	}	
+	
 	@Override
 	public VEInstrFeeAcmdtVO selectDcmdtAplctYesterday(VEInstrFeeAcmdtVO paramVO) throws Exception {
 		return vEAcmdtAplctDAO.selectDcmdtAplctYesterday(paramVO);

src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/web/VEAsgnmController.java

@@ -6,6 +6,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -14,6 +15,8 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
+import com.dreamsecurity.magicline.util.Log;
+
 import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo;
 import kcc.com.cmm.EgovMessageSource;
 import kcc.com.cmm.LoginVO;
@@ -449,10 +452,16 @@ public class VEAsgnmController {
 				acmdtAplct.setEduAplctOrd(vEInstrAsgnmVO.getEduAplctOrd());
 				acmdtAplct.setEduChasiOrd(vEInstrAsgnmVO.getEduChasiOrd());
 				acmdtAplct.setInstrDiv("10");
-				acmdtAplct = vEAcmdtAplctService.selectDetailByUser(acmdtAplct);
+				
+				//=== 20230627 이호영
+				//=== 숙박신청 차시 제거
+				//=== 교육 key로만 select해서 진행
+//				acmdtAplct = vEAcmdtAplctService.selectDetailByUser(acmdtAplct);
+				acmdtAplct = vEAcmdtAplctService.selectDetailByUser_r2(acmdtAplct);
 				
 				String acmdtAplctCheck = "N";
-				if(acmdtAplct.getAcmdtAplctOrd() != null) {
+//				if(StringUtils.isNotEmpty(acmdtAplct.getAcmdtAplctOrd())) {
+				if(acmdtAplct != null) {
 					acmdtAplctCheck="Y";
 				}
 				model.addAttribute("acmdtAplctCheck", acmdtAplctCheck);

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

@@ -159,6 +159,23 @@
 			</isNotEmpty>
 	</select>
 	
+	<!-- 강사 정보 R -->
+	<select id="VEAcmdtAplctDAO.selectDetailByUser_r2" parameterClass="VEInstrFeeAcmdtVO" resultClass="VEInstrFeeAcmdtVO">
+			select
+				  aprvl_cd  as aprvlCd 
+				, aplct_cn as aplctCn 
+				, acmdt_fee as acmdtFee
+				, acmdt_aplct_ord as AcmdtAplctOrd
+			from
+				ve_acmdt_aplct
+			where
+					edu_aplct_ord = #eduAplctOrd#
+				and aplct_cn is not null
+			limit 1
+			
+			
+	</select>
+	
 	<select id="VEAcmdtAplctDAO.selectDcmdtAplctYesterday" parameterClass="VEInstrFeeAcmdtVO" resultClass="VEInstrFeeAcmdtVO">
 		SELECT 
 			a.schol_instt_nm	AS scholInsttNm 

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

@@ -629,7 +629,8 @@
 				LEFT OUTER JOIN ve_acmdt_aplct 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 -->
+						and d.aplct_cn is not null
 						) 	  
 				LEFT OUTER JOIN ve_instr_fee e
 				ON (