From 06168d71de0633e6f68b5895476b43099b528759 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 10:50:16 +0900 Subject: [PATCH] =?UTF-8?q?=EC=99=B8=EC=82=AC=EC=88=98=EC=82=AC=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=20>=20=EC=82=AC=EA=B1=B4=EB=B3=B4=EA=B3=A0=EC=84=9C?= =?UTF-8?q?=20=EC=82=AD=EC=A0=9C=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= =?UTF-8?q?.=20=EC=99=B8=EC=82=AC=EB=B0=A9=EC=B2=A9=EA=B4=80=EB=A6=AC=20>?= =?UTF-8?q?=20=EB=B0=A9=EC=B2=A9=EA=B3=B5=EC=9E=91=20=EC=82=AD=EC=A0=9C=20?= =?UTF-8?q?=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 --- .../faisp/main/budget/BudgetController.java | 10 -------- .../CounterIntelligenceController.java | 8 +++---- .../service/CounterIntelligenceService.java | 2 +- .../boardInvestigation/IvsgtController.java | 6 +++++ .../InvestigationBoardRepository.java | 5 ++++ .../service/IvsgtService.java | 5 ++++ .../InvestigationBoardMapper.xml | 2 ++ src/main/resources/static/js/ivsgt/ivsgt.js | 23 +++++++++++++++++++ .../templates/ivsgt/ivsgtViewModal.html | 4 +++- 9 files changed, 49 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/dbnt/faisp/main/budget/BudgetController.java b/src/main/java/com/dbnt/faisp/main/budget/BudgetController.java index fb62a9c5..13e30683 100644 --- a/src/main/java/com/dbnt/faisp/main/budget/BudgetController.java +++ b/src/main/java/com/dbnt/faisp/main/budget/BudgetController.java @@ -1,21 +1,11 @@ package com.dbnt.faisp.main.budget; -import com.dbnt.faisp.main.authMgt.service.AuthMgtService; -import com.dbnt.faisp.main.codeMgt.service.CodeMgtService; -import com.dbnt.faisp.main.faRpt.model.FaRptBoard; -import com.dbnt.faisp.main.faRpt.model.FaRptReadUser; -import com.dbnt.faisp.main.faRpt.service.FaRptService; import com.dbnt.faisp.main.userInfo.model.UserInfo; import lombok.RequiredArgsConstructor; import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.List; - @RestController @RequiredArgsConstructor @RequestMapping("/budget") diff --git a/src/main/java/com/dbnt/faisp/main/counterIntelligence/CounterIntelligenceController.java b/src/main/java/com/dbnt/faisp/main/counterIntelligence/CounterIntelligenceController.java index 870db62b..0d57c4de 100644 --- a/src/main/java/com/dbnt/faisp/main/counterIntelligence/CounterIntelligenceController.java +++ b/src/main/java/com/dbnt/faisp/main/counterIntelligence/CounterIntelligenceController.java @@ -91,13 +91,13 @@ public class CounterIntelligenceController { @PostMapping("/deleteCiWork") public Integer deleteCiWork(@AuthenticationPrincipal UserInfo loginUser, CounterIntelligenceWork ciWork){ - String accessAuth = authMgtService.selectAccessConfigList - (loginUser.getUserSeq(), "/counterIntelligence/ciWorkList").get(0).getAccessAuth(); - if(accessAuth.equals("ACC003")){ + // String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/counterIntelligence/ciWorkList").get(0).getAccessAuth(); + return ciService.deleteCiWork(ciWork.getCiwKey()); + /*if(accessAuth.equals("ACC003")){ return ciService.deleteCiWork(ciWork.getCiwKey()); }else{ return 0; - } + }*/ } @GetMapping("/CiWorkStatistics") public ModelAndView ciWorkStatistics(@AuthenticationPrincipal UserInfo loginUser, CiWorkStatistics ciWorkStatistics){ diff --git a/src/main/java/com/dbnt/faisp/main/counterIntelligence/service/CounterIntelligenceService.java b/src/main/java/com/dbnt/faisp/main/counterIntelligence/service/CounterIntelligenceService.java index 14ae7549..4a8b5cc9 100644 --- a/src/main/java/com/dbnt/faisp/main/counterIntelligence/service/CounterIntelligenceService.java +++ b/src/main/java/com/dbnt/faisp/main/counterIntelligence/service/CounterIntelligenceService.java @@ -128,7 +128,7 @@ public class CounterIntelligenceService extends BaseService { @Transactional public Integer deleteCiWork(Integer ciwKey) { - CounterIntelligenceWork ciWork = ciwRepository.findById(ciwKey).orElse(null); + CounterIntelligenceWork ciWork = ciwRepository.findById(ciwKey).orElse(new CounterIntelligenceWork()); ciWork.setStatus("DST008"); return ciwKey; } diff --git a/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/IvsgtController.java b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/IvsgtController.java index 0bf32037..90ea04af 100644 --- a/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/IvsgtController.java +++ b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/IvsgtController.java @@ -100,4 +100,10 @@ public class IvsgtController { return mav; } + @PostMapping("/deleteIvsgtReport") + @ResponseBody + public void deleteIvsgtReport(@RequestBody InvestigationBoard ivsgtReport){ + ivsgtService.deleteIvsgtReport(ivsgtReport.getIvsgtKey()); + } + } diff --git a/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/repository/InvestigationBoardRepository.java b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/repository/InvestigationBoardRepository.java index e1f3f473..595a909e 100644 --- a/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/repository/InvestigationBoardRepository.java +++ b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/repository/InvestigationBoardRepository.java @@ -2,7 +2,12 @@ package com.dbnt.faisp.main.ivsgtMgt.boardInvestigation.repository; import com.dbnt.faisp.main.ivsgtMgt.boardInvestigation.model.InvestigationBoard; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; public interface InvestigationBoardRepository extends JpaRepository { + @Modifying(clearAutomatically = true) + @Query("update InvestigationBoard set status = :status where ivsgtKey = :ivsgtKey") + void bulkModifyingByIvsgtKeyToStatus(Integer ivsgtKey, String status); } diff --git a/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/service/IvsgtService.java b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/service/IvsgtService.java index 2ddefac9..37fa88b3 100644 --- a/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/service/IvsgtService.java +++ b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/service/IvsgtService.java @@ -113,4 +113,9 @@ public class IvsgtService extends BaseService { public FileInfo selectIvsgtFile(Integer parentKey, Integer fileSeq) { return ivsgtFileRepository.findById(new InvestigationFile.InvestigationFileId(parentKey, fileSeq)).orElse(null); } + + @Transactional + public void deleteIvsgtReport(Integer ivsgtKey) { + ivsgtboardRepository.bulkModifyingByIvsgtKeyToStatus(ivsgtKey, "DST008"); + } } diff --git a/src/main/resources/mybatisMapper/InvestigationBoardMapper.xml b/src/main/resources/mybatisMapper/InvestigationBoardMapper.xml index 64852f85..edf5f8b5 100644 --- a/src/main/resources/mybatisMapper/InvestigationBoardMapper.xml +++ b/src/main/resources/mybatisMapper/InvestigationBoardMapper.xml @@ -6,6 +6,7 @@ + status <> 'DST008' and a.wrt_organ in @@ -109,5 +110,6 @@ INNER JOIN investigation_board i ON i.ivsgt_key = a.related_report_key WHERE a.parent_ivsgt_key = #{ivsgtKey} + and i.status <> 'DST008' \ No newline at end of file diff --git a/src/main/resources/static/js/ivsgt/ivsgt.js b/src/main/resources/static/js/ivsgt/ivsgt.js index 7a470312..ea9f0bf4 100644 --- a/src/main/resources/static/js/ivsgt/ivsgt.js +++ b/src/main/resources/static/js/ivsgt/ivsgt.js @@ -7,6 +7,29 @@ $(document).on('click', '#ivsgtEditBtn', function () { getIvsgtEditModal(Number($("#ivsgtViewBody").find("[name='ivsgtKey']").val())); }); +$(document).on('click', '#ivsgtDeleteBtn', function (){ + if(confirm("삭제하시겠습니까?\n되돌릴 수 없습니다.")){ + contentFade("in"); + $.ajax({ + type : 'POST', + data : JSON.stringify({ivsgtKey: $("#ivsgtViewBody").find("[name='ivsgtKey']").val()}), + url : "/ivsgt/deleteIvsgtReport", + 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('change', '#arrestCd', function (){ $(".arrestCd2").hide(); $("."+this.value).show(); diff --git a/src/main/resources/templates/ivsgt/ivsgtViewModal.html b/src/main/resources/templates/ivsgt/ivsgtViewModal.html index 8fc82c44..20e78681 100644 --- a/src/main/resources/templates/ivsgt/ivsgtViewModal.html +++ b/src/main/resources/templates/ivsgt/ivsgtViewModal.html @@ -132,7 +132,9 @@
- + + +