diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/AsfCovController.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/AsfCovController.java index e4f8a401..3dd9887a 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/AsfCovController.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/AsfCovController.java @@ -77,6 +77,7 @@ public class AsfCovController { return asfCovService.saveContent(asfCov); } + @PostMapping("/deleteContent") @ResponseBody public void deleteContent(@RequestBody AsfCov asfCov){ diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/AsfCovService.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/AsfCovService.java index 563243da..8340ee0b 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/AsfCovService.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/AsfCovService.java @@ -68,7 +68,7 @@ public class AsfCovService extends BaseService { @Transactional public void deleteContent(AsfCov asfCov){ - asfCov=asfCovRepository.findById(asfCov.getAsfCovKey()).orElse(null); + asfCov=asfCovRepository.findTop1ByAsfCovKeyOrderByVersionNoDesc(asfCov.getAsfCovKey()).orElse(null); asfCov.setContentStatus("DST008"); } diff --git a/src/main/resources/static/js/faStatistics/asfCov.js b/src/main/resources/static/js/faStatistics/asfCov.js index dd0fde44..8efc0898 100644 --- a/src/main/resources/static/js/faStatistics/asfCov.js +++ b/src/main/resources/static/js/faStatistics/asfCov.js @@ -75,13 +75,13 @@ $(function(){ $(document).on('click', '#deleteMajorBtn', function (){ - const asfCovKey = $('input[name=asfCovKey]').val(); + const asfCovKey = $('#processResultEditBody').find(".asfCovKey").val(); console.log(asfCovKey); if(confirm("삭제하시겠습니까?")){ //contentFade("in"); $.ajax({ type : 'POST', - url : "/ivsgt/deleteContent", + url : "/faStatistics/deleteContent", data : JSON.stringify({asfCovKey:asfCovKey}), contentType: 'application/json', beforeSend: function (xhr){ @@ -115,7 +115,8 @@ function getEditModal(asfCovKey){ } $("#asfCovEditModalContent").empty().append(html); $("#asfCovEditModal").modal('show'); - + $("#editContent").empty().append(html); + setUploadDiv(); }, error:function(e){ ajaxErrorAction(e); diff --git a/src/main/resources/templates/faStatistics/asfCov/asfCovViewModal.html b/src/main/resources/templates/faStatistics/asfCov/asfCovViewModal.html index dd825190..cd49e5ae 100644 --- a/src/main/resources/templates/faStatistics/asfCov/asfCovViewModal.html +++ b/src/main/resources/templates/faStatistics/asfCov/asfCovViewModal.html @@ -19,126 +19,117 @@ -
+