From c9a5e646469457ab2b7ca5cf3280a0dadbff277f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Mon, 8 May 2023 18:06:02 +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=EA=B2=BD=EC=B0=B0=20?= =?UTF-8?q?=EA=B2=AC=EB=AC=B8=EA=B4=80=EB=A6=AC=20>=20=EA=B3=84=ED=9A=8D?= =?UTF-8?q?=EC=88=98=EB=A6=BD=20=EC=82=AD=EC=A0=9C=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 --- .../fpiMgt/affairPlan/PlanController.java | 6 +++++ .../repository/PlanBoardRepository.java | 5 ++++ .../affairPlan/service/PlanService.java | 5 ++++ .../resources/mybatisMapper/PlanMapper.xml | 1 + .../static/js/igActivities/fpiMgt/planMgt.js | 23 ++++++++++++++++ .../fpiMgt/affairPlan/planViewModal.html | 26 ++++++++++++------- 6 files changed, 57 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/PlanController.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/PlanController.java index aae766e6..1ddbd0f2 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/PlanController.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/PlanController.java @@ -208,6 +208,12 @@ public class PlanController { // 첩보수집활동 > 외사경찰 견문관리 return planService.planStateChange(apprv); } + @PostMapping("/deletePlan") + @ResponseBody + public void deletePlan(@RequestBody PlanBoard planBoard){ + planService.deletePlan(planBoard.getPlanKey()); + } + @GetMapping("/planBoardJson") public PlanBoard planBoardJson(PlanBoard planBoard, HttpSession session){ Map> codeMap = (Map>) session.getAttribute("commonCode"); diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/repository/PlanBoardRepository.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/repository/PlanBoardRepository.java index eb496c9c..c6ec74ba 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/repository/PlanBoardRepository.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/repository/PlanBoardRepository.java @@ -2,8 +2,13 @@ package com.dbnt.faisp.main.fpiMgt.affairPlan.repository; import com.dbnt.faisp.main.fpiMgt.affairPlan.model.PlanBoard; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; public interface PlanBoardRepository extends JpaRepository { + @Modifying(clearAutomatically = true) + @Query("update PlanBoard set planState = :planState where planKey = :planKey") + void bulkModifyingByPlanKeyToStatus(Integer planKey, String planState); } diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/service/PlanService.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/service/PlanService.java index d7e41ffd..1febe7af 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/service/PlanService.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/service/PlanService.java @@ -157,4 +157,9 @@ public class PlanService extends BaseService { // 월간계획 planBoard.setWrtUserGrd(Utils.searchCodeValue(planBoard.getWrtUserGrd(), codeMap.get("JT"))); return planBoard; } + + @Transactional + public void deletePlan(Integer planKey) { + planBoardRepository.bulkModifyingByPlanKeyToStatus(planKey, "DST008"); + } } diff --git a/src/main/resources/mybatisMapper/PlanMapper.xml b/src/main/resources/mybatisMapper/PlanMapper.xml index 29a6f345..3ebf558a 100644 --- a/src/main/resources/mybatisMapper/PlanMapper.xml +++ b/src/main/resources/mybatisMapper/PlanMapper.xml @@ -6,6 +6,7 @@ + plan_state <> 'DST008' and a.wrt_user_seq = #{wrtUserSeq} diff --git a/src/main/resources/static/js/igActivities/fpiMgt/planMgt.js b/src/main/resources/static/js/igActivities/fpiMgt/planMgt.js index 39a68b4c..185d8c34 100644 --- a/src/main/resources/static/js/igActivities/fpiMgt/planMgt.js +++ b/src/main/resources/static/js/igActivities/fpiMgt/planMgt.js @@ -34,6 +34,29 @@ $(document).on('click', '#editPlanBtn', function (){ getPlanEditModal(Number($("#planViewBody").find("[name='planKey']").val())); }) +$(document).on('click', '#deletePlanBtn', function (){ + if(confirm("삭제하시겠습니까?\n되돌릴 수 없습니다.")){ + contentFade("in"); + $.ajax({ + type : 'POST', + data : JSON.stringify({planKey: $("#viewModalPlanKey").val()}), + url : "/affairPlan/deletePlan", + 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', '#planAddBtn', function (){ $("#planDiv").append("") }) diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planViewModal.html b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planViewModal.html index 181348dc..b890d119 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planViewModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planViewModal.html @@ -164,15 +164,23 @@ -
- - - - - - +
+
+ + + + - - +
+
+ + + + + + + + +
\ No newline at end of file