2024-02-01 16:16 기소유예, 실무역량 강의계획서, 결과보고서 삭제 기능 추가

src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEAPrcsAplctPrdInstrAsgnmService.java

@@ -25,4 +25,6 @@ public interface VEAPrcsAplctPrdInstrAsgnmService {
 	VEAPrcsAplctPrdInstrAsgnmVO selectPrcsInstrAsgnmDetail(VEPrcsDetailVO vEDetailVO);
 	
 	void updatDocAtchFileId(VEAPrcsAplctPrdInstrAsgnmVO vEAPrcsAplctPrdInstrAsgnmVO);
+	
+	void updateResetAtchFileId(VEAPrcsAplctPrdInstrAsgnmVO vEAPrcsAplctPrdInstrAsgnmVO);	
 }

src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEAPrcsAplctPrdInstrAsgnmDAO.java

@@ -5,7 +5,6 @@ import java.util.List;
 import org.springframework.stereotype.Repository;
 
 import egovframework.rte.psl.dataaccess.EgovAbstractDAO;
-import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO;
 import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEAPrcsAplctPrdInstrAsgnmVO;
 import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO;
 
@@ -60,4 +59,9 @@ public class VEAPrcsAplctPrdInstrAsgnmDAO extends EgovAbstractDAO {
 		update("VEAPrcsAplctPrdInstrAsgnmDAO.updatDocAtchFileId", vEAPrcsAplctPrdInstrAsgnmVO);
 		
 	}
+	
+	public void updateResetAtchFileId(VEAPrcsAplctPrdInstrAsgnmVO vEAPrcsAplctPrdInstrAsgnmVO) {
+		update("VEAPrcsAplctPrdInstrAsgnmDAO.updateResetAtchFileId", vEAPrcsAplctPrdInstrAsgnmVO);
+		
+	}
 }

src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEAPrcsAplctPrdInstrAsgnmServiceImpl.java

@@ -88,4 +88,10 @@ public class VEAPrcsAplctPrdInstrAsgnmServiceImpl implements VEAPrcsAplctPrdInst
 		
 	}
 	
+	@Override
+	public void updateResetAtchFileId(VEAPrcsAplctPrdInstrAsgnmVO vEAPrcsAplctPrdInstrAsgnmVO) {
+		vEAPrcsAplctPrdInstrAsgnmDAO.updateResetAtchFileId(vEAPrcsAplctPrdInstrAsgnmVO);
+		
+	}
+
 }

src/main/java/kcc/ve/instr/tngrVisitEdu/rprtInfo/service/VEEduRsltRprtService.java

@@ -3,6 +3,7 @@ package kcc.ve.instr.tngrVisitEdu.rprtInfo.service;
 import java.util.List;
 
 import kcc.com.cmm.service.FileVO;
