From 76177be78c51308737d7715c65d688d0dc2388a2 Mon Sep 17 00:00:00 2001 From: myname Date: Mon, 22 Jan 2024 12:01:18 +0900 Subject: [PATCH] =?UTF-8?q?2024-01-22=2012:00=20=EA=B4=80=EB=A6=AC?= =?UTF-8?q?=EC=9E=90=20=EC=84=B1=EC=9D=B8=EA=B2=B0=EA=B3=BC=EB=B3=B4?= =?UTF-8?q?=EA=B3=A0=EC=84=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adultVisitEdu/eduEnd/web/EduEndAdultController.java | 5 +++-- .../instr/tngrVisitEdu/eduInfo/service/VEEduChasiVO.java | 8 ++++++++ .../egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml | 3 +++ .../jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndList.jsp | 4 ++-- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/main/java/kcc/ve/aplct/adultVisitEdu/eduEnd/web/EduEndAdultController.java b/src/main/java/kcc/ve/aplct/adultVisitEdu/eduEnd/web/EduEndAdultController.java index b16ebf4f..446b0eb8 100644 --- a/src/main/java/kcc/ve/aplct/adultVisitEdu/eduEnd/web/EduEndAdultController.java +++ b/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); + //2. pageing step2 + vEEduChasiVO = this.setPagingStep2(vEEduChasiVO, paginationInfo); List vEEduChasiVOList = vEEduMIXService.selectChasiList(vEEduChasiVO); + //3.pageing step3 paginationInfo = this.setPagingStep3(vEEduChasiVOList, paginationInfo); diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduChasiVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduChasiVO.java index e705ce90..dc1a53a1 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduChasiVO.java +++ b/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; + } } diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml index a12c4928..2585076b 100644 --- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml +++ b/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 diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndList.jsp index b0f470ec..ca20b61a 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndList.jsp @@ -164,9 +164,9 @@ - ', '');"> + ', '');"> - + 제출