From 99bb9bd90fd95a3677c4107ad16f9058356daab1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Mon, 24 Apr 2023 10:44:58 +0900 Subject: [PATCH] =?UTF-8?q?=EC=99=B8=EC=82=AC=EC=A0=95=EB=B3=B4=EB=B3=B4?= =?UTF-8?q?=EA=B3=A0=20=EC=82=AD=EC=A0=9C=EA=B8=B0=EB=8A=A5=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80.=20=EB=82=B4=EC=9A=A9=20=EA=B8=B0=EB=B3=B8=20?= =?UTF-8?q?=EB=86=92=EC=9D=B4=20=EC=88=98=EC=A0=95.=20sri=20=EB=82=B4?= =?UTF-8?q?=EC=9A=A9=20=EA=B8=B0=EB=B3=B8=20=EB=86=92=EC=9D=B4=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../faisp/main/faRpt/FaRptController.java | 7 +++++- .../repository/FaRptBoardRepository.java | 6 ++++- .../main/faRpt/service/FaRptService.java | 5 ++++ .../resources/mybatisMapper/FaRptMapper.xml | 1 + src/main/resources/static/js/faRpt/faRpt.js | 23 +++++++++++++++++++ .../templates/faRpt/faRptEditModal.html | 14 +++++------ .../templates/faRpt/faRptViewModal.html | 5 ++-- .../resources/templates/sri/sriViewModal.html | 6 ++--- 8 files changed, 53 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/dbnt/faisp/main/faRpt/FaRptController.java b/src/main/java/com/dbnt/faisp/main/faRpt/FaRptController.java index bca47b01..bbf8ce0e 100644 --- a/src/main/java/com/dbnt/faisp/main/faRpt/FaRptController.java +++ b/src/main/java/com/dbnt/faisp/main/faRpt/FaRptController.java @@ -91,7 +91,6 @@ public class FaRptController { faRptBoard.setWrtUserNm(loginUser.getUserNm()); faRptBoard.setWrtDt(LocalDateTime.now()); } - mav.addObject("frCategoryList", codeMgtService.selectCodeMgtList("FRC")); mav.addObject("faRpt", faRptBoard); return mav; } @@ -122,4 +121,10 @@ public class FaRptController { mav.addObject("userList", userList); return mav; } + + @PostMapping("/deleteFaRpt") + @ResponseBody + public void deleteFaRpt (@RequestBody FaRptBoard faRpt){ + faRptService.deleteFaRpt(faRpt.getFaRptKey()); + } } diff --git a/src/main/java/com/dbnt/faisp/main/faRpt/repository/FaRptBoardRepository.java b/src/main/java/com/dbnt/faisp/main/faRpt/repository/FaRptBoardRepository.java index bc913935..f11010c8 100644 --- a/src/main/java/com/dbnt/faisp/main/faRpt/repository/FaRptBoardRepository.java +++ b/src/main/java/com/dbnt/faisp/main/faRpt/repository/FaRptBoardRepository.java @@ -2,8 +2,12 @@ package com.dbnt.faisp.main.faRpt.repository; import com.dbnt.faisp.main.faRpt.model.FaRptBoard; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; public interface FaRptBoardRepository extends JpaRepository { - + @Modifying(clearAutomatically = true) + @Query("update FaRptBoard set status = :status where faRptKey = :faRptKey") + void bulkModifyingByFaRptKeyToStatus(Integer faRptKey, String status); } diff --git a/src/main/java/com/dbnt/faisp/main/faRpt/service/FaRptService.java b/src/main/java/com/dbnt/faisp/main/faRpt/service/FaRptService.java index 04a302a7..fc5f8b04 100644 --- a/src/main/java/com/dbnt/faisp/main/faRpt/service/FaRptService.java +++ b/src/main/java/com/dbnt/faisp/main/faRpt/service/FaRptService.java @@ -145,4 +145,9 @@ public class FaRptService extends BaseService { public FileInfo selectFaRptFile(Integer faRptKey, Integer fileSeq) { return faRptFileRepository.findById(new FaRptFile.FaRptFileId(faRptKey, fileSeq)).orElse(null); } + + @Transactional + public void deleteFaRpt(Integer faRptKey) { + faRptBoardRepository.bulkModifyingByFaRptKeyToStatus(faRptKey, "DST008"); + } } \ No newline at end of file diff --git a/src/main/resources/mybatisMapper/FaRptMapper.xml b/src/main/resources/mybatisMapper/FaRptMapper.xml index 81605649..ecb22629 100644 --- a/src/main/resources/mybatisMapper/FaRptMapper.xml +++ b/src/main/resources/mybatisMapper/FaRptMapper.xml @@ -6,6 +6,7 @@ + a.status <> 'DST008' and a.wrt_user_seq = #{wrtUserSeq} diff --git a/src/main/resources/static/js/faRpt/faRpt.js b/src/main/resources/static/js/faRpt/faRpt.js index cc5b89ae..094490a5 100644 --- a/src/main/resources/static/js/faRpt/faRpt.js +++ b/src/main/resources/static/js/faRpt/faRpt.js @@ -92,6 +92,29 @@ $(document).on('click', '#reSendBtn', function (){ getFaRptEditModal(faRpt); }) +$(document).on('click', '#deleteBtn', function (){ + if(confirm("삭제하시겠습니까?\n되돌릴 수 없습니다.")){ + contentFade("in"); + $.ajax({ + type : 'POST', + data : JSON.stringify({faRptKey: $(this).attr('data-farptkey')}), + url : "/faRpt/deleteFaRpt", + 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"); + } + }) + } +}) + function getFaRptViewModal(faRptKey){ $.ajax({ url: '/faRpt/faRptViewModal', diff --git a/src/main/resources/templates/faRpt/faRptEditModal.html b/src/main/resources/templates/faRpt/faRptEditModal.html index f106457d..0d3e79fa 100644 --- a/src/main/resources/templates/faRpt/faRptEditModal.html +++ b/src/main/resources/templates/faRpt/faRptEditModal.html @@ -32,8 +32,8 @@
@@ -100,14 +100,14 @@
- - + + - + -
diff --git a/src/main/resources/templates/faRpt/faRptViewModal.html b/src/main/resources/templates/faRpt/faRptViewModal.html index 08b514fc..88666fcc 100644 --- a/src/main/resources/templates/faRpt/faRptViewModal.html +++ b/src/main/resources/templates/faRpt/faRptViewModal.html @@ -37,7 +37,7 @@
-
+
@@ -113,7 +113,8 @@
- + + diff --git a/src/main/resources/templates/sri/sriViewModal.html b/src/main/resources/templates/sri/sriViewModal.html index 7bbfde71..42ae7f55 100644 --- a/src/main/resources/templates/sri/sriViewModal.html +++ b/src/main/resources/templates/sri/sriViewModal.html @@ -54,7 +54,7 @@
-
+
@@ -131,8 +131,8 @@
- - + +