+import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEAPrcsAplctPrdInstrAsgnmVO;
 
 public interface VEEduRsltRprtService {
 	
@@ -33,4 +34,7 @@ public interface VEEduRsltRprtService {
 	//결과보고 첨부파일 삭제 처리(성인)	-	2024-02-01 제작(
 	public void deleteNewRsltRprtAdultFileInf(FileVO fileVO, VEEduRprtVO vEEduRprtVO) throws Exception;
 
+	//결과보고 첨부파일 삭제 처리(실무,기소-계획서,결과보고서)	-	2024-02-01 제작(
+	public void deleteNewRsltRprtFileInf_F_C(FileVO fileVO, VEAPrcsAplctPrdInstrAsgnmVO vEAPrcsAplctPrdInstrAsgnmVO) throws Exception;
+	
 }

src/main/java/kcc/ve/instr/tngrVisitEdu/rprtInfo/service/impl/VEEduRsltRprtServiceImpl.java

@@ -10,6 +10,8 @@ import org.springframework.stereotype.Service;
 
 import kcc.com.cmm.service.FileVO;
 import kcc.com.cmm.service.impl.FileManageDAO;
+import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEAPrcsAplctPrdInstrAsgnmVO;
+import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.impl.VEAPrcsAplctPrdInstrAsgnmDAO;
 import kcc.ve.instr.tngrVisitEdu.rprtInfo.service.VEEduRprtVO;
 import kcc.ve.instr.tngrVisitEdu.rprtInfo.service.VEEduRsltRprtService;
 
@@ -20,6 +22,10 @@ public class VEEduRsltRprtServiceImpl implements VEEduRsltRprtService {
     @Resource(name="vEEduRsltRprtDAO")
     private VEEduRsltRprtDAO vEEduRsltRprtDAO;
 
+    @Resource(name="vEAPrcsAplctPrdInstrAsgnmDAO")
+    private VEAPrcsAplctPrdInstrAsgnmDAO	vEAPrcsAplctPrdInstrAsgnmDAO;
+    
+     
     //첨부파일
 	@Resource(name = "FileManageDAO")
 	private FileManageDAO fileMngDAO;
@@ -120,4 +126,31 @@ public class VEEduRsltRprtServiceImpl implements VEEduRsltRprtService {
 		
 		//fileMngDAO.deleteFileInfs(fileVO); //DB삭제
 	}
+	
+	//결과보고 컬럼 삭제 하고 파일도 삭제 처리함(실무,기소-강의계획서,결과보고서)
+	public void deleteNewRsltRprtFileInf_F_C(FileVO fileVO, VEAPrcsAplctPrdInstrAsgnmVO vEAPrcsAplctPrdInstrAsgnmVO) throws Exception {
+		//결과 보고 첨부파일 ID 삭제 처리
+		vEAPrcsAplctPrdInstrAsgnmDAO.updateResetAtchFileId(vEAPrcsAplctPrdInstrAsgnmVO);
+		//vEEduRsltRprtDAO.updateNullFile(vEEduRprtVO);
+		//vEEduRsltRprtDAO.delete(vEEduRprtVO);
+		/*
+		 * 				"atchFileId" : p_atchFileId
+				, "eduAplctOrd" : p_eduAplctOrd
+				, "eduChasiOrd" : p_eduChasiOrd
+				, "rprtFileType" : "rprt"/
+		 */
+		//파일 삭제처리
+		List<FileVO> returnFileVO = null;
+		returnFileVO = fileMngDAO.selectFileInfs(fileVO);
+		if(returnFileVO !=null) {
+			for(int i=0;i<returnFileVO.size();i++) {
+				File delFile = new File(returnFileVO.get(i).getFileStreCours()+returnFileVO.get(i).getStreFileNm());
+				delFile.delete();				
+			}
+			
+			fileMngDAO.deleteFileInfs(returnFileVO); //DB삭제
+		}
+		
+		//fileMngDAO.deleteFileInfs(fileVO); //DB삭제
+	}	
 }

src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnStateMng/web/OprtnStateMngController.java

@@ -46,6 +46,7 @@ import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO;
 import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrMixService;
 import kcc.ve.instr.tngrVisitEdu.lctrInfo.service.VELctrDetailVO;
 import kcc.ve.instr.tngrVisitEdu.lctrInfo.service.VELctrMIXService;
+import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEAPrcsAplctPrdInstrAsgnmVO;
 import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsMIXService;
 import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsService;
 import kcc.ve.instr.tngrVisitEdu.rprtInfo.service.VEEduRprtVO;
@@ -558,6 +559,7 @@ public class OprtnStateMngController {
 	public ModelAndView rsltRprtfileDeleteNewAjax( 
 			FmsFileVO fmsFileVO,
 			@ModelAttribute("fileVO") FileVO fileVO,
+			VEAPrcsAplctPrdInstrAsgnmVO vEAPrcsAplctPrdInstrAsgnmVO,
 			VEEduRprtVO vEEduRprtVO
 			) throws Exception {
 
@@ -567,12 +569,31 @@ public class OprtnStateMngController {
     	LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기
     	
     	vEEduRprtVO.setLastUpdusrId(loginVO.getUniqId());
+    	vEAPrcsAplctPrdInstrAsgnmVO.setLastUpdusrId(loginVO.getUniqId());
+    	
 		try {
 			if ("rprtTngr".equals(vEEduRprtVO.getRprtFileType())) {		//청소년 결과 보고서 삭제
 				vEEduRsltRprtService.deleteNewRsltRprtFileInf(fileVO, vEEduRprtVO);	/*	DB & 물리파일 삭제			VE_edu_RSLT_RPRT	*/	
 				
 			}else if ("rprtAdult".equals(vEEduRprtVO.getRprtFileType())) {	//성인 결과 보고서 삭제
 				vEEduRsltRprtService.deleteNewRsltRprtAdultFileInf(fileVO, vEEduRprtVO);	/*	DB & 물리파일 삭제	VEA_RSLT_RPRT	*/
+
+				
+			}else if ("planFndth".equals(vEEduRprtVO.getRprtFileType())) {	//실무역량 강의계획서 삭제
+				vEAPrcsAplctPrdInstrAsgnmVO.setLctrPlanAtchFileId(fileVO.getAtchFileId());
+				vEEduRsltRprtService.deleteNewRsltRprtFileInf_F_C(fileVO, vEAPrcsAplctPrdInstrAsgnmVO);	/*	DB & 물리파일 삭제	vea_prcs_aplct_prd_instr_asgnm	*/
+				
+			}else if ("rprtFndth".equals(vEEduRprtVO.getRprtFileType())) {	//실무역량 결과 보고서 삭제
+				vEAPrcsAplctPrdInstrAsgnmVO.setDocAtchFileId(fileVO.getAtchFileId());
+				vEEduRsltRprtService.deleteNewRsltRprtFileInf_F_C(fileVO, vEAPrcsAplctPrdInstrAsgnmVO);	/*	DB & 물리파일 삭제	vea_prcs_aplct_prd_instr_asgnm	*/
+
+			}else if ("planCndtn".equals(vEEduRprtVO.getRprtFileType())) {	//기소유예 강의계획서 삭제
+				vEAPrcsAplctPrdInstrAsgnmVO.setLctrPlanAtchFileId(fileVO.getAtchFileId());
+				vEEduRsltRprtService.deleteNewRsltRprtFileInf_F_C(fileVO, vEAPrcsAplctPrdInstrAsgnmVO);	/*	DB & 물리파일 삭제	vea_prcs_aplct_prd_instr_asgnm	*/
+				
+			}else if ("rprtCndtn".equals(vEEduRprtVO.getRprtFileType())) {	//기소유예 결과 보고서 삭제
+				vEAPrcsAplctPrdInstrAsgnmVO.setDocAtchFileId(fileVO.getAtchFileId());
+				vEEduRsltRprtService.deleteNewRsltRprtFileInf_F_C(fileVO, vEAPrcsAplctPrdInstrAsgnmVO);	/*	DB & 물리파일 삭제	vea_prcs_aplct_prd_instr_asgnm	*/				
 			}
 			
 		    modelAndView.addObject("result", "success");

src/main/resources/egovframework/sqlmap/ve/prcs/VEAPrcsAplctPrdInstrAsgnm_SQL_Tibero.xml

@@ -221,4 +221,23 @@
 	    WHERE prcs_aplct_prd_ord = #prcsAplctPrdOrd# 
 	    AND user_id = #userId#
 	</update>
+	
+		<!-- 강의계획서/결과보고 reset update -->
+	<update id="VEAPrcsAplctPrdInstrAsgnmDAO.updateResetAtchFileId" parameterClass="vEAPrcsAplctPrdInstrAsgnmVO">
+		/* VEAPrcsAplctPrdInstrAsgnmDAO.updateResetAtchFileId */
+		
+	    UPDATE VEA_PRCS_APLCT_PRD_INSTR_ASGNM
+	    SET last_updt_pnttm = sysdate
+	    , last_updusr_id = #lastUpdusrId#
+	    
+		<isNotEmpty property="docAtchFileId">
+			, doc_atch_file_id			= null
+		</isNotEmpty>
+		<isNotEmpty property="lctrPlanAtchFileId">
+			, lctr_plan_atch_file_id	= null
+		</isNotEmpty>	    
+	    	    
+	    WHERE prcs_aplct_prd_ord = #prcsAplctPrdOrd# 
+	    
+	</update>		
 </sqlMap>

src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml

@@ -500,6 +500,8 @@
 						AND a0.asgnm_aprvl_cd='30'
 						AND a0.user_id=b.user_id
 						AND b.use_yn='Y'
+						AND b.instr_div='20'
+						
                  ) c
 
                  LEFT OUTER JOIN ve_instr_fee f

src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngDetail.jsp

@@ -189,12 +189,11 @@
 	}	
 
 	function fncAttachFileCreate(){		
-		
 		alert("구현해야 합니다.");
-}
+	}
 
-// 결과보고서 삭제
+	// 결과보고서 삭제
-function fncAttachFileDelete(
+	function fncAttachFileDelete(
 			p_atchFileId
 			, p_eduAplctOrd
 			, p_eduChasiOrd
@@ -234,8 +233,7 @@ function fncAttachFileDelete(
 	   			alert("Err : " + JSON.stringify(status));
 	   		}
 		});
-	  
+	}		
-}		
 </script>
 
 </head>

