From d8d50f7a7d8514177ab1d802e1a950f6f8e37b34 Mon Sep 17 00:00:00 2001 From: "DESKTOP-QGC5RJO\\DBNT" Date: Thu, 12 Jan 2023 13:29:13 +0900 Subject: [PATCH] =?UTF-8?q?asf=20=EB=B0=8F=20=EC=BD=94=EB=A1=9C=EB=82=9819?= =?UTF-8?q?=20=EA=B4=80=EB=A0=A8=EC=A1=B0=EC=B9=98=EC=82=AC=ED=95=AD=203?= =?UTF-8?q?=EC=B0=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crackdownsStatus/AsfCovController.java | 19 +- .../crackdownsStatus/mapper/AsfCovMapper.java | 5 +- .../crackdownsStatus/model/asfCov/AsfCov.java | 3 + .../repository/AsfCovRepository.java | 2 +- .../service/AsfCovService.java | 21 +- .../resources/mybatisMapper/AsfCovMapper.xml | 48 ++- .../static/js/faStatistics/asfCov.js | 66 ++-- .../common/modal/crackdownStatusModal.html | 14 +- .../templates/faStatistics/asfCov/asfCov.html | 356 +++--------------- .../faStatistics/asfCov/asfCovEditModal.html | 30 +- 10 files changed, 186 insertions(+), 378 deletions(-) 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 9aaabeef..d75123b5 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 @@ -10,13 +10,14 @@ import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.processResult.Pro import com.dbnt.faisp.main.faStatistics.crackdownsStatus.service.AsfCovService; import com.dbnt.faisp.main.userInfo.model.UserInfo; import lombok.RequiredArgsConstructor; +import oracle.jdbc.proxy.annotation.Post; import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.stereotype.Service; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; +import java.util.List; @RestController @@ -69,6 +70,18 @@ public class AsfCovController { return mav; } + + @PostMapping("/saveContent") + public Integer saveContent (AsfCov asfCov){ + return asfCovService.saveContent(asfCov); + } + + @PostMapping("/deleteContent") + @ResponseBody + public void deleteContent(@RequestBody AsfCov asfCov){ + asfCovService.deleteContent(asfCov); + } + } diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/mapper/AsfCovMapper.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/mapper/AsfCovMapper.java index d859bb70..7cdeb03d 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/mapper/AsfCovMapper.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/mapper/AsfCovMapper.java @@ -1,7 +1,8 @@ package com.dbnt.faisp.main.faStatistics.crackdownsStatus.mapper; import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.asfCov.AsfCov; -import com.dbnt.faisp.main.ivsgtMgt.majorStatus.model.MajorStatus; +import com.dbnt.faisp.main.ivsgtMgt.boardInvestigation.model.ArrestType; + import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -10,7 +11,7 @@ import java.util.List; public interface AsfCovMapper { List selectAsfCovList(AsfCov asfCov); Integer selectAsfCovListCnt(AsfCov asfCov); - + // ArrestType selectArrestType(AsfCov asfCov); List selectAsfCovListWhere(AsfCov asfCov); } diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/asfCov/AsfCov.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/asfCov/AsfCov.java index 1f843c63..26daf124 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/asfCov/AsfCov.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/asfCov/AsfCov.java @@ -71,6 +71,9 @@ public class AsfCov extends BaseModel { @Column(name = "wrt_part") private String wrtPart; + @Column(name = "content_status") + private String contentStatus; + //////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/AsfCovRepository.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/AsfCovRepository.java index 5bf25b8f..5972edf8 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/AsfCovRepository.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/AsfCovRepository.java @@ -9,6 +9,6 @@ import java.util.Optional; public interface AsfCovRepository extends JpaRepository { - // void deleteByAsfCov(Integer asfcovKey); + // void deleteByAsfCov(Integer asfCovKey); } 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 a7f21316..29f66f7b 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 @@ -4,9 +4,10 @@ import com.dbnt.faisp.config.BaseService; import com.dbnt.faisp.main.faStatistics.crackdownsStatus.mapper.AsfCovMapper; import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.asfCov.AsfCov; import com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository.AsfCovRepository; -import com.dbnt.faisp.main.ivsgtMgt.majorStatus.model.MajorStatus; + import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -25,9 +26,23 @@ public class AsfCovService extends BaseService { return asfCovMapper.selectAsfCovListCnt(asfCov); } - public AsfCov selectAsfCov(Integer asfcovKey) { - AsfCov asfCov= asfCovRepository.findById(asfcovKey).orElse(null); + public AsfCov selectAsfCov(Integer asfCovKey) { + AsfCov asfCov= asfCovRepository.findById(asfCovKey).orElse(null); return asfCov; } + + @Transactional + public Integer saveContent(AsfCov asfCov) { + Integer asfCovKey = asfCovRepository.save(asfCov).getAsfCovKey(); + return asfCovKey; + } + + @Transactional + public void deleteContent(AsfCov asfCov){ + asfCov=asfCovRepository.findById(asfCov.getAsfCovKey()).orElse(null); + asfCov.setContentStatus("DST008"); + } + + } diff --git a/src/main/resources/mybatisMapper/AsfCovMapper.xml b/src/main/resources/mybatisMapper/AsfCovMapper.xml index 5d3920db..d5d7f2ea 100644 --- a/src/main/resources/mybatisMapper/AsfCovMapper.xml +++ b/src/main/resources/mybatisMapper/AsfCovMapper.xml @@ -8,29 +8,34 @@ a.content_status <> 'DST008' - - and a.major_type = #{majorType} + + AND case_num = #{caseNum} + + + AND napo_dt::DATE = #{napoDt}::DATE + + + AND case_agency = #{caseAgency} + + + AND crackdown_police = #{crackdownPolice} + + + AND crackdown_boat = #{crackdownBoat} + + + AND boat_name_kr LIKE CONCAT('%', #{boatNameKr}, '%') - and a.wrt_organ = #{wrtOrgan} - - - AND a.content_title LIKE CONCAT('%', #{contentTitle}, '%') + and wrt_organ = #{wrtOrgan} - AND a.wrt_user_nm LIKE CONCAT('%', #{wrtUserNm}, '%') + AND wrt_user_nm LIKE CONCAT('%', #{wrtUserNm}, '%') - - and a.wrt_dt >= #{startDate}::date - - - and a.wrt_dt <= #{endDate}::date+1 - - - and a.wrt_organ in - - #{organCd} - + + + + @@ -52,6 +57,7 @@ a.wrt_dt, a.wrt_organ, a.wrt_part, + a.content_status, cs.cds_key , cs.case_num , cs.napo_dt @@ -111,14 +117,16 @@ INNER JOIN fishing_boat fb ON a.cds_key = fb.cds_key - + order by a.asfcov_key desc limit #{rowCnt} offset #{firstIndex} diff --git a/src/main/resources/static/js/faStatistics/asfCov.js b/src/main/resources/static/js/faStatistics/asfCov.js index 6cd8f91c..1244c7a7 100644 --- a/src/main/resources/static/js/faStatistics/asfCov.js +++ b/src/main/resources/static/js/faStatistics/asfCov.js @@ -9,32 +9,32 @@ $("#jqueryBtn").click(function(){ $(document).on('click', '#saveBtn', function (){ if(confirm("저장하시겠습니까?")){ - if($('#contentTitle').val() == ''){ - alert("제목을 입력해주세요."); - $('#contentTitle').focus(); - return false; - } - if($('#majorType').val() == ''){ - alert("종류를 선택해주세요."); - $('#majorType').focus(); - return false; - } + // if($('#contentTitle').val() == ''){ + // alert("제목을 입력해주세요."); + // $('#contentTitle').focus(); + // return false; + // } + // if($('#majorType').val() == ''){ + // alert("종류를 선택해주세요."); + // $('#majorType').focus(); + // return false; + // } saveContent('DST007'); } }) $(document).on('click', '#saveTempBtn', function (){ if(confirm("임시저장 하시겠습니까?")){ - if($('#contentTitle').val() == ''){ - alert("제목을 입력해주세요."); - $('#contentTitle').focus(); - return false; - } - if($('#majorType').val() == ''){ - alert("종류를 선택해주세요."); - $('#majorType').focus(); - return false; - } + // if($('#contentTitle').val() == ''){ + // alert("제목을 입력해주세요."); + // $('#contentTitle').focus(); + // return false; + // } + // if($('#majorType').val() == ''){ + // alert("종류를 선택해주세요."); + // $('#majorType').focus(); + // return false; + // } saveContent('DST001'); } }) @@ -141,19 +141,14 @@ function getViewModal(asfCovKey){ function saveContent(contentStatus){ const formData = new FormData($("#asfCovEditForm")[0]); - for(const file of files) { - if(!file.isDelete) - formData.append('uploadFiles', file, file.name); - } - $(".text-decoration-line-through").each(function (idx, el){ - formData.append('fileSeq', $(el).attr("data-fileseq")); - }) + + formData.append('contentStatus', contentStatus); - formData.append('contentInfo', CrossEditor.GetBodyValue()); + $.ajax({ type : 'POST', data : formData, - url : "/ivsgt/saveContent", + url : "/faStatistics/saveContent", processData: false, contentType: false, success : function(result) { @@ -199,9 +194,22 @@ $(document).on('click', '#caseNumBtn', function (){ $(document).on('click', '#getCrackdownBtn', function (){ getEditModal($(".crackdownChkbox:checked").parents(".crackdownTr").attr("data-key")); + const tr= $(".crackdownChkbox:checked").parents(".crackdownTr") + $(".cdsInfo").removeAttr("disable") + $("#cdsKey").val(tr.attr(".data-key")) + $("#boatNameKr").val(tr.find(".boatNameKr").val()) + $("#caseNum").val(tr.find(".caseNum").val()) + $("#caseAgency").val(tr.find(".caseAgency").val()) + $("#casePoliceOfficer").val(tr.find(".casePoliceOfficer").val()) + $("#crackdownPolice").val(tr.find(".crackdownPolice").val()) + $("#crackdownBoat").val(tr.find(".crackdownBoat").val()) $("#asfCovSubModal").modal('hide'); + $(".cdsInfo").attr("disable", "disable") }) + + + $(function(){ const searchFormBoat = $("#searchFormBoat") if(searchFormBoat.val()!==""){ diff --git a/src/main/resources/templates/common/modal/crackdownStatusModal.html b/src/main/resources/templates/common/modal/crackdownStatusModal.html index 4c0268bd..65c15415 100644 --- a/src/main/resources/templates/common/modal/crackdownStatusModal.html +++ b/src/main/resources/templates/common/modal/crackdownStatusModal.html @@ -193,12 +193,12 @@ - - - - - - + + + + + + @@ -246,7 +246,7 @@ - + diff --git a/src/main/resources/templates/faStatistics/asfCov/asfCov.html b/src/main/resources/templates/faStatistics/asfCov/asfCov.html index d78bcb57..37a49b69 100644 --- a/src/main/resources/templates/faStatistics/asfCov/asfCov.html +++ b/src/main/resources/templates/faStatistics/asfCov/asfCov.html @@ -17,313 +17,67 @@
- - - - - +
+ +
+
+
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+
+
+
+
+
+
+ +
+
+ +
+
+ +
+
+
+ + + +
+
+
+
+
+ +
+
+
+
+
diff --git a/src/main/resources/templates/faStatistics/asfCov/asfCovEditModal.html b/src/main/resources/templates/faStatistics/asfCov/asfCovEditModal.html index f0d4370e..8460a33a 100644 --- a/src/main/resources/templates/faStatistics/asfCov/asfCovEditModal.html +++ b/src/main/resources/templates/faStatistics/asfCov/asfCovEditModal.html @@ -1,38 +1,39 @@
-
+
- + - +
- +
- +
+
- + @@ -40,12 +41,12 @@
- +
- + @@ -53,8 +54,13 @@
- + + + + + +