diff --git a/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java index 178e4609..1dc50ef8 100644 --- a/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java +++ b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java @@ -334,6 +334,10 @@ public class FndtnEnhanceTrnController { model.addAttribute("list", vEPrcsDetailVOList); { + + vEPrcsDetailVO.setFirstIndex(0); + vEPrcsDetailVO.setRecordCountPerPage(10); + vEPrcsDetailVOList = vEPrcsAplctPrdService.selectPagingList4Fndth(vEPrcsDetailVO); // 이달의 과정 LIST // 날짜 형식 설정 DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy.MM.dd"); diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduMIXService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduMIXService.java index 34e15253..1d39dfd4 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduMIXService.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduMIXService.java @@ -101,4 +101,6 @@ public interface VEEduMIXService { List selectExprnEndPagingList(VEEduAplctVO paramVO) throws Exception; List selectEduCmpltCrtfcNmbrList(VEEduAplctVO vEEduAplctVO) throws Exception; + + List selectCndtnList(VEEduAplctVO paramVO); } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXDAO.java index ea597c3a..a8aef157 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXDAO.java @@ -250,5 +250,9 @@ public class VEEduMIXDAO extends EgovAbstractDAO { public List selectEduCmpltCrtfcNmbrList(VEEduAplctVO vEEduAplctVO) { return (List) list("VEEduMIXDAO.selectEduCmpltCrtfcNmbrList", vEEduAplctVO); } + + public List selectCndtnList(VEEduAplctVO paramVO) { + return (List) list("VEEduMIXDAO.selectCndtnList", paramVO); + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXServiceImpl.java index bcafdf66..315d109c 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXServiceImpl.java @@ -221,5 +221,10 @@ public class VEEduMIXServiceImpl implements VEEduMIXService { @Override public List selectEduCmpltCrtfcNmbrList(VEEduAplctVO vEEduAplctVO) throws Exception { return vEEduMIXDAO.selectEduCmpltCrtfcNmbrList(vEEduAplctVO); + } + + @Override + public List selectCndtnList(VEEduAplctVO paramVO) { + return vEEduMIXDAO.selectCndtnList(paramVO); } } diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java index e2c117a3..aa1a14f5 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java @@ -671,7 +671,8 @@ public class CndtnPrcsInfoMngController { - List vEPrcsDetailVOList = vEEduMIXService.selectList(paramVO); +// List vEPrcsDetailVOList = vEEduMIXService.selectList(paramVO); + List vEPrcsDetailVOList = vEEduMIXService.selectCndtnList(paramVO); vEPrcsDetailVOList = egovCryptoUtil.decryptVeEduAplctList(vEPrcsDetailVOList); 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 2f4a8af0..a0fd1ecf 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 @@ -147,7 +147,68 @@ a.EDU_APLCT_ORD = vadi.EDU_APLCT_ORD /* AND vpap.PRCS_APLCT_PRD_ORD = vadi.PRCS_APLCT_PRD_ORD */ JOIN LETTNGNRLMBER le ON - a.USER_ID = le.MBER_ID + a.USER_ID = le.ESNTL_ID + WHERE + 1=1 + + AND a.prcs_ord=#prcsOrd# + + + AND a.sbmt_yn=#sbmtYn# + + + + AND a.aprvl_cd = #searchSelStatus# + + + + $searchQuery$ + + + + AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') = ]]> REPLACE(#searchSmbtStartDt#, '.' , '') + + + + AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') REPLACE(#searchSmbtEndDt#, '.' , '') + + + AND a.use_yn = 'Y' + AND a.aprvl_cd != '40' /* 취소된 내역 안 보여줌 */ + + + + " />