src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp

@@ -337,6 +337,52 @@
 			form.action = "<c:url value='/kccadr/oprtn/fndthEnhanceTrn/popup/lctrEvalNewPopup.do'/>";
 		    openPopupAndSubmitForm('popupNewForm', 'popupNewForm', 900, 1200);
 		}	 
+
+		function fncAttachFileCreate(){		
+			alert("구현해야 합니다.");
+		}
+
+		// 결과보고서 삭제
+		function fncAttachFileDelete(
+				p_atchFileId
+				, p_prcsAplctPrdOrd				
+				, p_rprtFileType
+				//, 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					
+					, "prcsAplctPrdOrd" : p_prcsAplctPrdOrd
+					, "rprtFileType" 	: p_rprtFileType
+					
+					},
+				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));
+		   		}
+			});
+		}			
 </script>
 
 </head>
@@ -534,11 +580,29 @@
 											<c:import url="/cmm/fms/selectBBSFileInfs.do" charEncoding="utf-8">
 												<c:param name="param_atchFileId" value="${list.lctrPlanAtchFileId}" />
 											</c:import>
+											<!-- 강의계획서 삭제 -->
+											<c:if test="${!empty list.lctrPlanAtchFileId}">
+											<button type="button" class="btn_type06" onclick="fncAttachFileDelete('${list.lctrPlanAtchFileId}', '${list.prcsAplctPrdOrd}', 'planCndtn')">강의계획서 삭제</button>
+											</c:if>
+											
+											<!-- 강의계획서 등록 -->
+											<c:if test="${empty list.lctrPlanAtchFileId}">
+											<button type="button" class="btn_type06" onclick="fncAttachFileCreate('${list.lctrPlanAtchFileId}', '${list.prcsAplctPrdOrd}', 'planCndtn')">강의계획서 등록</button>
+											</c:if>																						
 										</td>
 										<td>										
 											<c:import url="/cmm/fms/selectBBSFileInfs.do" charEncoding="utf-8">
 												<c:param name="param_atchFileId" value="${list.docAtchFileId}" />
 											</c:import>
