diff --git a/src/main/java/com/dbnt/faisp/main/equip/EquipController.java b/src/main/java/com/dbnt/faisp/main/equip/EquipController.java index f87ec861..e7a80c27 100644 --- a/src/main/java/com/dbnt/faisp/main/equip/EquipController.java +++ b/src/main/java/com/dbnt/faisp/main/equip/EquipController.java @@ -362,7 +362,6 @@ public class EquipController { useList.setDownOrganCdList(loginUser.getDownOrganCdList()); mav.addObject("organList", equipService.selectOrganList(useList)); mav.addObject("info", equipService.selectUseInfo(useList)); - mav.addObject("wrtUserSeq", equipService.selectFirstWrtUserSeq(useList)); mav.addObject("userSeq", loginUser.getUserSeq()); //메뉴권한 확인 diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java index 46d7ec99..d226d0c1 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java @@ -97,6 +97,10 @@ public class InternationalCrimeArrestController { internationalCrimeArrest.setWrtUserSeq(loginUser.getUserSeq()); return internationalCrimeArrestService.savedInternationalCrimeArrest(internationalCrimeArrest); } + @PostMapping("/deleteInternationalCrimeArrest") + public void deleteInternationalCrimeArrest(@RequestBody InternationalCrimeArrest internationalCrimeArrest){ + internationalCrimeArrestService.deleteInternationalCrimeArrest(internationalCrimeArrest); + } @GetMapping("/internationalCrimeArrest/ExcelDown") public void icaExcelDown(HttpServletResponse response, InternationalCrimeArrest internationalCrimeArrest) { diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/repository/InternationalCrimeArrestRepository.java b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/repository/InternationalCrimeArrestRepository.java index 880e3146..225e5e3d 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/repository/InternationalCrimeArrestRepository.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/repository/InternationalCrimeArrestRepository.java @@ -2,7 +2,13 @@ package com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.repository; import com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.model.InternationalCrimeArrest; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; public interface InternationalCrimeArrestRepository extends JpaRepository { + + @Modifying(clearAutomatically = true) + @Query("update InternationalCrimeArrest set contentStatus = :contentStatus where icaKey = :icaKey") + void bulkModifyingByIcaKeyToContentStatus(Integer icaKey, String contentStatus); } diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/service/InternationalCrimeArrestService.java b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/service/InternationalCrimeArrestService.java index 248f0ea8..87873534 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/service/InternationalCrimeArrestService.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/service/InternationalCrimeArrestService.java @@ -78,4 +78,10 @@ public class InternationalCrimeArrestService extends BaseService { return icaKey; } + + @Transactional + public void deleteInternationalCrimeArrest(InternationalCrimeArrest internationalCrimeArrest) { + internationalCrimeArrestRepository.bulkModifyingByIcaKeyToContentStatus(internationalCrimeArrest.getIcaKey(), "D"); + + } } diff --git a/src/main/resources/mybatisMapper/EquipMapper.xml b/src/main/resources/mybatisMapper/EquipMapper.xml index 299436f6..46a42c3e 100644 --- a/src/main/resources/mybatisMapper/EquipMapper.xml +++ b/src/main/resources/mybatisMapper/EquipMapper.xml @@ -616,34 +616,35 @@ + + - SELECT count(*) FROM international_crime_arrest - + - + - + - + \ No newline at end of file diff --git a/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js b/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js index ae5a7de7..33c20246 100644 --- a/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js +++ b/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js @@ -20,6 +20,25 @@ $(document).on('click', '#icaEditBtn', function () { $("#icaViewModal").modal('hide'); getIcaEditModal(Number($("#icaViewBody").find("[name='icaKey']").val())); }); +$(document).on('click', '#icaDeleteBtn', function (){ + $.ajax({ + type : 'POST', + url : "/faStatistics/deleteInternationalCrimeArrest", + data : JSON.stringify({icaKey: $("#viewModalKey").val()}), + 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', '#saveIcaBtn', function (){ diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html index fac5704b..09906647 100644 --- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html +++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html @@ -5,7 +5,7 @@