2024-01-22 12:00 관리자 성인결과보고서 수정

src/main/java/kcc/ve/aplct/adultVisitEdu/eduEnd/web/EduEndAdultController.java

@@ -214,11 +214,12 @@ public class EduEndAdultController {
 		//1.pageing step1
     	PaginationInfo paginationInfo = this.setPagingStep1(vEEduChasiVO);
     	
+    	
     	//2. pageing step2
     	vEEduChasiVO = this.setPagingStep2(vEEduChasiVO, paginationInfo);    	
-    	
     	List<VEEduChasiVO> vEEduChasiVOList = vEEduMIXService.selectChasiList(vEEduChasiVO);
     	
+    	
     	//3.pageing step3
     	paginationInfo = this.setPagingStep3(vEEduChasiVOList, paginationInfo);
     	

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

@@ -139,6 +139,8 @@ public class VEEduChasiVO extends ComDefaultVO implements Serializable {
 	private String	eduTrgt;				//대상
 	private String	eduAprvlCd;				//교육 신청상태
 	
+	private String veaRsltRprtOrd;			//결과보고제출순번
+	
 	
 	public String getQustnrQesitmId10Cnt() {
 		return qustnrQesitmId10Cnt;
@@ -730,5 +732,11 @@ public class VEEduChasiVO extends ComDefaultVO implements Serializable {
 	public void setEduAprvlCd(String eduAprvlCd) {
 		this.eduAprvlCd = eduAprvlCd;
 	}
+	public String getVeaRsltRprtOrd() {
+		return veaRsltRprtOrd;
+	}
+	public void setVeaRsltRprtOrd(String veaRsltRprtOrd) {
+		this.veaRsltRprtOrd = veaRsltRprtOrd;
+	}
 	
 }

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

@@ -4052,8 +4052,11 @@
 		, H.oneway_dstnc                              AS onewayDstnc
 		, A.rslt_atch_file_id                         AS rsltAtchFileId
 		, A.edu_trgt                                  AS eduTrgt
+		, o.vea_rslt_rprt_ord 						  AS veaRsltRprtOrd
 	FROM
 		VE_EDU_APLCT A
+		LEFT OUTER JOIN vea_rslt_rprt o ON
+			(a.edu_aplct_ord = o.edu_aplct_ord)		
 		, VE_EDU_CHASI B
 				
             LEFT OUTER JOIN ve_edu_chasi_instr_asgnm D0

src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndList.jsp

@@ -166,7 +166,7 @@
 								<td>
 									<a href="javascript:goDetail('<c:out value="${list.eduAplctOrd}"/>', '<c:out value="${list.eduChasiOrd}"/>');">																		
 										<c:choose>
-											<c:when test="${not empty list.rsltAtchFileId}">
+											<c:when test="${not empty list.veaRsltRprtOrd}">
 												제출
 											</c:when>
 											<c:otherwise>