2023-11-15 18:28 성인 강사 배정 수정

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

@@ -9,6 +9,8 @@ public interface VEEduAplctService {
 	
 	//R
 	VEEduAplctVO selectDetail(VEEduAplctVO paramVO) throws Exception;
+	
+	VEEduAplctVO selectDetailChasi(VEEduAplctVO paramVO) throws Exception;
 
 	VEEduAplctVO selectOprtnDetail(VEEduAplctVO paramVO) throws Exception;
 

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

@@ -30,6 +30,10 @@ public class VEEduAplctDAO extends EgovAbstractDAO {
 		return (VEEduAplctVO) select("VEEduAplctDAO.selectDetail", paramVO);
 	}
 
+	public VEEduAplctVO selectDetailChasi(VEEduAplctVO paramVO) throws Exception {
+		return (VEEduAplctVO) select("VEEduAplctDAO.selectDetailChasi", paramVO);
+	}
+	
 	public VEEduAplctVO selectOprtnDetail(VEEduAplctVO paramVO) throws Exception {
 		return (VEEduAplctVO) select("VEEduAplctDAO.selectOprtnDetail", paramVO);
 	}

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

@@ -34,6 +34,11 @@ public class VEEduAplctServiceImpl implements VEEduAplctService {
 	public VEEduAplctVO selectDetail(VEEduAplctVO paramVO) throws Exception {
 		return vEEduAplctDAO.selectDetail(paramVO);
 	}
+	
+	public VEEduAplctVO selectDetailChasi(VEEduAplctVO paramVO) throws Exception {
+		return vEEduAplctDAO.selectDetailChasi(paramVO);
+	}
+	
 	//
 	public VEEduAplctVO selectOprtnDetail(VEEduAplctVO paramVO) throws Exception {
 		return vEEduAplctDAO.selectOprtnDetail(paramVO);

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

@@ -314,7 +314,7 @@ public class EduCnfrmMngAdultController {
 		//로그인 처리==================================== 
 		//0.step0
 		//해당 처시 정보 가져오기 (온라인 오프라인 여부 및 신청내용 확인)
-		vEEduAplctVO	=	vEEduAplctService.selectDetail(vEEduAplctVO);
+		vEEduAplctVO	=	vEEduAplctService.selectDetailChasi(vEEduAplctVO);
 		System.out.println(vEEduAplctVO.getEduSlctCd());	//10-온라인, 20-오프라인
 		System.out.println(vEEduAplctVO.getAplctCn());		//신청내용		
 		System.out.println(vEInstrAsgnmVO.getInstrNm());		//검색강사
@@ -356,6 +356,7 @@ public class EduCnfrmMngAdultController {
 
 		}
 		
+		vEInstrAsgnmVO.setYr(vEEduAplctVO.getEduHopeDt().substring(0,4));
 		vEInstrAsgnmVO.setSearchQuery(s_searchQuery);
 		List<VEInstrAsgnmVO> selectVEInstrAsgnmVOList = vEAsgnmMIX2023Service.selectInstrAsgnmList_202311_adult(vEInstrAsgnmVO);
 		

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

@@ -797,8 +797,9 @@
                        b.addr ,
                        b.addr_detail 			AS	addrDetail,
                        b.div_cd 				AS	divCd,			/*성인강사 내부구분 VE0018*/
-                       b.instr_div				AS	instrDiv		/*	20-성인, 10-청소년	*/
+                       b.instr_div				AS	instrDiv,		/*	20-성인, 10-청소년	*/
-                       , b.hope_edu_fld			AS	prfrnFldCd		/*	희망교육분야	 VEA010*/
+                       b.hope_edu_fld			AS	prfrnFldCd,		/*	희망교육분야	 VEA010*/
+                       NVL(dd.instrSumChasi,0)	AS	instrSumChasi	/*	성인강사가 할당받은 해당교육의 년도 총차시	*/
                FROM    ve_instr a ,
                        ve_instr_detail b
                        LEFT OUTER JOIN ve_lctr_stng c
@@ -809,17 +810,50 @@
                                AND     c.use_yn   ='Y'
                                        /* 사용중인강의설정 */
                                )
+		                               
+		               LEFT OUTER JOIN (
+		               
+		                          /* 강사에게 교육이 할당(확정, 반려, 요청전, 요첮우 모두 포함)된 차시수 */
+		                          SELECT   d.user_id,
+		                                   SUM(NVL(b.chasi, 0)) AS instrSumChasi
+									
+		                          FROM     ve_edu_aplct a ,
+		                                   ve_edu_chasi b
+		                                   LEFT OUTER JOIN ve_edu_chasi_instr_asgnm d
+		                                   ON       (
+		                                                     b.edu_aplct_ord=d.edu_aplct_ord
+		                                            AND      b.edu_chasi_ord=d.edu_chasi_ord
+		                                            )
+		                          WHERE    1                   =1
+		                          AND      a.edu_aplct_ord     =b.edu_aplct_ord
+		                          AND      NVL(A.USE_YN, 'Y') <![CDATA[ <> ]]> 'N'
+		                          AND      a.LCTR_DIV_CD       = '20'
+		                          AND      a.aprvl_cd          = '60'
+		                          AND      1                   =1
+		                          
+		                          AND      b.edu_hope_dt    LIKE #yr#
+		                                            ||'%'
+		                                            
+		                          GROUP BY d.user_id               
+		               
+		               )dd
+		               on(
+		               c.user_id=dd.user_id
+		               )                               
+                               
                WHERE   1         =1
-               AND     b.user_id =a.user_id
+	               AND     b.user_id =a.user_id
-               AND     b.use_yn  ='Y'
+	               AND     b.use_yn  ='Y'
-               AND     b.INSTR_DIV ='20'
+	               AND     b.INSTR_DIV ='20'
-                       /* 활동중인 강사 */
+	                       /* 활동중인 강사 */
-               AND
+	               AND
-                       (
+	                       (
-                               b.qlfct_end_yn='N' OR b.qlfct_end_yn IS NULL
+	                               b.qlfct_end_yn='N' OR b.qlfct_end_yn IS NULL
-                       )
+	                       )
-                       
+	                       
-               $searchQuery$
+	               $searchQuery$
+               
+               ORDER BY NVL(dd.instrSumChasi,0)
                	
 	</select>			
 </sqlMap>

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

@@ -384,6 +384,27 @@
 		   
 	</select>
 
+	<!-- 강사 정보 R -->
+	<select id="VEEduAplctDAO.selectDetailChasi" parameterClass="VEEduAplctVO" resultClass="VEEduAplctVO">
+		/*	VEEduAplctDAO.selectDetailChasi	*/
+		SELECT
+			<include refid="VEEduAplctDAO.select_column_name"/>
+			,NVL(B.ISLTN_YN,'N') AS isltnYn
+			,NVL(B.ISLTN2_YN,'N') AS isltn2Yn
+			,NVL(B.ISLTN3_YN,'N') AS isltn3Yn
+			,NVL(B.PPLTN_REDUC_AREA_YN,'N') AS ppltnReducAreaYn
+			, C.edu_hope_dt	AS	eduHopeDt
+			 
+		FROM  <include refid="VEEduAplctDAO.table_name"/> A
+			LEFT OUTER JOIN VE_SCHOL B
+			ON(A.STNDRD_SCHOL_CD=B.STNDRD_SCHOL_CD)
+			, VE_EDU_CHASI C
+		WHERE A.EDU_APLCT_ORD = #eduAplctOrd#
+			AND	C.EDU_APLCT_ORD = A.EDU_APLCT_ORD
+			AND	C.EDU_CHASI_ORD = #eduChasiOrd# 			
+		   
+	</select>
+	
 	<!-- 강사 정보 R -->
 	<select id="VEEduAplctDAO.selectOprtnDetail" parameterClass="VEEduAplctVO" resultClass="VEEduAplctVO">
 		/*	VEEduAplctDAO.selectOprtnDetail	*/