From 4d706655292402a3dd16dac882cca4573f5334e1 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:30:32 +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=EC=B2=AD=EC=82=B0?= =?UTF-8?q?=EB=B3=B4=EA=B3=A0=EC=84=9C=20=EC=82=AD=EC=A0=9C=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 --- .../fpiMgt/affairResult/ResultController.java | 7 +++++ .../repository/ResultBoardRepository.java | 5 ++++ .../affairResult/service/ResultService.java | 5 ++++ .../resources/mybatisMapper/ResultMapper.xml | 1 + .../js/igActivities/fpiMgt/resultMgt.js | 23 +++++++++++++++ .../fpiMgt/affairResult/resultViewModal.html | 28 ++++++++++++------- 6 files changed, 59 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/ResultController.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/ResultController.java index 45901c27..b4c2c0fc 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/ResultController.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/ResultController.java @@ -260,6 +260,13 @@ public class ResultController { // 첩보수집활동 > 외사경찰 견문관 return mav; } + @PostMapping("/deleteResult") + @ResponseBody + public void deleteResult (@RequestBody ResultBoard resultBoard){ + resultService.deleteResult(resultBoard.getResultKey()); + } + + @GetMapping("/resultBoardJson") public ResultBoard resultBoardJson(ResultBoard resultBoard, HttpSession session){ Map> codeMap = (Map>) session.getAttribute("commonCode"); diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/repository/ResultBoardRepository.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/repository/ResultBoardRepository.java index 5439a7cd..3f36921a 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/repository/ResultBoardRepository.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/repository/ResultBoardRepository.java @@ -2,8 +2,13 @@ package com.dbnt.faisp.main.fpiMgt.affairResult.repository; import com.dbnt.faisp.main.fpiMgt.affairResult.model.ResultBoard; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; public interface ResultBoardRepository extends JpaRepository { + @Modifying(clearAutomatically = true) + @Query("update ResultBoard set resultState = :resultState where resultKey = :resultKey") + void bulkModifyingByResultKeyToResultStatus(Integer resultKey, String resultState); } diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/service/ResultService.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/service/ResultService.java index f7f367f1..b86a8667 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/service/ResultService.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/service/ResultService.java @@ -206,4 +206,9 @@ public class ResultService extends BaseService { // 월간계획 } resultToPlanRepository.saveAll(resultToPlanList); } + + @Transactional + public void deleteResult(Integer resultKey) { + resultBoardRepository.bulkModifyingByResultKeyToResultStatus(resultKey, "DST008"); + } } diff --git a/src/main/resources/mybatisMapper/ResultMapper.xml b/src/main/resources/mybatisMapper/ResultMapper.xml index ec5c3716..424ff24d 100644 --- a/src/main/resources/mybatisMapper/ResultMapper.xml +++ b/src/main/resources/mybatisMapper/ResultMapper.xml @@ -6,6 +6,7 @@ + result_state <> 'DST008' and a.wrt_user_seq = #{wrtUserSeq} diff --git a/src/main/resources/static/js/igActivities/fpiMgt/resultMgt.js b/src/main/resources/static/js/igActivities/fpiMgt/resultMgt.js index e75e28b2..c3ddfcad 100644 --- a/src/main/resources/static/js/igActivities/fpiMgt/resultMgt.js +++ b/src/main/resources/static/js/igActivities/fpiMgt/resultMgt.js @@ -34,6 +34,29 @@ $(document).on('click', '#editResultBtn', function (){ getResultEditModal(Number($("#resultViewBody").find("[name='resultKey']").val())); }) +$(document).on('click', '#deleteResultBtn', function (){ + if(confirm("삭제하시겠습니까?\n되돌릴 수 없습니다.")){ + contentFade("in"); + $.ajax({ + type : 'POST', + data : JSON.stringify({resultKey: $("#viewModalResultKey").val()}), + url : "/affairResult/deleteResult", + 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', '#resultAddBtn', function (){ $("#resultDiv").append("") }) diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultViewModal.html b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultViewModal.html index 4a1d6219..a80f0a9d 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultViewModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultViewModal.html @@ -296,15 +296,23 @@ -
- - - - - - - +
+
+ + + + - - +
+
+ + + + + + + + + +
\ No newline at end of file