국제범죄 검거현황 삭제기능 추가.

사용대장 수정삭제버튼 조건 수정.

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());
 
     //메뉴권한 확인

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) {

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<InternationalCrimeArrest, Integer> {
 
+
+  @Modifying(clearAutomatically = true)
+  @Query("update InternationalCrimeArrest set contentStatus = :contentStatus where icaKey = :icaKey")
+  void bulkModifyingByIcaKeyToContentStatus(Integer icaKey, String contentStatus);
 }

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");
+
+  }
 }

src/main/resources/mybatisMapper/EquipMapper.xml

@@ -626,6 +626,7 @@
           detail_self,
           people_cnt,
           description,
+          wrt_user_seq,
           wrt_dt
     from use_list ul,
       (select use_no,max(version_no) as lastVer from use_list

src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml

@@ -6,6 +6,7 @@
 <mapper namespace="com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.mapper.InternationalCrimeArrestMapper">
   <sql id="selectInternationalCrimeArrestListWhere">
     <where>
+      content_status &lt;> 'D'
       <if test='organ != null and organ != ""'>
         AND organ = #{organ}
       </if>

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 (){

src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html

@@ -5,7 +5,7 @@
   <button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
 </div>
 <div class="modal-body">
-    <input type="hidden" name="icaKey" th:value="${internationalCrimeArrest.icaKey}">
+    <input type="hidden" name="icaKey" id="viewModalKey" th:value="${internationalCrimeArrest.icaKey}">
  <!-- <div class="row mb-1">
     <label class="col-sm-2 col-form-label col-form-label-sm text-center">사건번호</label>
     <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${internationalCrimeArrest.caseNum}"></label>
@@ -314,6 +314,7 @@
 </div>
 <div class="modal-footer bg-light">
   <th:block th:if="${userSeq eq internationalCrimeArrest.wrtUserSeq or (#lists.contains(mgtOrganList, internationalCrimeArrest.wrtOrgan) and accessAuth eq 'ACC003')}"><!--작성자일 경우 수정 허용--><!--관리자일 경우 수정 허용-->
+    <button type="button" class="btn btn-danger" id="icaDeleteBtn">삭제</button>
     <button type="button" class="btn btn-warning" id="icaEditBtn">수정</button>
   </th:block>
 <!--  <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>-->