From e9cdca0be2453313edb55592cb229ec5893d7744 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 10:35:31 +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=EC=99=B8=EC=82=AC=EC=B2=A9=EB=B3=B4=EB=A7=9D?= =?UTF-8?q?=20=EA=B2=AC=EB=AC=B8=EA=B4=80=EB=A6=AC=20=ED=95=98=EC=9C=84=20?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=82=AD=EC=A0=9C=20=EA=B8=B0?= =?UTF-8?q?=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 --- .../IntelligenceNetworkController.java | 20 +++++++++++- .../FireExtensionReportRepository.java | 6 +++- .../IntelligenceAnalyzeRepository.java | 8 +++-- .../repository/OperationPlanRepository.java | 7 +++-- .../service/IntelligenceNetworkService.java | 17 ++++++++-- .../IntelligenceNetworkMapper.xml | 3 ++ .../js/igActivities/fpiMgt/affairMgt.js | 6 +++- .../fireExtensionReport.js | 23 ++++++++++++++ .../intelligenceAnalyze.js | 23 ++++++++++++++ .../intelligenceNetwork/operationPlan.js | 23 ++++++++++++++ .../fireExtensionReportViewModal.html | 30 ++++++++++-------- .../intelligenceAnalyzeViewModal.html | 6 +++- .../operationPlanViewModal.html | 31 ++++++++++--------- 13 files changed, 165 insertions(+), 38 deletions(-) diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/IntelligenceNetworkController.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/IntelligenceNetworkController.java index 989d0bbf..3b06a011 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/IntelligenceNetworkController.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/IntelligenceNetworkController.java @@ -156,6 +156,12 @@ public class IntelligenceNetworkController { apprv.setSaveDt(LocalDateTime.now()); return intelligenceNetworkService.operationPlanStateChange(apprv); } + + @PostMapping("/deleteOperationPlan") + @ResponseBody + public void deleteOperationPlan (@RequestBody OperationPlan plan){ + intelligenceNetworkService.deleteOperationPlan(plan.getOpKey()); + } @GetMapping("/intelligenceAnalyzeList/{type}") public ModelAndView intelligenceAnalyzeList(@AuthenticationPrincipal UserInfo loginUser,@PathVariable("type") String type, IntelligenceAnalyze ia){ @@ -301,7 +307,14 @@ public class IntelligenceNetworkController { apprv.setSaveDt(LocalDateTime.now()); return intelligenceNetworkService.intelligenceAnalyzeChange(apprv); } - + + @PostMapping("/deleteIntelligenceAnalyze") + @ResponseBody + public void deleteIntelligenceAnalyze (@RequestBody IntelligenceAnalyze intelligenceAnalyze){ + intelligenceNetworkService.deleteIntelligenceAnalyze(intelligenceAnalyze.getIaKey()); + } + + @GetMapping("/fireExtensionReportList/{type}") public ModelAndView fireExtensionReportList(@AuthenticationPrincipal UserInfo loginUser,@PathVariable("type") String type, FireExtensionReport fer){ ModelAndView mav = new ModelAndView("igActivities/intelligenceNetwork/fireExtensionReportList"); @@ -447,5 +460,10 @@ public class IntelligenceNetworkController { return intelligenceNetworkService.fireExtensionReportStateChange(apprv); } + @PostMapping("/deleteFireExtensionReport") + @ResponseBody + public void deleteFireExtensionReport (@RequestBody FireExtensionReport feReport){ + intelligenceNetworkService.deleteFireExtensionReport(feReport.getFerKey()); + } } diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/repository/FireExtensionReportRepository.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/repository/FireExtensionReportRepository.java index 5aeef80a..4e2c3936 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/repository/FireExtensionReportRepository.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/repository/FireExtensionReportRepository.java @@ -3,6 +3,8 @@ package com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.repository; import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.model.FireExtensionReport; 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; @@ -12,5 +14,7 @@ public interface FireExtensionReportRepository extends JpaRepository findByFerKey(Integer ferKey); - + @Modifying(clearAutomatically = true) + @Query("update FireExtensionReport set ferState = :ferState where ferKey = :ferKey") + void bulkModifyingByFerKeyToFerState(Integer ferKey, String ferState); } diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/repository/IntelligenceAnalyzeRepository.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/repository/IntelligenceAnalyzeRepository.java index 5f8c34e0..c193e8f2 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/repository/IntelligenceAnalyzeRepository.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/repository/IntelligenceAnalyzeRepository.java @@ -3,9 +3,13 @@ package com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.repository; import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.model.IntelligenceAnalyze; import org.springframework.data.jpa.repository.JpaRepository; - +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; public interface IntelligenceAnalyzeRepository extends JpaRepository { - + + @Modifying(clearAutomatically = true) + @Query("update IntelligenceAnalyze set iaState = :iaState where iaKey = :iaKey") + void bulkModifyingByIaKeyToIaState(Integer iaKey, String iaState); } diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/repository/OperationPlanRepository.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/repository/OperationPlanRepository.java index 3b1a3814..f3d919a1 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/repository/OperationPlanRepository.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/repository/OperationPlanRepository.java @@ -3,10 +3,13 @@ package com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.repository; import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.model.OperationPlan; import org.springframework.data.jpa.repository.JpaRepository; - +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; public interface OperationPlanRepository extends JpaRepository { - + @Modifying(clearAutomatically = true) + @Query("update OperationPlan set opState = :opState where opKey = :opKey") + void bulkModifyingByOpKeyToOpStatus(Integer opKey, String opState); } diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/service/IntelligenceNetworkService.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/service/IntelligenceNetworkService.java index a55167fd..0ace993a 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/service/IntelligenceNetworkService.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/service/IntelligenceNetworkService.java @@ -136,6 +136,11 @@ public class IntelligenceNetworkService extends BaseService { return operationPlanFileRepository.findById(new OperationPlanFileId(parentKey,fileSeq)).orElse(null); } + @Transactional + public void deleteOperationPlan(Integer opKey) { + operationPlanRepository.bulkModifyingByOpKeyToOpStatus(opKey, "DST008"); + } + public IntelligenceAnalyze selectAffairCnt(IntelligenceAnalyze ia) { return intelligenceNetworkMapper.selectAffairCnt(ia); } @@ -197,6 +202,11 @@ public class IntelligenceNetworkService extends BaseService { } return apprv.getIaKey(); } + + @Transactional + public void deleteIntelligenceAnalyze(Integer iaKey) { + intelligenceAnalyzeRepository.bulkModifyingByIaKeyToIaState(iaKey, "DST008"); + } @Transactional public Integer saveFireExtensionReport(FireExtensionReport fer) { @@ -246,8 +256,9 @@ public class IntelligenceNetworkService extends BaseService { } return apprv.getFerKey(); } - - - + @Transactional + public void deleteFireExtensionReport(Integer ferKey) { + fireExtensionReportRepository.bulkModifyingByFerKeyToFerState(ferKey, "DST008"); + } } diff --git a/src/main/resources/mybatisMapper/IntelligenceNetworkMapper.xml b/src/main/resources/mybatisMapper/IntelligenceNetworkMapper.xml index fcbc714c..361b7709 100644 --- a/src/main/resources/mybatisMapper/IntelligenceNetworkMapper.xml +++ b/src/main/resources/mybatisMapper/IntelligenceNetworkMapper.xml @@ -6,6 +6,7 @@ + op_state <> 'DST008' and op.wrt_user_seq = #{wrtUserSeq} @@ -129,6 +130,7 @@ + ia_state <> 'DST008' and wrt_user_seq = #{wrtUserSeq} @@ -415,6 +417,7 @@ + and fer_state <> 'DST008' and fer.wrt_user_seq = #{wrtUserSeq} diff --git a/src/main/resources/static/js/igActivities/fpiMgt/affairMgt.js b/src/main/resources/static/js/igActivities/fpiMgt/affairMgt.js index 642873bc..3de64ad4 100644 --- a/src/main/resources/static/js/igActivities/fpiMgt/affairMgt.js +++ b/src/main/resources/static/js/igActivities/fpiMgt/affairMgt.js @@ -241,7 +241,11 @@ $(document).on('click', '#deleteBtn', function (){ }, success : function(result) { alert("삭제되었습니다."); - location.reload(); + let searchParam = location.search; + if(searchParam.includes("refDocKey")){ + searchParam = searchParam.substring(0, searchParam.indexOf("&")) + } + location.href = location.pathname+searchParam; }, error : function(xhr, status) { alert("삭제를 실패하였습니다.") diff --git a/src/main/resources/static/js/igActivities/intelligenceNetwork/fireExtensionReport.js b/src/main/resources/static/js/igActivities/intelligenceNetwork/fireExtensionReport.js index 4f64fa15..2d46046d 100644 --- a/src/main/resources/static/js/igActivities/intelligenceNetwork/fireExtensionReport.js +++ b/src/main/resources/static/js/igActivities/intelligenceNetwork/fireExtensionReport.js @@ -111,6 +111,29 @@ $(document).on('click', '#editBtn', function (){ getFireExtensionReportEditModal($(this).attr("data-ferkey")); }) +$(document).on('click', '#deleteBtn', function (){ + if(confirm("삭제하시겠습니까?\n되돌릴 수 없습니다.")){ + contentFade("in"); + $.ajax({ + type : 'POST', + data : JSON.stringify({ferKey: $(this).attr('data-ferKey')}), + url : "/intelligenceNetwork/deleteFireExtensionReport", + 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(!$("input[name=opKey]").val()){ alert("정보협력자를 선택해주세요."); diff --git a/src/main/resources/static/js/igActivities/intelligenceNetwork/intelligenceAnalyze.js b/src/main/resources/static/js/igActivities/intelligenceNetwork/intelligenceAnalyze.js index 7dfbc0ba..b16dbceb 100644 --- a/src/main/resources/static/js/igActivities/intelligenceNetwork/intelligenceAnalyze.js +++ b/src/main/resources/static/js/igActivities/intelligenceNetwork/intelligenceAnalyze.js @@ -126,6 +126,29 @@ $(document).on('click', '#editBtn', function (){ getIntelligenceAnalyzeEditModal($(this).attr("data-iakey")); }) +$(document).on('click', '#deleteBtn', function (){ + if(confirm("삭제하시겠습니까?\n되돌릴 수 없습니다.")){ + contentFade("in"); + $.ajax({ + type : 'POST', + data : JSON.stringify({iaKey: $(this).attr('data-iakey')}), + url : "/intelligenceNetwork/deleteIntelligenceAnalyze", + 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(!$("#iaSdate").val()){ alert("실적시작일을 입력해주세요."); diff --git a/src/main/resources/static/js/igActivities/intelligenceNetwork/operationPlan.js b/src/main/resources/static/js/igActivities/intelligenceNetwork/operationPlan.js index b3f8c2bf..5ac1192d 100644 --- a/src/main/resources/static/js/igActivities/intelligenceNetwork/operationPlan.js +++ b/src/main/resources/static/js/igActivities/intelligenceNetwork/operationPlan.js @@ -49,6 +49,29 @@ $(document).on('click', '#editBtn', function (){ getOperationPlanEditModal($(this).attr("data-opkey")); }) +$(document).on('click', '#deleteBtn', function (){ + if(confirm("삭제하시겠습니까?\n되돌릴 수 없습니다.")){ + contentFade("in"); + $.ajax({ + type : 'POST', + data : JSON.stringify({opKey: $(this).attr('data-opkey')}), + url : "/intelligenceNetwork/deleteOperationPlan", + 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(!$("#opSdate").val()){ alert("운용시작일을 입력해주세요."); diff --git a/src/main/resources/templates/igActivities/intelligenceNetwork/fireExtensionReportViewModal.html b/src/main/resources/templates/igActivities/intelligenceNetwork/fireExtensionReportViewModal.html index d52c900d..a40a7d6d 100644 --- a/src/main/resources/templates/igActivities/intelligenceNetwork/fireExtensionReportViewModal.html +++ b/src/main/resources/templates/igActivities/intelligenceNetwork/fireExtensionReportViewModal.html @@ -123,18 +123,22 @@
-
- -
-
- - - - - - - +
+ + + + - -
+
+
+ + + + + + + + + +
\ No newline at end of file diff --git a/src/main/resources/templates/igActivities/intelligenceNetwork/intelligenceAnalyzeViewModal.html b/src/main/resources/templates/igActivities/intelligenceNetwork/intelligenceAnalyzeViewModal.html index f1416e4f..c298e9d0 100644 --- a/src/main/resources/templates/igActivities/intelligenceNetwork/intelligenceAnalyzeViewModal.html +++ b/src/main/resources/templates/igActivities/intelligenceNetwork/intelligenceAnalyzeViewModal.html @@ -189,7 +189,11 @@
- + + + + +
diff --git a/src/main/resources/templates/igActivities/intelligenceNetwork/operationPlanViewModal.html b/src/main/resources/templates/igActivities/intelligenceNetwork/operationPlanViewModal.html index 17f6720d..65fae2e9 100644 --- a/src/main/resources/templates/igActivities/intelligenceNetwork/operationPlanViewModal.html +++ b/src/main/resources/templates/igActivities/intelligenceNetwork/operationPlanViewModal.html @@ -145,19 +145,22 @@
-
- -
-
- - - - - - - +
+ + + + - -
- +
+
+ + + + + + + + + +
\ No newline at end of file