From e0ce6f2dd44211c9deb1e04e10474677da27733a Mon Sep 17 00:00:00 2001 From: jiwoo Date: Thu, 28 Dec 2023 16:45:24 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EC=84=B1?= =?UTF-8?q?=EC=9D=B8=EA=B0=95=EC=82=AC=20>=20=EA=B8=B0=EB=B0=98,=EA=B8=B0?= =?UTF-8?q?=EC=86=8C=20=EA=B0=95=EC=9D=98=EB=82=B4=EC=97=AD=20=EC=83=81?= =?UTF-8?q?=EC=84=B8=EC=97=90=20=EA=B0=95=EC=9D=98=EA=B3=84=ED=9A=8D?= =?UTF-8?q?=EC=84=9C=20=EC=B6=94=EA=B0=80=20=EB=B0=8F=20=EA=B4=80=EB=A6=AC?= =?UTF-8?q?=EC=9E=90=20=EC=83=81=EC=84=B8=ED=99=94=EB=A9=B4=EC=97=90=20?= =?UTF-8?q?=EA=B0=95=EC=9D=98=EA=B3=84=ED=9A=8D=EC=84=9C=20=EB=8B=A4?= =?UTF-8?q?=EC=9A=B4=EB=A1=9C=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/InnorixFileServiceImpl.java | 1 + .../asgnmInfo/web/VEFndtnAsgnmController.java | 6 ++++ .../web/VESspnIdtmtAsgnmController.java | 5 +++- .../VEAPrcsAplctPrdInstrAsgnmService.java | 2 ++ .../impl/VEAPrcsAplctPrdInstrAsgnmDAO.java | 3 ++ .../VEAPrcsAplctPrdInstrAsgnmServiceImpl.java | 6 ++++ .../VEAPrcsAplctPrdInstrAsgnm_SQL_Tibero.xml | 20 +++++++++++++ .../cndtnEduPrcsAplctCfnMngDetail.jsp | 11 ++++++-- .../cndtnEduPrcsAplctPrdMngDetail.jsp | 11 ++++++-- .../fndthEduPrcsAplctCfnMngDetail.jsp | 11 ++++++-- .../fndthEduPrcsAplctPrdMngDetail.jsp | 7 +++++ .../asgnmInfo/instrAsgnmDetail.jsp | 8 +++--- .../asgnmInfo/instrAsgnmDetail.jsp | 28 ++++++++++++++++++- 13 files changed, 107 insertions(+), 12 deletions(-) diff --git a/src/main/java/kcc/kccadr/cmm/innorix/service/impl/InnorixFileServiceImpl.java b/src/main/java/kcc/kccadr/cmm/innorix/service/impl/InnorixFileServiceImpl.java index ce04f66f..347f0b29 100644 --- a/src/main/java/kcc/kccadr/cmm/innorix/service/impl/InnorixFileServiceImpl.java +++ b/src/main/java/kcc/kccadr/cmm/innorix/service/impl/InnorixFileServiceImpl.java @@ -427,6 +427,7 @@ public class InnorixFileServiceImpl extends EgovAbstractServiceImpl implements I vEAPrcsAplctPrdInstrAsgnmVO.setLastUpdusrId(adrInnorixFileVO.getUniqId()); vEAPrcsAplctPrdInstrAsgnmVO.setPrcsAplctPrdOrd(adrInnorixFileVO.getPrcsAplctPrdOrd()); + vEAPrcsAplctPrdInstrAsgnmVO.setUserId(adrInnorixFileVO.getUniqId()); //저장 vEAPrcsAplctPrdInstrAsgnmService.updatLctrPlanAtchFileId(vEAPrcsAplctPrdInstrAsgnmVO); diff --git a/src/main/java/kcc/ve/instr/fndtnVisitEdu/asgnmInfo/web/VEFndtnAsgnmController.java b/src/main/java/kcc/ve/instr/fndtnVisitEdu/asgnmInfo/web/VEFndtnAsgnmController.java index 89a23c30..b3032c19 100644 --- a/src/main/java/kcc/ve/instr/fndtnVisitEdu/asgnmInfo/web/VEFndtnAsgnmController.java +++ b/src/main/java/kcc/ve/instr/fndtnVisitEdu/asgnmInfo/web/VEFndtnAsgnmController.java @@ -198,8 +198,14 @@ public class VEFndtnAsgnmController { List instrAsgnmList = egovCryptoUtil.decryptVEAPrcsAplctPrdInstrAsgnmVOList(vEAPrcsAplctPrdInstrAsgnmList); model.addAttribute("instrAsgnmList", instrAsgnmList); + } + //강사 강의계획서 정보 + vEPrcsDetailVO.setUserId(loginVO.getUniqId()); + VEAPrcsAplctPrdInstrAsgnmVO vEPrcsInstrAsgnmDetail = vEAPrcsAplctPrdInstrAsgnmService.selectPrcsInstrAsgnmDetail(vEPrcsDetailVO); + model.addAttribute("instrInfo", vEPrcsInstrAsgnmDetail); + return "/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmDetail"; } diff --git a/src/main/java/kcc/ve/instr/sspnIdtmt/asgnmInfo/web/VESspnIdtmtAsgnmController.java b/src/main/java/kcc/ve/instr/sspnIdtmt/asgnmInfo/web/VESspnIdtmtAsgnmController.java index 6f8fbc98..0a07d99f 100644 --- a/src/main/java/kcc/ve/instr/sspnIdtmt/asgnmInfo/web/VESspnIdtmtAsgnmController.java +++ b/src/main/java/kcc/ve/instr/sspnIdtmt/asgnmInfo/web/VESspnIdtmtAsgnmController.java @@ -200,7 +200,10 @@ public class VESspnIdtmtAsgnmController { model.addAttribute("instrAsgnmList", instrAsgnmList); } - + //강사 강의계획서 정보 + vEPrcsDetailVO.setUserId(loginVO.getUniqId()); + VEAPrcsAplctPrdInstrAsgnmVO vEPrcsInstrAsgnmDetail = vEAPrcsAplctPrdInstrAsgnmService.selectPrcsInstrAsgnmDetail(vEPrcsDetailVO); + model.addAttribute("instrInfo", vEPrcsInstrAsgnmDetail); return "/web/ve/instr/sspnIdtmtVisitEdu/asgnmInfo/instrAsgnmDetail"; } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEAPrcsAplctPrdInstrAsgnmService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEAPrcsAplctPrdInstrAsgnmService.java index b5ff7b1f..1ddf0875 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEAPrcsAplctPrdInstrAsgnmService.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEAPrcsAplctPrdInstrAsgnmService.java @@ -21,4 +21,6 @@ public interface VEAPrcsAplctPrdInstrAsgnmService { void updatLctrPlanAtchFileId(VEAPrcsAplctPrdInstrAsgnmVO vEAPrcsAplctPrdInstrAsgnmVO); void updateEduStateCdListAjax(VEPrcsDetailVO vEPrcsDetailVO); + + VEAPrcsAplctPrdInstrAsgnmVO selectPrcsInstrAsgnmDetail(VEPrcsDetailVO vEDetailVO); } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEAPrcsAplctPrdInstrAsgnmDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEAPrcsAplctPrdInstrAsgnmDAO.java index 67d01daf..49f2e7bd 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEAPrcsAplctPrdInstrAsgnmDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEAPrcsAplctPrdInstrAsgnmDAO.java @@ -52,4 +52,7 @@ public class VEAPrcsAplctPrdInstrAsgnmDAO extends EgovAbstractDAO { update("VEAPrcsAplctPrdInstrAsgnmDAO.updateEduStateCdListAjax", vEPrcsDetailVO); } + public VEAPrcsAplctPrdInstrAsgnmVO selectPrcsInstrAsgnmDetail(VEPrcsDetailVO vEDetailVO) { + return (VEAPrcsAplctPrdInstrAsgnmVO) select("VEAPrcsAplctPrdInstrAsgnmDAO.selectPrcsInstrAsgnmDetail", vEDetailVO); + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEAPrcsAplctPrdInstrAsgnmServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEAPrcsAplctPrdInstrAsgnmServiceImpl.java index e4f688e5..01389d04 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEAPrcsAplctPrdInstrAsgnmServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEAPrcsAplctPrdInstrAsgnmServiceImpl.java @@ -75,4 +75,10 @@ public class VEAPrcsAplctPrdInstrAsgnmServiceImpl implements VEAPrcsAplctPrdInst public void updateEduStateCdListAjax(VEPrcsDetailVO vEPrcsDetailVO) { vEAPrcsAplctPrdInstrAsgnmDAO.updateEduStateCdListAjax(vEPrcsDetailVO); } + + @Override + public VEAPrcsAplctPrdInstrAsgnmVO selectPrcsInstrAsgnmDetail(VEPrcsDetailVO vEDetailVO) { + return vEAPrcsAplctPrdInstrAsgnmDAO.selectPrcsInstrAsgnmDetail(vEDetailVO); + + } } diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEAPrcsAplctPrdInstrAsgnm_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEAPrcsAplctPrdInstrAsgnm_SQL_Tibero.xml index 5adb786e..5675386f 100644 --- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEAPrcsAplctPrdInstrAsgnm_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEAPrcsAplctPrdInstrAsgnm_SQL_Tibero.xml @@ -186,8 +186,28 @@ , last_updusr_id = #lastUpdusrId# , last_updt_pnttm = sysdate WHERE prcs_aplct_prd_ord = #prcsAplctPrdOrd# + AND user_id = #userId# + 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 7e22e4d9..11293f21 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp @@ -425,14 +425,16 @@ - + + 강사명 연락처 - 확정여부 + 확정여부 + 강의계획서 삭제 @@ -450,6 +452,11 @@ + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngDetail.jsp index c967efd7..6a0c8b05 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngDetail.jsp @@ -413,14 +413,16 @@ - + + 강사명 연락처 - 확정여부 + 확정여부 + 강의계획서 삭제 @@ -438,6 +440,11 @@ + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp index a9fd2a4f..21d5b0bd 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp @@ -421,14 +421,16 @@ - + + 강사명 연락처 - 확정여부 + 확정여부 + 강의계획서 삭제 @@ -446,6 +448,11 @@ + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngDetail.jsp index 9385e7d8..8338461d 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngDetail.jsp @@ -386,6 +386,7 @@ + @@ -393,6 +394,7 @@ 강사명 연락처 확정여부 + 강의계획서 삭제 @@ -410,6 +412,11 @@ + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmDetail.jsp index b289da06..cad64d40 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmDetail.jsp @@ -89,7 +89,7 @@ } if(fn_innorixCmmAjax(sendData, url) == "OK") { - alert("업로드 완료"); + location.reload(); } }); }); @@ -272,7 +272,7 @@

강의계획서

- +
@@ -288,9 +288,9 @@
- + - + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/sspnIdtmtVisitEdu/asgnmInfo/instrAsgnmDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/sspnIdtmtVisitEdu/asgnmInfo/instrAsgnmDetail.jsp index 224e8536..26b804ee 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/sspnIdtmtVisitEdu/asgnmInfo/instrAsgnmDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/sspnIdtmtVisitEdu/asgnmInfo/instrAsgnmDetail.jsp @@ -89,7 +89,7 @@ } if(fn_innorixCmmAjax(sendData, url) == "OK") { - alert("업로드 완료"); + location.reload(); } }); }); @@ -255,6 +255,32 @@ + +

강의계획서

+ + +
+ + +
+

+
+
+

최대 1개

+
+
+

등록된 파일 0개

+ 0MB +
+
+ + + + + + + +