+											<!-- 결과보고서 삭제 -->
+											<c:if test="${!empty list.docAtchFileId}">
+											<button type="button" class="btn_type06" onclick="fncAttachFileDelete('${list.docAtchFileId}', '${list.prcsAplctPrdOrd}', 'rprtCndtn')">결과보고서 삭제</button>
+											</c:if>
+											
+											<!-- 결과보고서 등록 -->
+											<c:if test="${empty list.docAtchFileId}">
+											<button type="button" class="btn_type06" onclick="fncAttachFileCreate('${list.docAtchFileId}', '${list.prcsAplctPrdOrd}', 'rprtCndtn')">결과보고서 등록</button>
+											</c:if>											
 										</td>
 										<td>										
 											<button type="button" class="btn_type01" onclick="fn_delInstr('<c:out value="${list.userId }" />')">삭제</button>

src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp

@@ -292,6 +292,51 @@
 				
 		 }
 
+		function fncAttachFileCreate(){		
+			alert("구현해야 합니다.");
+		}
+
+		// 결과보고서 삭제
+		function fncAttachFileDelete(
+				p_atchFileId
+				, p_prcsAplctPrdOrd				
+				, p_rprtFileType
+				//, 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					
+					, "prcsAplctPrdOrd" : p_prcsAplctPrdOrd
+					, "rprtFileType" 	: p_rprtFileType
+					
+					},
+				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));
+		   		}
+			});
+		}	 
 </script>
 
 </head>
@@ -496,11 +541,31 @@
 											<c:import url="/cmm/fms/selectBBSFileInfs.do" charEncoding="utf-8">
 												<c:param name="param_atchFileId" value="${list.lctrPlanAtchFileId}" />
 											</c:import>
+											<!-- 강의계획서 삭제 -->
+											<c:if test="${!empty list.lctrPlanAtchFileId}">
+											<button type="button" class="btn_type06" onclick="fncAttachFileDelete('${list.lctrPlanAtchFileId}', '${list.prcsAplctPrdOrd}', 'planFndth')">강의계획서 삭제</button>
+											</c:if>
+											
+											<!-- 강의계획서 등록 -->
+											<c:if test="${empty list.lctrPlanAtchFileId}">
+											<button type="button" class="btn_type06" onclick="fncAttachFileCreate('${list.lctrPlanAtchFileId}', '${list.prcsAplctPrdOrd}', 'planFndth')">강의계획서 등록</button>
+											</c:if>											
 										</td>
 										<td>
 											<c:import url="/cmm/fms/selectBBSFileInfs.do" charEncoding="utf-8">
 												<c:param name="param_atchFileId" value="${list.docAtchFileId}" />
 											</c:import>
+
+											<!-- 결과보고서 삭제 -->
+											<c:if test="${!empty list.docAtchFileId}">
+											<button type="button" class="btn_type06" onclick="fncAttachFileDelete('${list.docAtchFileId}', '${list.prcsAplctPrdOrd}', 'rprtFndth')">결과보고서 삭제</button>
+											</c:if>
+											
+											<!-- 결과보고서 등록 -->
+											<c:if test="${empty list.docAtchFileId}">
+											<button type="button" class="btn_type06" onclick="fncAttachFileCreate('${list.docAtchFileId}', '${list.prcsAplctPrdOrd}', 'rprtFndth')">결과보고서 등록</button>
+											</c:if>
+											
 										</td>
 										<td>										
 											<button type="button" class="btn_type01" onclick="fn_delInstr('<c:out value="${list.userId }" />')">삭제</button>