From 6995de24d6475c0a8ee8939a4b32c7dd61840143 Mon Sep 17 00:00:00 2001 From: myname Date: Fri, 7 Nov 2025 10:49:15 +0900 Subject: [PATCH] =?UTF-8?q?2025-11-07=2010:48=20=EC=88=98=EB=8F=99=20?= =?UTF-8?q?=EC=8B=A0=EC=B2=AD=EC=9E=90=20=EC=A0=95=EB=B3=B4=20=EB=85=B8?= =?UTF-8?q?=EC=B6=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sqlmap/ve/edu/VEEdu_MIX_SQL_Postgresql.xml | 14 +++++++++++--- .../ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml | 2 +- .../oprtn/cmdTrgt/popup/cndtnApplyAsgnmPopup.jsp | 2 +- .../cndtnSspnIdtmt/popup/cndtnApplyAsgnmPopup.jsp | 2 +- 4 files changed, 14 insertions(+), 6 deletions(-) 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 06bfc8b2..530d08fb 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 @@ -806,7 +806,11 @@ ELSE '' END trgtSex , - qe.QESTNR_ID AS qestnrId , /* 설문했으면 ID가 있음 */ + /* 설문했으면 ID가 있음 - 예전 정보로 삭제*/ + /* + qe.QESTNR_ID AS qestnrId , + */ + vadi.APLCT_STATE_CD AS aplctStateCd, /* 이수 상태 */ vadi.CNCL_CN AS cnclCn, /* 취소사유 */ vadi.CNCL_ATCH_FILE_ID AS cnclAtchFileId, /* 취소요청파일 */ @@ -847,13 +851,17 @@ LEFT JOIN VEA_APLCT_DETAIL_INFO vadi ON a.EDU_APLCT_ORD = vadi.EDU_APLCT_ORD /* AND vpap.PRCS_APLCT_PRD_ORD = vadi.PRCS_APLCT_PRD_ORD */ - JOIN LETTNGNRLMBER le ON + LEFT OUTER JOIN LETTNGNRLMBER le ON /* a.USER_ID = le.MBER_ID */ a.USER_ID = le.esntl_id + + /* LEFT JOIN LETTNQESTNRINFO qe ON - a.USER_ID = qe.FRST_REGISTER_ID + a.USER_ID = qe.FRST_REGISTER_ID + */ + LEFT JOIN VEA_SSPN_IDMT_TRGT vsit ON ( /* diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml index 01e6e49e..7b3f84ab 100644 --- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml +++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml @@ -657,7 +657,7 @@ , (SELECT COUNT(*) FROM ve_edu_aplct x - JOIN LETTNGNRLMBER le ON + LEFT OUTER JOIN LETTNGNRLMBER le ON x.USER_ID = le.ESNTL_ID WHERE x.prcs_ord = a.prcs_aplct_prd_ord AND x.sbmt_yn='Y' diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/popup/cndtnApplyAsgnmPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/popup/cndtnApplyAsgnmPopup.jsp index f2e084c9..dfb9f084 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/popup/cndtnApplyAsgnmPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/popup/cndtnApplyAsgnmPopup.jsp @@ -328,7 +328,7 @@ } function fncGoList(){ - window.opener.reload(); + window.opener.location.reload(); } diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/cndtnApplyAsgnmPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/cndtnApplyAsgnmPopup.jsp index 26197a42..061945da 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/cndtnApplyAsgnmPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/cndtnApplyAsgnmPopup.jsp @@ -328,7 +328,7 @@ } function fncGoList(){ - window.opener.reload(); + window.opener.location.reload(); }