From 6ae270e042ca05c770cf6ec48248b47269f98d76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Tue, 9 May 2023 13:39:34 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B2=A9=EB=B3=B4=EC=88=98=EC=A7=91=ED=99=9C?= =?UTF-8?q?=EB=8F=99=20>=20=EB=AA=A8=EB=8B=88=ED=84=B0=EB=A7=81=20?= =?UTF-8?q?=ED=95=98=EC=9C=84=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../monitoring/MonitoringController.java | 14 ++++++++++- .../MonitoringDesignationRepository.java | 7 +++++- .../MonitoringResultRepository.java | 7 +++++- .../monitoring/service/MonitoringService.java | 12 +++++++--- .../mybatisMapper/MonitoringMapper.xml | 2 ++ .../js/igActivities/monitoring/designation.js | 23 +++++++++++++++++++ .../js/igActivities/monitoring/result.js | 23 +++++++++++++++++++ .../monitoring/designationViewModal.html | 6 ++++- .../monitoring/resultViewModal.html | 6 ++++- 9 files changed, 92 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/MonitoringController.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/MonitoringController.java index 25f8c63f..cde29d00 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/MonitoringController.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/MonitoringController.java @@ -2,6 +2,7 @@ package com.dbnt.faisp.main.fpiMgt.monitoring; import com.dbnt.faisp.main.authMgt.service.AuthMgtService; import com.dbnt.faisp.main.codeMgt.service.CodeMgtService; +import com.dbnt.faisp.main.fpiMgt.affair.model.AffairBoard; import com.dbnt.faisp.main.fpiMgt.affairPlan.model.PlanApprv; import com.dbnt.faisp.main.fpiMgt.affairPlan.model.PlanBoard; import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.model.OperationPlan; @@ -159,7 +160,13 @@ public class MonitoringController { // 첩보수집활동 > 해양외사모니 apprv.setSaveDt(LocalDateTime.now()); return monitoringService.designationStateChange(apprv); } - + + @PostMapping("/deleteMonitoringDesignation") + @ResponseBody + public void deleteMonitoringDesignation (@RequestBody MonitoringDesignation md){ + monitoringService.deleteMonitoringDesignation(md.getMdKey()); + } + @GetMapping("/resultList/{type}") public ModelAndView resultList(@AuthenticationPrincipal UserInfo loginUser,@PathVariable("type") String type, MonitoringResult mr){ ModelAndView mav = new ModelAndView("igActivities/monitoring/resultList"); @@ -303,5 +310,10 @@ public class MonitoringController { // 첩보수집활동 > 해양외사모니 return monitoringService.resultStateChange(apprv); } + @PostMapping("/deleteMonitoringResult") + @ResponseBody + public void deleteMonitoringResult (@RequestBody MonitoringResult mr){ + monitoringService.deleteMonitoringResult(mr.getMrKey()); + } } diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/repository/MonitoringDesignationRepository.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/repository/MonitoringDesignationRepository.java index bc73b7da..b9070107 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/repository/MonitoringDesignationRepository.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/repository/MonitoringDesignationRepository.java @@ -3,11 +3,16 @@ package com.dbnt.faisp.main.fpiMgt.monitoring.repository; import com.dbnt.faisp.main.fpiMgt.monitoring.model.MonitoringDesignation; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; import java.util.List; import java.util.Optional; public interface MonitoringDesignationRepository extends JpaRepository { - + + @Modifying(clearAutomatically = true) + @Query("update MonitoringDesignation set mdState = :mdState where mdKey = :mdKey") + void bulkModifyingByMdKeyToMdState(Integer mdKey, String mdState); } diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/repository/MonitoringResultRepository.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/repository/MonitoringResultRepository.java index 2715150d..53b05b85 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/repository/MonitoringResultRepository.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/repository/MonitoringResultRepository.java @@ -3,11 +3,16 @@ package com.dbnt.faisp.main.fpiMgt.monitoring.repository; import com.dbnt.faisp.main.fpiMgt.monitoring.model.MonitoringResult; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; import java.util.List; import java.util.Optional; public interface MonitoringResultRepository extends JpaRepository { - + + @Modifying(clearAutomatically = true) + @Query("update MonitoringResult set mrState = :mrState where mrKey = :mrKey") + void bulkModifyingByMrKeyToMrState(Integer mrKey, String mrState); } diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/service/MonitoringService.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/service/MonitoringService.java index bbae358c..ffc1970c 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/service/MonitoringService.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/service/MonitoringService.java @@ -164,6 +164,11 @@ public class MonitoringService extends BaseService { public MonitoringDesignationFile selectDesignationFile(Integer parentKey, Integer fileSeq) { return monitoringDesignationFileRepository.findById(new monitoringDesignationFileId(parentKey,fileSeq)).orElse(null); } + + @Transactional + public void deleteMonitoringDesignation(Integer mdKey) { + monitoringDesignationRepository.bulkModifyingByMdKeyToMdState(mdKey, "DST008"); + } @Transactional public Integer saveResult(MonitoringResult mr, List deleteFileSeq) { @@ -338,7 +343,8 @@ public class MonitoringService extends BaseService { return monitoringReportRepository.findById(new MonitoringReportId(parentKey,infoSeq)).orElse(null); } - - - + @Transactional + public void deleteMonitoringResult(Integer mrKey) { + monitoringResultRepository.bulkModifyingByMrKeyToMrState(mrKey, "DST008"); + } } diff --git a/src/main/resources/mybatisMapper/MonitoringMapper.xml b/src/main/resources/mybatisMapper/MonitoringMapper.xml index d488345c..0016b2fc 100644 --- a/src/main/resources/mybatisMapper/MonitoringMapper.xml +++ b/src/main/resources/mybatisMapper/MonitoringMapper.xml @@ -6,6 +6,7 @@ + md_state <> 'DST008' and md.wrt_user_seq = #{wrtUserSeq} @@ -99,6 +100,7 @@ + and mr_state <> 'DST008' and mr.wrt_user_seq = #{wrtUserSeq} diff --git a/src/main/resources/static/js/igActivities/monitoring/designation.js b/src/main/resources/static/js/igActivities/monitoring/designation.js index ac5002c0..6b5606f4 100644 --- a/src/main/resources/static/js/igActivities/monitoring/designation.js +++ b/src/main/resources/static/js/igActivities/monitoring/designation.js @@ -62,6 +62,29 @@ $(document).on('click', '#editBtn', function (){ getDesignationEditModal($(this).attr("data-mdkey")); }) +$(document).on('click', '#deleteBtn', function (){ + if(confirm("삭제하시겠습니까?\n되돌릴 수 없습니다.")){ + contentFade("in"); + $.ajax({ + type : 'POST', + data : JSON.stringify({mdKey: $(this).attr('data-mdkey')}), + url : "/monitoring/deleteMonitoringDesignation", + contentType: 'application/json', + beforeSend: function (xhr){ + xhr.setRequestHeader($("[name='_csrf_header']").val(), $("[name='_csrf']").val()); + }, + success : function(result) { + alert("삭제되었습니다."); + location.reload(); + }, + error : function(xhr, status) { + alert("삭제를 실패하였습니다.") + contentFade("out"); + } + }) + } +}) + $(document).on('click', '#saveBtn', function (){ if(!$("#mdDt").val()){ alert("대상지정일을 입력해주세요."); diff --git a/src/main/resources/static/js/igActivities/monitoring/result.js b/src/main/resources/static/js/igActivities/monitoring/result.js index 89df4ccf..eefb45f9 100644 --- a/src/main/resources/static/js/igActivities/monitoring/result.js +++ b/src/main/resources/static/js/igActivities/monitoring/result.js @@ -129,6 +129,29 @@ $(document).on('click', '#editBtn', function (){ getResultEditModal($(this).attr("data-mrkey")); }) +$(document).on('click', '#deleteBtn', function (){ + if(confirm("삭제하시겠습니까?\n되돌릴 수 없습니다.")){ + contentFade("in"); + $.ajax({ + type : 'POST', + data : JSON.stringify({mrKey: $(this).attr('data-mrkey')}), + url : "/monitoring/deleteMonitoringResult", + contentType: 'application/json', + beforeSend: function (xhr){ + xhr.setRequestHeader($("[name='_csrf_header']").val(), $("[name='_csrf']").val()); + }, + success : function(result) { + alert("삭제되었습니다."); + location.reload(); + }, + error : function(xhr, status) { + alert("삭제를 실패하였습니다.") + contentFade("out"); + } + }) + } +}) + $(document).on('click', '#saveBtn', function (){ if($("#clearTitle").val() == ""){ alert("결과보고서 제목을 입력해주세요"); diff --git a/src/main/resources/templates/igActivities/monitoring/designationViewModal.html b/src/main/resources/templates/igActivities/monitoring/designationViewModal.html index aa65d1e7..d95def1d 100644 --- a/src/main/resources/templates/igActivities/monitoring/designationViewModal.html +++ b/src/main/resources/templates/igActivities/monitoring/designationViewModal.html @@ -146,7 +146,11 @@
- + + + + +
diff --git a/src/main/resources/templates/igActivities/monitoring/resultViewModal.html b/src/main/resources/templates/igActivities/monitoring/resultViewModal.html index 10756994..c9ce2546 100644 --- a/src/main/resources/templates/igActivities/monitoring/resultViewModal.html +++ b/src/main/resources/templates/igActivities/monitoring/resultViewModal.html @@ -272,7 +272,11 @@
- + + + + +