2023-12-05 18:06 성인 찾교 강사 선택 수정

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

@@ -157,6 +157,9 @@ public class VEInstrAsgnmVO extends ComDefaultVO implements Serializable {
 	
 	private String feeSum4Dp;		//화면에 표시되는 fee 계산용
 	
+	private String avgScore;		//평균점수
+	
+	
 	
 	public String getMemoCn() {
 		return memoCn;
@@ -782,5 +785,11 @@ public class VEInstrAsgnmVO extends ComDefaultVO implements Serializable {
 	public void setFeeSum4Dp(String feeSum4Dp) {
 		this.feeSum4Dp = feeSum4Dp;
 	}
+	public String getAvgScore() {
+		return avgScore;
+	}
+	public void setAvgScore(String avgScore) {
+		this.avgScore = avgScore;
+	}
 	
 }

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

@@ -800,8 +800,104 @@
                        b.instr_div				AS	instrDiv,		/*	20-성인, 10-청소년	*/
                        b.hope_edu_fld			AS	prfrnFldCd,		/*	희망교육분야	 VEA010*/
                        NVL(dd.instrSumChasi,0)	AS	instrSumChasi	/*	성인강사가 할당받은 해당교육의 년도 총차시	*/
-               FROM    ve_instr a ,
+                       , b.memo					AS	memoCn
-                       ve_instr_detail b
+                       , ee.cnt
+                       , ROUND(ff.avgScore,1)	AS	avgScore
+               FROM    ve_instr a
+ 
+		               
+		               LEFT OUTER JOIN(
+		               
+										/*	강사의 당해년도 교육횟수	*/
+										SELECT aa.user_id
+											, sum(cnt) AS cnt
+										FROM (
+												SELECT a.user_id, count(*) cnt
+												FROM ve_edu_chasi_instr_asgnm a
+												WHERE a.ASGNM_APRVL_CD ='30'
+													AND to_char(a.ASGNM_APRVL_PNTTM ,'YYYY')=TO_CHAR(sysdate, 'YYYY')
+												GROUP BY a.user_id	
+												
+												UNION all
+												
+												SELECT a.user_id, count(*) cnt
+												FROM vea_prcs_aplct_prd_instr_asgnm a
+												WHERE a.ASGNM_APRVL_CD ='30'
+													AND to_char(a.ASGNM_APRVL_PNTTM ,'YYYY')=TO_CHAR(sysdate, 'YYYY')
+												GROUP BY a.user_id	
+											)aa
+										GROUP BY aa.user_id			               
+		               
+		               ) ee             
+		               on(
+		               a.user_id=ee.user_id
+		               )          
+		               
+		               LEFT OUTER JOIN (
+		               
+										/*	당해년도 평균만족도	*/
+										SELECT aaa.userId
+											, sum(aaa.sumScore)
+											, sum(aaa.sumCnt)
+											, sum(aaa.sumScore)
+											/ sum(aaa.sumCnt)	AS avgScore
+										FROM (
+												SELECT 
+													aa.edu_aplct_ord
+													, aa.edu_chasi_ord
+													, aa.sumScore/aa.sumCnt
+													, aa.sumScore
+													, aa.sumCnt
+													, NVL(bb.USER_ID, cc.user_id) userId
+												FROM (
+														SELECT 
+																a.EDU_APLCT_ORD, a.EDU_CHASI_ORD 
+																, (SUM(NVL(a.VERY_SATISFIED,0)*100)
+																+ SUM(NVL(a.SATISFIED,0)*80)
+																+ SUM(NVL(a.NEITHER,0)*60)
+																+ SUM(NVL(a.DISSATISFIED ,0)*40)
+																+ SUM(NVL(a.VERY_DISSATISFIED ,0)*20))	AS sumScore
+																,
+																(SUM(NVL(a.VERY_SATISFIED,0))
+																+ SUM(NVL(a.SATISFIED,0))
+																+ SUM(NVL(a.NEITHER,0))
+																+ SUM(NVL(a.DISSATISFIED ,0))
+																+ SUM(NVL(a.VERY_DISSATISFIED ,0))) AS sumCnt
+																
+														FROM LETTNQESTNRRSLTDETAIL a
+														GROUP BY a.EDU_APLCT_ORD, a.EDU_CHASI_ORD 
+													)aa
+													
+													LEFT OUTER JOIN ve_edu_chasi_instr_asgnm BB 
+													on(
+														aa.edu_aplct_ord=bb.EDU_APLCT_ORD
+														AND aa.edu_chasi_ord=bb.EDU_CHASI_ORD 
+														AND bb.ASGNM_APRVL_CD ='30'	
+													)
+												
+													LEFT OUTER JOIN (
+													
+																	SELECT a.EDU_APLCT_ORD 
+																		, b.USER_ID 
+																	FROM ve_edu_aplct a
+																		, vea_prcs_aplct_prd_instr_asgnm b
+																	WHERE a.PRCS_ORD =b.PRCS_APLCT_PRD_ORD 
+																		AND b.ASGNM_APRVL_CD ='30'
+													
+													) CC 
+													on(
+														aa.edu_aplct_ord=cc.edu_aplct_ORD 	
+													)
+												WHERE aa.sumCnt>0	
+													AND NVL(bb.USER_ID, cc.user_id) IS NOT NULL
+												)aaa
+										GROUP BY aaa.userId				               
+		               
+		               )ff        
+		               on(
+		               a.user_id=ff.userId
+		               )          		  
+		               ,ve_instr_detail b
                        LEFT OUTER JOIN ve_lctr_stng c
                        ON     (
                                        1          =1
@@ -839,8 +935,8 @@
 		               )dd
 		               on(
 		               c.user_id=dd.user_id
-		               )                               
+		               )  
-                               
+		                           
                WHERE   1         =1
 	               AND     b.user_id =a.user_id
 	               AND     b.use_yn  ='Y'

src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/popup/instrAsgnmPopup.jsp

@@ -157,6 +157,8 @@
 						<col style="width: 15%;">
 						<%-- <col style="width: 9%;"> --%>
 						<col style="width: 9%;">
+						<col style="width: 9%;">
+						<col style="width: 9%;">
 					</colgroup>
 					<thead>
 						<tr>
@@ -165,14 +167,17 @@
 <!-- 							<th scope="col">이동<br>거리</th> -->
 							<th scope="col">선호분야</th>
 <!-- 							<th scope="col">온라인</th> -->
-							<th scope="col">구분</th>
+							<th scope="col">당해교육횟수</th>
+							<th scope="col">평균만족도</th>
+							<th scope="col">비고</th>
 							<!-- <th scope="col">Penalty 횟수</th> -->
 							<th scope="col">선택</th>
 						</tr>
 					</thead>
 					<tbody>
 					<c:forEach var="list" items="${list}" varStatus="status">
-						<tr>				
+						<tr>		
+	
 							<td><c:out value='${list.instrNm}'/></td>
 							<td><c:out value='${list.rsdne}'/></td>
 <%-- 							<td><c:out value='${list.onewayDstnc}'/>Km</td> --%>
@@ -185,8 +190,11 @@
 									<ve:code codeId="VEA006" code="${aplctCn}"/>&nbsp;&nbsp;
 								</c:forEach>							
 							</td>
+							<td><c:out value='${list.cnt}'/></td>
+							<td><c:out value='${list.avgScore}'/></td>
+							<td><c:out value='${list.memoCn}'/></td>
 <%-- 							<td><c:out value='${list.onlnPsblYn}'/></td> --%>
-							<td><ve:code codeId="VE0018" code="${list.divCd}"/></td>
+<%-- 							<td><ve:code codeId="VE0018" code="${list.divCd}"/></td> --%>
 							<%-- <td>
 								<c:set var="pnltyCds" value="0" />
 								<c:forEach var="plist" items="${pnltyList}" varStatus="pStatus">