From 084a43cd5e507714153932fe5617f82fafb22d5b Mon Sep 17 00:00:00 2001 From: jiwoo Date: Thu, 25 Jan 2024 16:00:00 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EC=B2=AD?= =?UTF-8?q?=EC=86=8C=EB=85=84=20=EA=B0=95=EC=82=AC=20=EA=B2=B0=EA=B3=BC?= =?UTF-8?q?=EB=B3=B4=EA=B3=A0=EC=84=9C,=20=EC=88=99=EB=B0=95=EC=98=81?= =?UTF-8?q?=EC=88=98=EC=A6=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tngrVisitEdu/endInfo/web/VEEduEndController.java | 8 ++++++-- .../web/FndthPrcsAplctPrdMngController.java | 2 +- .../webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtReg.jsp | 2 -- .../WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp | 2 +- .../instr/fndtnVisitEdu/asgnmInfo/instrAsgnmEndDetail.jsp | 2 +- .../sspnIdtmtVisitEdu/endInfo/instrAsgnmEndDetail.jsp | 2 +- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/endInfo/web/VEEduEndController.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/endInfo/web/VEEduEndController.java index be02b91f..c44ef6cd 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/endInfo/web/VEEduEndController.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/endInfo/web/VEEduEndController.java @@ -576,7 +576,9 @@ public class VEEduEndController { // 강사 상세정보 VEInstrDetailVO vEInstrDetailVOInfo = new VEInstrDetailVO(); vEInstrDetailVOInfo.setInstrDiv("10"); - vEInstrDetailVOInfo.setUserId(vEEduRprtVO.getUserId()); + //영상 촬영을 위하여 임시로 로그인 ID 값 사용 + /*vEInstrDetailVOInfo.setUserId(vEEduRprtVO.getUserId());*/ + vEInstrDetailVOInfo.setUserId(loginVO.getUniqId()); vEInstrDetailVOInfo.setUseYn("Y"); vEInstrDetailVOInfo = vEInstrDetailService.selectDetail(vEInstrDetailVOInfo); if (vEInstrDetailVOInfo != null) { @@ -708,7 +710,9 @@ public class VEEduEndController { // 강사 상세정보 VEInstrDetailVO vEInstrDetailVOInfo = new VEInstrDetailVO(); vEInstrDetailVOInfo.setInstrDiv("10"); - vEInstrDetailVOInfo.setUserId(vEInstrFeeAcmdtVO.getUserId()); + //영상 촬영을 위하여 임시로 로그인 ID 값 사용 + /*vEInstrDetailVOInfo.setUserId(vEInstrFeeAcmdtVO.getUserId());*/ + vEInstrDetailVOInfo.setUserId(loginVO.getUniqId()); vEInstrDetailVOInfo.setUseYn("Y"); vEInstrDetailVOInfo = vEInstrDetailService.selectDetail(vEInstrDetailVOInfo); if (vEInstrDetailVOInfo != null) { diff --git a/src/main/java/kcc/ve/oprtn/fndtnEnhanceTrn/prcsAplctPrdMng/web/FndthPrcsAplctPrdMngController.java b/src/main/java/kcc/ve/oprtn/fndtnEnhanceTrn/prcsAplctPrdMng/web/FndthPrcsAplctPrdMngController.java index df0cfedf..e6609255 100644 --- a/src/main/java/kcc/ve/oprtn/fndtnEnhanceTrn/prcsAplctPrdMng/web/FndthPrcsAplctPrdMngController.java +++ b/src/main/java/kcc/ve/oprtn/fndtnEnhanceTrn/prcsAplctPrdMng/web/FndthPrcsAplctPrdMngController.java @@ -496,7 +496,7 @@ public class FndthPrcsAplctPrdMngController { vEPrcsDetailVO.setFrstRegisterId(loginVO.getUniqId()); //esntl_id vEPrcsDetailVO.setLctrDivCd("50"); //강의구분코드 VE0011 10-청소년강의, 20-성인강의, 30-체험, 50-기반강화, 60-조건부 - + vEPrcsDetailVO.setUseYn("Y"); vEPrcsDetailVO.setPrcsAplctPrdOrd(prcsAplctPrdGnrService.getNextStringId()); // 고유ID diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtReg.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtReg.jsp index 2e191e2b..cd39ef94 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtReg.jsp @@ -453,8 +453,6 @@ 의뢰상태 검사명 diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp index 221662ec..b3ae23b7 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp @@ -401,7 +401,7 @@
<%-- --%> - diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmEndDetail.jsp index c491489a..492ed4a5 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmEndDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmEndDetail.jsp @@ -331,7 +331,7 @@
- +

diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/sspnIdtmtVisitEdu/endInfo/instrAsgnmEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/sspnIdtmtVisitEdu/endInfo/instrAsgnmEndDetail.jsp index d92d0435..c79d0eb5 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/sspnIdtmtVisitEdu/endInfo/instrAsgnmEndDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/sspnIdtmtVisitEdu/endInfo/instrAsgnmEndDetail.jsp @@ -317,7 +317,7 @@
- +

From d54442af07ef573df8d01d3b075f80ede4e06f95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?ITN=5F=EB=94=94=EC=9E=90=EC=9D=B8=ED=8C=80?= Date: Thu, 25 Jan 2024 16:13:50 +0900 Subject: [PATCH 2/4] =?UTF-8?q?2024/01/25=20=EC=9B=B9=EC=A0=91=EA=B7=BC?= =?UTF-8?q?=EC=84=B1=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp index 1afe8242..fe2400c1 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp @@ -351,7 +351,7 @@ - @@ -364,7 +364,7 @@ - From 435f42872d912853160082fc1b061b7d6c498d1d Mon Sep 17 00:00:00 2001 From: kmg Date: Thu, 25 Jan 2024 16:45:13 +0900 Subject: [PATCH 3/4] =?UTF-8?q?2024/01/25=20=EC=9B=B9=EC=A0=91=EA=B7=BC?= =?UTF-8?q?=EC=84=B1=20=EA=B4=80=EB=A0=A8=20=ED=92=80=EC=BA=98=EB=A6=B0?= =?UTF-8?q?=EB=8D=94=20=ED=83=AD=20=EC=A3=BC=EC=84=9D=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp index 5e2889ac..0efeedc0 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp @@ -355,11 +355,11 @@ $(document).ready(function(){
- + From acb368c06cb9192201de7435b8742b698185eccf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?ITN=5F=EB=94=94=EC=9E=90=EC=9D=B8=ED=8C=80?= Date: Thu, 25 Jan 2024 16:50:02 +0900 Subject: [PATCH 4/4] =?UTF-8?q?2024/01/25=20=EC=9B=B9=EC=A0=91=EA=B7=BC?= =?UTF-8?q?=EC=84=B1=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../exprnClsrmInfo/exprnClsrmAplctReg.jsp | 2 +- .../exprnClsrmInfo/popup/scholPopList.jsp | 175 +++++++++--------- 2 files changed, 90 insertions(+), 87 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctReg.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctReg.jsp index 881ce7fc..78e0e9dd 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctReg.jsp @@ -668,7 +668,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/scholPopList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/scholPopList.jsp index c0ebf749..1001980c 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/scholPopList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/scholPopList.jsp @@ -93,93 +93,96 @@ $(document).ready(function(){ " />