From 05feee12ddd3d81db8f517dc08dd57d58ba00248 Mon Sep 17 00:00:00 2001 From: myname Date: Mon, 20 Oct 2025 16:33:23 +0900 Subject: [PATCH] =?UTF-8?q?2025-10-20=2016:33=20=EA=B5=90=EC=9C=A1?= =?UTF-8?q?=EC=8B=A0=EC=B2=AD=EC=9E=90=EC=97=90=20=EB=8C=80=ED=95=9C=20?= =?UTF-8?q?=EA=B8=B0=EC=A4=80=20=EC=A1=B0=EA=B1=B4=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java | 2 +- .../sqlmap/ve/edu/VEEdu_MIX_SQL_Postgresql.xml | 10 +++++++++- .../cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp | 3 ++- 3 files changed, 12 insertions(+), 3 deletions(-) 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 1fa4fd9e..9a5bfda3 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java @@ -1299,7 +1299,7 @@ public class CndtnPrcsInfoMngController { } - paramVO.setSiteId("60"); //설문정보를 위해서 설문지의 대상값을 넣는다. VE0011 10-청소년, 20-성인,30-체험, 40-외부, 50-기반, 60-기소 + paramVO.setSiteId(LCTR_DIV_CD); //설문정보를 위해서 설문지의 대상값을 넣는다. VE0011 10-청소년, 20-성인,30-체험, 40-외부, 50-기반, 60-기소 List vEPrcsDetailVOList = vEEduMIXService.selectTrgtList4Cmplt(paramVO); vEPrcsDetailVOList = egovCryptoUtil.decryptVeEduAplctList(vEPrcsDetailVOList); diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Postgresql.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Postgresql.xml index 748104eb..a464be86 100644 --- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Postgresql.xml +++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Postgresql.xml @@ -960,7 +960,15 @@ AND a.use_yn = 'Y' - AND a.aprvl_cd IN ('20', '35', '40', '60') /* 승인(20), 취소요청(35), 취소승인(40), 확정(60)된 사람만 보여줌 */ + + /* 승인(20), 취소요청(35), 취소승인(40), 확정(60)된 사람만 보여줌 old */ + AND a.aprvl_cd IN ('20', '35', '40', '60') + + /* 요청(10), 승인(20), 반려(30), 확정(60) 이건 교육확정된 것 이므로 확정된 사람기준으로 보여줌 */ + AND a.aprvl_cd IN ('60') + + + ORDER BY a.frst_regist_pnttm ASC diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp index 44f6d245..aac9b02a 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp @@ -837,7 +837,8 @@ - + + <%-- --%> <%-- --%> <%-- --%>