From fc2ecd84e08b75c3148be9c12accef34e34713f8 Mon Sep 17 00:00:00 2001 From: myname Date: Thu, 1 Feb 2024 12:50:20 +0900 Subject: [PATCH] =?UTF-8?q?2024-02-01=2012:50=20=EC=B2=AD=EC=86=8C?= =?UTF-8?q?=EB=85=84=20=EA=B2=B0=EA=B3=BC=EB=B3=B4=EA=B3=A0=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=EC=9E=90=20=EC=82=AD=EC=A0=9C=20=EA=B8=B0=EB=8A=A5=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cmm/service/impl/FileManageDAO.java | 2 +- .../com/cmm/web/EgovFileMngController.java | 2 +- .../service/VEEduRsltRprtService.java | 4 +- .../impl/VEEduRsltRprtServiceImpl.java | 28 ++++++++- .../web/OprtnStateMngController.java | 41 +++++++++++- .../let/cmm/fms/EgovFile_SQL_Tibero.xml | 25 +++++++- .../ve/rprt/VEEduRsltRprt_SQL_Tibero.xml | 2 +- .../oprtn/tngrVisitEdu/eduRsltMngDetail.jsp | 63 ++++++++++++++++++- .../tngrVisitEdu/popup/attachFilePopup.jsp | 22 +++++++ .../asgnmInfo/instrAsgnmRqstList.jsp | 29 +++++---- 10 files changed, 195 insertions(+), 23 deletions(-) diff --git a/src/main/java/kcc/com/cmm/service/impl/FileManageDAO.java b/src/main/java/kcc/com/cmm/service/impl/FileManageDAO.java index 2bf60300..1bb3de2f 100644 --- a/src/main/java/kcc/com/cmm/service/impl/FileManageDAO.java +++ b/src/main/java/kcc/com/cmm/service/impl/FileManageDAO.java @@ -140,7 +140,7 @@ public class FileManageDAO extends EgovComAbstractDAO { public FileVO selectFileInf(FileVO fvo) throws Exception { return (FileVO) select("FileManageDAO.selectFileInf", fvo); } - + /** * 전체 파일을 삭제한다. * diff --git a/src/main/java/kcc/com/cmm/web/EgovFileMngController.java b/src/main/java/kcc/com/cmm/web/EgovFileMngController.java index f8990c72..fabe7bf4 100644 --- a/src/main/java/kcc/com/cmm/web/EgovFileMngController.java +++ b/src/main/java/kcc/com/cmm/web/EgovFileMngController.java @@ -405,7 +405,7 @@ public class EgovFileMngController { /** * 저작권 체험교실 결과보고 파일 조회 * - * FILE 삭제에 대한 정리#3 + * FILE 삭제에 대한 정리#4 * * 0.삭제를 위한 페이지를 호출한다. * diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/rprtInfo/service/VEEduRsltRprtService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/rprtInfo/service/VEEduRsltRprtService.java index ebca0c62..76c27cb1 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/rprtInfo/service/VEEduRsltRprtService.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/rprtInfo/service/VEEduRsltRprtService.java @@ -3,7 +3,6 @@ package kcc.ve.instr.tngrVisitEdu.rprtInfo.service; import java.util.List; import kcc.com.cmm.service.FileVO; -import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduOprtnVO; public interface VEEduRsltRprtService { @@ -28,4 +27,7 @@ public interface VEEduRsltRprtService { //결과보고 첨부파일 삭제 처리 public void deleteRsltRprtFileInf(FileVO fileVO, VEEduRprtVO vEEduRprtVO) throws Exception; + //결과보고 첨부파일 삭제 처리 - 2024-02-01 제작 + public void deleteNewRsltRprtFileInf(FileVO fileVO, VEEduRprtVO vEEduRprtVO) throws Exception; + } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/rprtInfo/service/impl/VEEduRsltRprtServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/rprtInfo/service/impl/VEEduRsltRprtServiceImpl.java index b1cb1bd7..26c9165b 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/rprtInfo/service/impl/VEEduRsltRprtServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/rprtInfo/service/impl/VEEduRsltRprtServiceImpl.java @@ -10,7 +10,6 @@ import org.springframework.stereotype.Service; import kcc.com.cmm.service.FileVO; import kcc.com.cmm.service.impl.FileManageDAO; -import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduOprtnVO; import kcc.ve.instr.tngrVisitEdu.rprtInfo.service.VEEduRprtVO; import kcc.ve.instr.tngrVisitEdu.rprtInfo.service.VEEduRsltRprtService; @@ -69,4 +68,31 @@ public class VEEduRsltRprtServiceImpl implements VEEduRsltRprtService { } fileMngDAO.deleteFileInf(fileVO); //DB삭제 } + + //결과보고 컬럼 삭제 하고 파일도 삭제 처리함 + public void deleteNewRsltRprtFileInf(FileVO fileVO, VEEduRprtVO vEEduRprtVO) throws Exception { + //결과 보고 첨부파일 ID 삭제 처리 + //vEEduRsltRprtDAO.updateNullFile(vEEduRprtVO); + vEEduRsltRprtDAO.delete(vEEduRprtVO); + /* + * "atchFileId" : p_atchFileId + , "eduAplctOrd" : p_eduAplctOrd + , "eduChasiOrd" : p_eduChasiOrd + , "rprtFileType" : "rprt"/ + */ + //파일 삭제처리 + List returnFileVO = null; + returnFileVO = fileMngDAO.selectFileInfs(fileVO); + if(returnFileVO !=null) { + for(int i=0;i + /* FileManageDAO.deleteFileDetail */ - + + + /* FileManageDAO.deleteFileDetails */ + + + + + WHERE - a.edu_aplct_ord = #eduAplctOrd# + edu_aplct_ord = #eduAplctOrd# AND edu_chasi_ord = #eduChasiOrd# diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngDetail.jsp index c0240b50..e2895998 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngDetail.jsp @@ -145,6 +145,55 @@ function replyCalculation(){ document.filePopForm.target = "_attachFilePop"; document.filePopForm.submit(); } + + function fncAttachFileCreate(){ + + alert("구현해야 합니다."); + } + + // 결과보고서 삭제 + function fncAttachFileDelete( + p_atchFileId + , p_eduAplctOrd + , p_eduChasiOrd + //, p_rprtFileType + ) { //메뉴생성 화면 호출 + + if (!confirm("삭제 하시겠습니까?\n(삭제 후 복구가 불가능합니다.)")) { + return false; + } + + $.ajax({ + type: "POST", + url: "${pageContext.request.contextPath}/kccadr/oprtn/cpyrgExprnClsrm/rsltRprtfileDeleteNewAjax.do", + + //data:{ "atchFileId" : itemId , "fileSn" : fileSn, "eduAplctOrd" : "${eduAplctOrd}", "rprtFileType" : rprtFileType}, + + data: { + "atchFileId" : p_atchFileId + , "eduAplctOrd" : p_eduAplctOrd + , "eduChasiOrd" : p_eduChasiOrd + , "rprtFileType" : "rprt" + + }, + dataType:'json', + async: true, // 동기 + success: function (data, status) { + if (data.result == "success") { + //alert(JSON.stringify(data.fileList)); + //setJsonListShow(data.fileList); + alert("삭제성공"); + location.reload(); + } else { + alert("Msg : " + data.msg); + } + }, + error : function(xhr, status, error) { + alert("Err : " + JSON.stringify(status)); + } + }); + + } //특이사항 /* @@ -669,7 +718,17 @@ function replyCalculation(){
-

결과보고

+

결과보고 + + + + + + + + + +

@@ -695,7 +754,7 @@ function replyCalculation(){ diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/attachFilePopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/attachFilePopup.jsp index 922eb35f..1ba0694b 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/attachFilePopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/attachFilePopup.jsp @@ -145,6 +145,28 @@ frm.submit(); } + + // 첨부파일 목록 + function deleteAttachFileList() { + $.ajax({ + type: "POST", + url: "${pageContext.request.contextPath}/kccadr/oprtn/adultVisitEdu/popup/fileListAjax.do", + data: {"atchFileId" : "${scholSealAtchFileId}"}, + dataType:'json', + async: true, // 동기 + success: function (data, status) { + if (data.isSuccess == true) { + //alert(JSON.stringify(data.fileList)); + setJsonListShow(data.fileList); + } else { + alert("Msg : " + data.msg); + } + }, + error : function(xhr, status, error) { + alert("Err : " + JSON.stringify(status)); + } + }); + } diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp index 37024e7c..cc6b07ac 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp @@ -137,7 +137,7 @@ - + @@ -174,19 +174,22 @@

첨부파일

 - +
시간 지역 기관(단체)명총 금액강사료 신청상태

- - - - 정산중 - - - 정산중 - - +<%-- --%> +<%-- --%> +<%-- --%> + +<%-- --%> +<%-- --%> + +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> + - - - +