ASF 및 코로나19 관련조치사항 2차

src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/AsfCovController.java

@@ -43,8 +43,8 @@ public class AsfCovController {
     @GetMapping("/asfCovEditModal")
     public ModelAndView asfCovEditModal(@AuthenticationPrincipal UserInfo loginUser, AsfCov asfCov) {
         ModelAndView mav = new ModelAndView("faStatistics/asfCov/asfCovEditModal");
-        if (asfCov.getAsfcovKey() != null) {
-            asfCov = asfCovService.selectAsfCov(asfCov.getAsfcovKey());
+        if (asfCov.getAsfCovKey() != null) {
+            asfCov = asfCovService.selectAsfCov(asfCov.getAsfCovKey());
         } else {
             asfCov.setWrtOrgan(loginUser.getOgCd());
             asfCov.setWrtPart(loginUser.getOfcCd());
@@ -52,13 +52,23 @@ public class AsfCovController {
             asfCov.setWrtUserGrd(loginUser.getTitleCd());
             asfCov.setWrtUserNm(loginUser.getUserNm());
             asfCov.setWrtDt(loginUser.getWrtDt());
-            asfCov.setWrtDt(loginUser.getWrtDt());
         }
         mav.addObject("asfCov", asfCov);
         mav.addObject("userSeq", loginUser.getUserSeq());
 
         return mav;
     }
+
+    @GetMapping("/asfCovViewModal")
+    public ModelAndView asfCovViewModal(@AuthenticationPrincipal UserInfo loginUser, AsfCov asfCov){
+        ModelAndView mav= new ModelAndView("faStatistics/asfCov/asfCovViewModal");
+
+        asfCov = asfCovService.selectAsfCov(asfCov.getAsfCovKey());
+        mav.addObject("userSeq",loginUser.getUserSeq());
+        mav.addObject("asfCov", asfCov);
+
+        return mav;
+    }
 }
 
 

src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/asfCov/AsfCov.java

@@ -3,6 +3,7 @@ package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.asfCov;
 import com.dbnt.faisp.config.BaseModel;
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CrackdownStatus;
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CrackdownStatusBaseEntity;
+import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.fishingBoat.FishingBoat;
 import io.micrometer.core.annotation.Counted;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -25,7 +26,7 @@ public class AsfCov extends BaseModel {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "asfcov_key")
-    private Integer asfcovKey;
+    private Integer asfCovKey;
 
     @Column(name="version_no")
     private Integer versionNo;
@@ -70,9 +71,106 @@ public class AsfCov extends BaseModel {
     @Column(name = "wrt_part")
     private String wrtPart;
 
+
+////////////////////////////////////////////////////////////////////////
+
+
     @Transient
     private CrackdownStatus crackdownStatus;
 
+    @Column(name = "case_num")
+    private String caseNum;
+
+    @Column(name = "case_police_officer")
+    private String casePoliceOfficer;
+
+    @Column(name = "crackdown_boat")
+    private String crackdownBoat;
+
+    @Column(name = "napo_dt")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    private LocalDateTime napoDt;
+
+    @Column(name = "napo_sea_point_lon")
+    private String napoSeaPointLon;
+
+    @Column(name = "napo_sea_point_lat")
+    private String napoSeaPointLat;
+
+    @Column(name = "napo_sea_point_detail")
+    private String napoSeaPointDetail;
+
+    @Column(name = "invasion_type")
+    private String invasionType;
+
+    @Column(name = "nll")
+    private String nll;
+
+    @Column(name = "case_agency")
+    private String caseAgency;
+
+    @Column(name = "crackdown_police")
+    private String crackdownPolice;
+
+    @Column(name = "mmsi")
+    private String mmsi;
+
+    @Column(name = "field_ivsgt")
+    private String fieldIvsgt;
+
+    @Column(name = "obstr_exspd_cnt")
+    private Integer obstrExspdCnt;
+
+    @Column(name = "person_damage_cnt")
+    private Integer personDamageCnt;
+
+    @Column(name = "person_damage_amount")
+    private Integer personDamageAmount;
+
+    @Column(name = "person_damage_detail")
+    private String personDamageDetail;
+
+    @Column(name = "material_damage_cnt")
+    private Integer materialDamageCnt;
+
+    @Column(name = "material_damage_amount")
+    private Integer materialDamageAmount;
+
+    @Column(name = "material_damage_detail")
+    private String materialDamageDetail;
+
+    @Column(name = "field_ivsgt_napo_dt")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    private LocalDateTime fieldIvsgtNapoDt;
+
+    @Column(name = "field_ivsgt_release_dt")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    private LocalDateTime fieldIvsgtReleaseDt;
+
+    @Column(name = "field_ivsgt_time_taken")
+    private String fieldIvsgtTimeTaken;
+
+    @Column(name = "pressurized_start_dt")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    private LocalDateTime pressurizedStartDt;
+
+    @Column(name = "pressurized_end_dt")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    private LocalDateTime pressurizedEndDt;
+
+    @Column(name = "distance")
+    private String distance;
+
+    ////////////////////////////////////////////////////////////
+
     @Transient
-    private Integer caseNum;
+    private FishingBoat fishingBoat;
+
+    @Column(name = "boat_name_kr")
+    private String boatNameKr;
+    @Column(name = "boat_name_cn")
+    private String boatNameCn;
+
+
+
 }

src/main/resources/mybatisMapper/AsfCovMapper.xml

@@ -79,14 +79,37 @@
         , cs.pressurized_start_dt
         , cs.pressurized_end_dt
         , cs.distance
-        , cs.wrt_organ
-        , cs.wrt_user_seq
-        , cs.wrt_user_nm
-        , cs.wrt_dt
+        , fb.fb_key
+        , fb.boat_name_kr
+        , fb.boat_name_cn
+        , fb.ton_cnt
+        , fb.fishery_type
+        , fb.boat_material
+        , fb.boat_nny_sung
+        , fb.boat_nny_si
+        , fb.offense_quantity
+        , fb.offense_amount
+        , fb.offense_illegal_waste_quantity
+        , fb.dambo_unpaid_amount
+        , fb.dambo_payment
+        , fb.payment_payment_dt
+        , fb.confiscation_frame
+        , fb.confiscation_width
+        , fb.confiscation_jo
+        , fb.confiscation_gae
+        , fb.confiscation_etc
+        , fb.catch_fish_species
+        , fb.catch_cnt
+        , fb.offense_fish_species
+        , fb.offense_catch_cnt
+        , fb.save_yn
 
-        FROM crackdown_status cs
-        INNER JOIN asfcov_status a
-        ON cs.cds_key = a.cds_key
+        FROM asfcov_status a
+        INNER JOIN crackdown_status cs
+        ON a.cds_key = cs.cds_key
+
+        INNER JOIN fishing_boat fb
+        ON a.cds_key = fb.cds_key
 
 <!--        <include refid="selectAsfCovListWhere"></include>-->
         order by a.asfcov_key desc

src/main/resources/static/js/faStatistics/asfCov.js

@@ -0,0 +1,218 @@
+
+
+$("#jqueryBtn").click(function(){
+    $(".quiz-text").text("Javascript");
+    $(".quiz-text").css('color', 'blue');
+});
+
+
+
+$(document).on('click', '#saveBtn', function (){
+    if(confirm("저장하시겠습니까?")){
+        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;
+        }
+        saveContent('DST001');
+    }
+})
+
+
+
+$(document).on('click', '#addAsfCovBtn', function (){
+    getEditModal(null)
+})
+
+$(document).on('click', '.tr', function (){
+    $(".trChkBox").prop("checked", false);
+    $(this).find(".trChkBox").prop("checked", true);
+    getViewModal(Number($(this).find(".asfCovKey").val()));
+})
+
+
+// $(document).on('click', '#saveBtn', function (){
+//     saveContent("MajorEditForm")
+// })
+
+$(document).on('click', '#editBtn', function (){
+    $("#asfCovViewModal").modal('hide')
+    getEditModal($(this).attr("data-asfCovKey"));
+})
+
+
+
+
+
+$(function(){
+    $("#dateSelectorDiv").datepicker({
+        format: "yyyy-mm-dd",
+        language: "ko",
+        autoclose: true
+    });
+})
+
+
+$(document).on('click', '#deleteMajorBtn', function (){
+    const asfCovKey = $('input[name=asfCovKey]').val();
+    console.log(asfCovKey);
+    if(confirm("삭제하시겠습니까?")){
+        //contentFade("in");
+        $.ajax({
+            type : 'POST',
+            url : "/ivsgt/deleteContent",
+            data : JSON.stringify({asfCovKey:asfCovKey}),
+            contentType: 'application/json',
+            beforeSend: function (xhr){
+                xhr.setRequestHeader($("[name='_csrf_header']").val(), $("[name='_csrf']").val());
+            },
+            success : function(data) {
+                alert("삭제 처리되었습니다.");
+                //contentFade("out");
+                location.reload();
+            },
+            error : function(xhr, status) {
+                alert("삭제 처리에 실패하였습니다");
+                //contentFade("out");
+            }
+        })
+    }
+})
+
+
+
+function getEditModal(asfCovKey){
+    $.ajax({
+        url: '/faStatistics/asfCovEditModal',
+        data: {asfCovKey: asfCovKey},
+        type: 'GET',
+        dataType:"html",
+        success: function(html){
+            const crackdownPolice = $("#crackdownPolice").val()
+            if(crackdownPolice){
+                getCrackdownBoatOption(crackdownPolice)
+            }
+            $("#asfCovEditModalContent").empty().append(html);
+            $("#asfCovEditModal").modal('show');
+
+        },
+        error:function(){
+
+        }
+    });
+}
+
+function getViewModal(asfCovKey){
+    $.ajax({
+        url: '/faStatistics/asfCovViewModal',
+        data: {asfCovKey: asfCovKey},
+        type: 'GET',
+        dataType:"html",
+        success: function(html){
+            $("#asfCovViewModalContent").empty().append(html)
+            $("#asfCovViewModal").modal('show');
+        },
+        error:function(){
+
+        }
+    });
+}
+
+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",
+        processData: false,
+        contentType: false,
+        success : function(result) {
+            alert("저장되었습니다.");
+            contentFade("out");
+            location.reload();
+        },
+        error : function(xhr, status) {
+            alert("저장에 실패하였습니다.")
+            contentFade("out");
+        }
+    })
+}
+
+
+function contentCheck(formId){
+    let flag = true;
+    if(!$("#contentTitle").val()){
+        alert("제목을 입력해주세요.")
+        flag = false;
+    }
+
+    flag = fileCheck(flag, files);
+    return flag;
+}
+
+function commentFormReset(){
+    const commentForm = $("#commentForm");
+    commentForm[0].reset();
+    $("#childFormRemoveBtn").hide();
+    $("#parentComment").val('');
+    $("#commentFormHome").append(commentForm)
+}
+
+$(document).on('click', '#asfCovDownExcel', function (){
+    exportExcel('ASF 및 코로나19 관련 조치현황', 'asfCovTable');
+});
+
+$(document).on('click', '#caseNumBtn', function (){
+    searchModalSubmit(1);
+    $("#asfCovSubModal").modal('show');
+})
+
+$(document).on('click', '#getCrackdownBtn', function (){
+    getEditModal($(".crackdownChkbox:checked").parents(".crackdownTr").attr("data-key"));
+    $("#asfCovSubModal").modal('hide');
+})
+
+$(function(){
+    const searchFormBoat = $("#searchFormBoat")
+    if(searchFormBoat.val()!==""){
+        searchFormBoat.find("."+$("#searchFormPolice").val()).show();
+        searchFormBoat.removeAttr("disabled");
+    }
+    $("#dateSelectorDiv").datepicker({
+        format: "yyyy-mm-dd",
+        language: "ko",
+        autoclose: true
+    });
+});
+
+

src/main/resources/templates/common/modal/crackdownStatusModal.html

@@ -193,6 +193,8 @@
                   <tbody class="table-group-divider">
                   <th:block th:each="crackdownStatus:${crackdownList}">
                     <tr class="crackdownTr" th:data-key="${crackdownStatus.cdsKey}">
+                      //여기에추가 6개
+                      //<input type="hidden" class
                       <td><input type="checkbox" class="crackdownChkbox"></td>
                       <!--<td th:text="${crackdownStatus.cdsKey}"></td>-->
                       <td th:text="${crackdownStatus.caseNum}"></td>

src/main/resources/templates/faStatistics/asfCov/asfCov.html

@@ -1,9 +1,10 @@
 <!DOCTYPE html>
 <html lang="ko" xmlns:th="http://www.thymeleaf.org"
       xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
+      xmlns:sec="http://www.thymeleaf.org/thymeleaf-extras-springsecurity5"
       layout:decorate="~{layout/layout}">
 <th:block layout:fragment="script">
-  <script type="text/javascript" th:src="@{/js/faStatistics/crackdownStatus.js}"></script>
+  <script type="text/javascript" th:src="@{/js/faStatistics/asfCov.js}"></script>
 </th:block>
 <div layout:fragment="content">
   <main>
@@ -327,7 +328,7 @@
             <div class="card-body">
               <div class="row">
                 <div class="col-12 overflow-auto">
-                  <table class="table table-sm table-hover table-bordered text-nowrap" id="cdsTable">
+                  <table class="table table-sm table-hover table-bordered text-nowrap" id="asfCovTable">
                     <thead class="align-middle">
                     <tr class="table-secondary">
                       <th rowspan="4">사건번호</th>
@@ -366,19 +367,23 @@
 
                       <tr class="tr" th:each="asfcov:${asfCovList}">
                         <td th:text="${asfcov.caseNum}"></td>
-                        <td th:text="${asfcov.crackdownStatus.personNegativeCnt}"></td>
-                        <td th:text="${asfcov.crackdownStatus.casePoliceOfficer}"></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
+                        <td th:text="${asfcov.napoDt}"></td>
+                        <td th:text="${asfcov.boatNameKr}"></td>
+                        <td th:text="${asfcov.casePoliceOfficer}"></td>
+                        <th:block th:each="commonCode:${session.commonCode.get('ATA')}">
+                          <td th:if="${asfcov.caseAgency eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
+                        </th:block>
+                        <th:block th:each="commonCode:${session.commonCode.get('CPO')}">
+                          <td th:if="${asfcov.crackdownPolice eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
+                        </th:block>
+                        <td th:text="${asfcov.pressurizedYn}"></td>
                         <td></td>
                         <td></td>
+                        <td th:text="${asfcov.personCnt}"></td>
+                        <td th:text="${asfcov.personPositiveCnt}"></td>
+                        <td th:text="${asfcov.personNegativeCnt}"></td>
+                        <td th:text="${asfcov.asfcovActionDetail}"></td>
+                        <td th:text="${asfcov.wrtDt}"></td>
 
                       </tr>
 
@@ -388,10 +393,10 @@
               </div>
               <div class="row justify-content-between pt-1">
                 <div class="col-auto">
-                  <button class="btn btn-success" id="cdsDownExcel">엑셀 다운로드</button>
+                  <button class="btn btn-success" id="asfCovDownExcel">엑셀 다운로드</button>
                 </div>
                 <div class="col-auto">
-                  <button class="btn btn-primary" id="crackdownStatusAddBtn">등록</button>
+                  <button class="btn btn-primary" id="addAsfCovBtn" >등록</button>
                 </div>
               </div>
             </div>
@@ -399,7 +404,7 @@
         </div>
       </div>
     </div>
-
+  </main>
   <div class="modal fade" id="asfCovEditModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="asfCovEditModalLabel" aria-hidden="true">
     <div class="modal-dialog modal-xl modal-dialog-scrollable">
       <div class="modal-content" id="asfCovEditModalContent">
@@ -409,7 +414,7 @@
   </div>
     <div class="modal fade" id="asfCovViewModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="asfCovViewModalLabel" aria-hidden="true">
       <div class="modal-dialog modal-xl modal-dialog-scrollable">
-        <div class="modal-content" id="asfCovViewBody">
+        <div class="modal-content" id="asfCovViewModalContent">
 
         </div>
       </div>
@@ -419,7 +424,7 @@
         <div class="modal-content">
           <div class="modal-header bg-dark">
             <h5 class="modal-title text-white" id="asfCovSubModalLabel">단속현황 불러오기</h5>
-            <input type="hidden" id="modalUrl" value="/modal/asfCovModal">
+            <input type="hidden" id="modalUrl" value="/modal/crackdownStatusModal">
             <button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
           </div>
           <div class="modal-body text-nowrap" id="subModalBody">
@@ -439,6 +444,6 @@
         </div>
       </div>
     </div>
-  </main>
+
 </div>
 </html>

src/main/resources/templates/faStatistics/asfCov/asfCovEditModal.html

@@ -1,44 +1,29 @@
 <!DOCTYPE html>
 <html lang="ko" xmlns:th="http://www.thymeleaf.org">
 <div class="modal-header bg-dark">
-  <h5 class="modal-title text-white" id="fishingBoatEditModalLabel" th:text="${asfCov.asfcovKey eq null?' 조치현황 작성':'조치현황 수정'}"></h5>
+  <h5 class="modal-title text-white" id="asfCovEditModalLabel" th:text="${asfCov.asfCovKey eq null?'ASF 및 코로나19 관련 조치현황 작성':'ASF 및 코로나19 관련 조치현황 수정'}"></h5>
   <button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
 </div>
-<div class="modal-body">
+<div class="modal-body" id="asfCovEditModalContent">
   <form action="#" method="post" id="asfCovEditForm">
     <input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
     <input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
-    <input type="hidden" name="asfcovKey" id="asfcovKey" th:value="${asfCov.asfcovKey}">
+    <input type="hidden" name="asfCovKey" th:value="${asfCov.asfCovKey }">
     <input type="hidden" name="wrtOrgan" th:value="${asfCov.wrtOrgan}">
     <input type="hidden" name="wrtPart" th:value="${asfCov.wrtPart}">
     <input type="hidden" name="wrtUserSeq" th:value="${asfCov.wrtUserSeq}">
-    <input type="hidden" name="wrtUserNm" th:value="${asfCov.wrtUserNm}">
     <input type="hidden" name="wrtUserGrd" th:value="${asfCov.wrtUserGrd}">
-    <ul class="nav nav-tabs" id="userTab" role="tablist">
-      <li class="nav-item" role="presentation">
-        <button class="nav-link active" id="baseInfoTab" data-bs-toggle="tab" data-bs-target="#baseInfoTabPanel" type="button" role="tab" aria-controls="baseInfoTabPanel" aria-selected="true">기본정보</button>
-      </li>
-      <li class="nav-item" role="presentation">
-        <button class="nav-link" id="sailorTab" data-bs-toggle="tab" data-bs-target="#sailorTabPanel" type="button" role="tab" aria-controls="sailorTabPanel" aria-selected="false">선장/선주정보</button>
-      </li>
-      <li class="nav-item" role="presentation">
-        <button class="nav-link" id="fishingBoatTab" data-bs-toggle="tab" data-bs-target="#fishingBoatTabPanel" type="button" role="tab" aria-controls="fishingBoatTabPanel" aria-selected="false">어선정보</button>
-      </li>
-      <li class="nav-item" role="presentation">
-        <button class="nav-link" id="processResultTab" data-bs-toggle="tab" data-bs-target="#processResultTabPanel" type="button" role="tab" aria-controls="processResultTabPanel" aria-selected="false">처리결과</button>
-      </li>
-    </ul>
-    <div class="tab-content bg-white border border-top-0">
-      <div class="tab-pane fade p-2 show active" id="baseInfoTabPanel" role="tabpanel" aria-labelledby="baseInfoTab" tabindex="0">
+    <input type="hidden" name="wrtUserNm" th:value="${asfCov.wrtUserNm}">
+    <input type="hidden" name="cdsKey" th:value="${asfCov.cdsKey}">
     <div class="row mb-1">
       <label for="boatNameKr" class="col-sm-1 col-form-label col-form-label-sm text-center">선명</label>
       <div class="col-sm-2">
-            <input type="text" class="form-control form-control-sm fishingBoatInfo boatNameKr" id="boatNameKr" name="fishingBoat.boatNameKr" placeholder="한글" th:value="${asfCov.crackdownStatus.boatNameKr}">
+        <input type="text" class="form-control form-control-sm fishingBoatInfo boatNameKr" id="boatNameKr" name="fishingBoat.boatNameKr" placeholder="한글" th:value="${asfCov.boatNameKr}">
       </div>
       <label for="caseNum" class="col-sm-1 col-form-label col-form-label-sm text-center">사건번호</label>
       <div class="col-sm-2">
         <div class="input-group">
-              <input type="text" class="form-control form-control-sm crackdownStatusInfo" id="caseNum" name="caseNum" th:value="${asfCov.crackdownStatus.caseNum}">
+          <input type="text" class="form-control form-control-sm crackdownStatusInfo" id="caseNum" name="caseNum" th:value="${asfCov.caseNum}">
           <input type="button" class="btn btn-sm btn-outline-primary crackdownStatusInfo w-auto" id="caseNumBtn" value="불러오기">
         </div>
       </div>
@@ -49,283 +34,73 @@
         <select class="form-select form-select-sm crackdownStatusInfo" id="caseAgency" name="caseAgency">
           <option value="">선택</option>
           <th:block th:each="commonCode:${session.commonCode.get('ATA')}">
-                <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd eq asfCov.crackdownStatus.caseAgency}"></option>
+            <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd eq asfCov.caseAgency}"></option>
           </th:block>
         </select>
       </div>
       <label for="casePoliceOfficer" class="col-sm-1 col-form-label col-form-label-sm text-center fs-13">사건담당경찰관</label>
       <div class="col-sm-2">
-            <input type="text" class="form-control form-control-sm crackdownStatusInfo" id="casePoliceOfficer" name="casePoliceOfficer" th:value="${asfCov.crackdownStatus.casePoliceOfficer}">
+        <input type="text" class="form-control form-control-sm crackdownStatusInfo" id="casePoliceOfficer" name="casePoliceOfficer" th:value="${asfCov.casePoliceOfficer}">
       </div>
       <label for="crackdownPolice" class="col-sm-1 col-form-label col-form-label-sm text-center">단속경찰서</label>
       <div class="col-sm-2">
         <select class="form-select form-select-sm crackdownStatusInfo crackdownPolice" name="crackdownPolice" id="crackdownPolice">
           <option value="">선택</option>
           <th:block th:each="commonCode:${session.commonCode.get('CPO')}">
-                <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd eq asfCov.crackdownStatus.crackdownPolice}"></option>
+            <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd eq asfCov.crackdownPolice}"></option>
           </th:block>
         </select>
       </div>
       <label for="crackdownBoat" class="col-sm-1 col-form-label col-form-label-sm text-center">단속함정</label>
       <div class="col-sm-2">
-            <select class="form-select form-select-sm crackdownStatusInfo crackdownBoat" name="crackdownBoat" id="crackdownBoat" th:data-boatcode="${asfCov.crackdownStatus.crackdownBoat}" disabled>
+        <select class="form-select form-select-sm crackdownStatusInfo crackdownBoat" name="crackdownBoat" id="crackdownBoat" th:data-boatcode="${asfCov.crackdownBoat}" disabled>
           <option value="">단속경찰서를 선택해주세요.</option>
         </select>
       </div>
     </div>
     <div class="row mb-1">
-          <label for="napoDt" class="col-sm-1 col-form-label col-form-label-sm text-center">나포일시</label>
+      <label for="pressurizedYn" class="col-sm-1 col-form-label col-form-label-sm text-center">전용부두 압송여부</label>
       <div class="col-sm-2">
-            <input type="text" class="form-control form-control-sm crackdownStatusInfo dateTimeSelector" id="napoDt" name="napoDt" placeholder="0000-00-00 00:00" th:value="${#temporals.format(asfCov.crackdownStatus.napoDt, 'yyyy-MM-dd')}" autocomplete="off">
-          </div>
-          <label for="napoSeaPointLon" class="col-sm-1 col-form-label col-form-label-sm text-center">나포장소</label>
-          <div class="col-sm-5">
-            <div class="input-group w-auto">
-              <input type="text" class="form-control form-control-sm w-25 crackdownStatusInfo" id="napoSeaPointLon" name="napoSeaPointLon" placeholder="00 . 00 . 00N" th:value="${asfCov.crackdownStatus.napoSeaPointLon}">
-              <input type="text" class="form-control form-control-sm w-25 crackdownStatusInfo" id="napoSeaPointLat" name="napoSeaPointLat" placeholder="000-00.00E" th:value="${asfCov.crackdownStatus.napoSeaPointLat}">
-              <input type="text" class="form-control form-control-sm w-50 crackdownStatusInfo" id="napoSeaPointDetail" name="napoSeaPointDetail" placeholder="00도 00방 00해리, 어업협정선 내측 00해리" th:value="${asfCov.crackdownStatus.napoSeaPointDetail}">
-            </div>
-          </div>
-          <label for="fieldIvsgt" class="col-sm-1 col-form-label col-form-label-sm text-center">압송/현장조사</label>
-          <div class="col-sm-2">
-            <select class="form-select form-select-sm crackdownStatusInfo" name="fieldIvsgt" id="fieldIvsgt">
+        <select class="form-select form-select-sm crackdownStatusInfo" name="pressurizedYn" id="pressurizedYn">
           <option value="">선택</option>
-              <option value="C" th:selected="${asfCov.crackdownStatus.fieldIvsgt eq 'C'}">압송</option>
-              <option value="F" th:selected="${asfCov.crackdownStatus.fieldIvsgt eq 'F'}">현장조사</option>
+          <option value="Y" th:selected="${asfCov.pressurizedYn eq 'Y'}">압송</option>
+          <option value="N" th:selected="${asfCov.pressurizedYn eq 'N'}">미압송</option>
         </select>
       </div>
-        </div>
-      </div>
-
-      <div class="tab-pane fade p-2" id="fishingBoatTabPanel" role="tabpanel" aria-labelledby="fishingBoatTab" tabindex="0">
-        <div class="row mb-1">
-          <label for="boatNameCn" class="col-sm-1 col-form-label col-form-label-sm text-center">선명</label>
-          <div class="col-sm-4">
-            <div class="input-group w-auto">
-
-            </div>
-          </div>
-          <div class="col-sm-4">
-            <div class="row" id="violationDiv">
-              <th:block th:each="violation:${asfCov.crackdownStatus.violationList}">
-                <div class="col-6 violation">
-                  <input type="hidden" class="form-control form-control-sm fishingBoatInfo violationCd" th:value="${violation.violation}">
-                  <div class="input-group w-auto">
-                    <th:block th:each="commonCode:${session.commonCode.get('VT')}">
-                      <input type="text" class="form-control form-control-sm" th:if="${commonCode.itemCd eq violation.violation}" th:value="${commonCode.itemValue}">
-                    </th:block>
-                    <button type="button" class="btn btn-sm btn-outline-secondary opacity-75 violationRemoveBtn">
-                      <i class="bi bi-dash-square text-danger"></i>
-                    </button>
-                  </div>
-                </div>
-              </th:block>
-            </div>
-          </div>
-        </div>
-
-
-
-
-
-      </div>
-      <div class="tab-pane fade p-2" id="processResultTabPanel" role="tabpanel" aria-labelledby="processResultTab" tabindex="0">
-        <div class="row mb-1">
-          <label for="processStatus" class="col-sm-1 col-form-label col-form-label-sm text-center">처리현황</label>
+      <label for="pressurizedN" class="col-sm-1 col-form-label col-form-label-sm text-center">미압송시</label>
       <div class="col-sm-2">
-            <select class="form-select form-select-sm processResultInfo" id="processStatus" name="processResult.processStatus">
+        <select class="form-select form-select-sm crackdownStatusInfo" name="pressurizedN" id="pressurizedN">
           <option value="">선택</option>
-              <th:block th:each="code:${prList}">
-                <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq crackdownStatus.processResult.processStatus}"></option>
-              </th:block>
+          <option value="Y" th:selected="${asfCov.pressurizedN eq 'A'}">현장조사</option>
+          <option value="N" th:selected="${asfCov.pressurizedN eq 'O'}">기타</option>
         </select>
       </div>
-          <label for="pressurizedTimeTakenDate" class="col-sm-1 col-form-label col-form-label-sm text-center">압송소요시간</label>
-          <div class="col-sm-2">
-            <th:block th:with="ptt=${crackdownStatus.processResult.pressurizedTimeTaken}">
-              <div class="input-group w-auto">
-                <input type="number" class="form-control form-control-sm pressurizedTimeTaken processResultInfo" id="pressurizedTimeTakenDate" placeholder="일" th:value="${#strings.substringBefore(ptt, '일')}">
-                <input type="text" class="form-control form-control-sm pressurizedTimeTaken processResultInfo timeSelector" id="pressurizedTimeTakenTime" placeholder="00:00" autocomplete="off" th:value="${#strings.substringAfter(ptt, '일')}">
-              </div>
-              <input type="hidden" class="processResultInfo" name="processResult.pressurizedTimeTaken" id="pressurizedTimeTaken" th:value="${ptt}">
-            </th:block>
-          </div>
-          <label for="warrantReqTakeDate" class="col-sm-1 col-form-label col-form-label-sm text-center fs-11">영장청구 소요시간</label>
-          <div class="col-sm-2">
-            <th:block th:with="wrtt=${crackdownStatus.processResult.warrantReqTakeTime}">
-              <div class="input-group w-auto">
-                <input type="number" class="form-control form-control-sm warrantReqTake processResultInfo" id="warrantReqTakeDate" placeholder="일" th:value="${#strings.substringBefore(wrtt, '일')}">
-                <input type="text" class="form-control form-control-sm warrantReqTake processResultInfo timeSelector" id="warrantReqTakeTime" placeholder="00:00" autocomplete="off" th:value="${#strings.substringAfter(wrtt, '일')}">
-              </div>
-              <input type="hidden" class="processResultInfo" name="processResult.warrantReqTakeTime" id="warrantReqTake" th:value="${wrtt}">
-          </div>
-        </div>
-
-        </div>
-
-        <hr>
-
-        <div class="row mb-1">
-          <label for="consignmentStartDt" class="col-sm-1 col-form-label col-form-label-sm text-center">위탁시작일</label>
-          <div class="col-sm-2">
-            <input type="text" class="form-control form-control-sm processResultInfo dateSelector" id="consignmentStartDt" name="processResult.consignmentStartDt" placeholder="0000-00-00" th:value="${crackdownStatus.processResult.consignmentStartDt}" autocomplete="off">
-          </div>
-          <label for="consignmentEndDt" class="col-sm-1 col-form-label col-form-label-sm text-center">위탁종료일</label>
-          <div class="col-sm-2">
-            <input type="text" class="form-control form-control-sm processResultInfo dateSelector" id="consignmentEndDt" name="processResult.consignmentEndDt" placeholder="0000-00-00" th:value="${crackdownStatus.processResult.consignmentEndDt}" autocomplete="off">
-          </div>
-          <label for="confiscationDt" class="col-sm-1 col-form-label col-form-label-sm text-center">몰수확정일</label>
-          <div class="col-sm-2">
-            <input type="text" class="form-control form-control-sm processResultInfo dateSelector" id="confiscationDt" name="processResult.confiscationDt" placeholder="0000-00-00" th:value="${crackdownStatus.processResult.confiscationDt}" autocomplete="off">
-          </div>
     </div>
     <div class="row mb-1">
-          <label for="boatDisposalDt" class="col-sm-1 col-form-label col-form-label-sm text-center">폐선일</label>
+      <label for="personCnt" class="col-sm-1 col-form-label col-form-label-sm text-center">검사인원</label>
       <div class="col-sm-2">
-            <input type="text" class="form-control form-control-sm processResultInfo dateSelector" id="boatDisposalDt" name="processResult.boatDisposalDt" placeholder="0000-00-00" th:value="${crackdownStatus.processResult.boatDisposalDt}" autocomplete="off">
+        <input type="text" class="form-control form-control-sm crackdownStatusInfo" id="personCnt" name="personCnt" th:value="${asfCov.personCnt}">
       </div>
-          <label for="boatDisposalType" class="col-sm-1 col-form-label col-form-label-sm text-center">폐선종류</label>
-          <div class="col-sm-2">
-            <select class="form-select form-select-sm processResultInfo" id="boatDisposalType" name="processResult.boatDisposalType">
-              <option value="">선택</option>
-              <th:block th:each="code:${bdtList}">
-                <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq crackdownStatus.processResult.boatDisposalType}"></option>
-              </th:block>
-            </select>
+      <label for="pressurizedN" class="col-sm-1 col-form-label col-form-label-sm text-center">코로나19 검사결과</label>
+      <label for="personPositiveCnt" class="col-sm-1 col-form-label col-form-label-sm text-center">양성</label>
+      <div class="col-sm-1">
+        <input type="text" class="form-control form-control-sm crackdownStatusInfo" id="personPositiveCnt" name="personPositiveCnt" th:value="${asfCov.personPositiveCnt}">
       </div>
-          <label for="returnDt" class="col-sm-1 col-form-label col-form-label-sm text-center">환부일</label>
-          <div class="col-sm-2">
-            <input type="text" class="form-control form-control-sm processResultInfo dateSelector" id="returnDt" name="processResult.returnDt" placeholder="0000-00-00" th:value="${crackdownStatus.processResult.returnDt}" autocomplete="off">
+      <label for="personNegativeCnt" class="col-sm-1 col-form-label col-form-label-sm text-center">음성</label>
+      <div class="col-sm-1">
+        <input type="text" class="form-control form-control-sm crackdownStatusInfo" id="personNegativeCnt" name="personNegativeCnt" th:value="${asfCov.personNegativeCnt}">
       </div>
     </div>
     <div class="row mb-1">
-          <th:block th:if="${#lists.isEmpty(crackdownStatus.sailorList)}">
-            <label for="captainRestriction" class="col-sm-1 col-form-label col-form-label-sm text-center">선장구속</label>
-            <div class="col-sm-2">
-              <select class="form-select form-select-sm sailorInfo" id="captainRestriction">
-                <option value="">선택</option>
-                <option value="Y">O</option>
-                <option value="N">X</option>
-              </select>
-            </div>
-            <label for="navigatingOfficerRestriction" class="col-sm-1 col-form-label col-form-label-sm text-center">항해장구속</label>
-            <div class="col-sm-2">
-              <select class="form-select form-select-sm sailorInfo" id="navigatingOfficerRestriction">
-                <option value="">선택</option>
-                <option value="Y">O</option>
-                <option value="N">X</option>
-              </select>
-            </div>
-            <label for="chiefEngineerRestriction" class="col-sm-1 col-form-label col-form-label-sm text-center">기관장구속</label>
-            <div class="col-sm-2">
-              <select class="form-select form-select-sm sailorInfo" id="chiefEngineerRestriction">
-                <option value="">선택</option>
-                <option value="Y">O</option>
-                <option value="N">X</option>
-              </select>
-            </div>
-          </th:block>
-          <th:block th:unless="${#lists.isEmpty(crackdownStatus.sailorList)}">
-            <label for="captainRestriction" class="col-sm-1 col-form-label col-form-label-sm text-center">선장구속</label>
-            <div class="col-sm-2">
-              <th:block th:each="sailor:${crackdownStatus.sailorList}">
-                <th:block th:if="${sailor.position eq 'POS001'}">
-                  <select class="form-select form-select-sm sailorInfo" id="captainRestriction">
-                    <option value="">선택</option>
-                    <option value="Y" th:selected="${sailor.isRestriction eq 'Y'}">O</option>
-                    <option value="N" th:selected="${sailor.isRestriction eq 'N'}">X</option>
-                  </select>
-                </th:block>
-              </th:block>
-            </div>
-            <label for="navigatingOfficerRestriction" class="col-sm-1 col-form-label col-form-label-sm text-center">항해장구속</label>
-            <div class="col-sm-2">
-              <th:block th:each="sailor:${crackdownStatus.sailorList}">
-                <th:block th:if="${sailor.position eq 'POS002'}">
-                  <select class="form-select form-select-sm sailorInfo" id="navigatingOfficerRestriction">
-                    <option value="">선택</option>
-                    <option value="Y" th:selected="${sailor.isRestriction eq 'Y'}">O</option>
-                    <option value="N" th:selected="${sailor.isRestriction eq 'N'}">X</option>
-                  </select>
-                </th:block>
-              </th:block>
-            </div>
-            <label for="chiefEngineerRestriction" class="col-sm-1 col-form-label col-form-label-sm text-center">기관장구속</label>
-            <div class="col-sm-2">
-              <th:block th:each="sailor:${crackdownStatus.sailorList}">
-                <th:block th:if="${sailor.position eq 'POS003'}">
-                  <select class="form-select form-select-sm sailorInfo" id="chiefEngineerRestriction">
-                    <option value="">선택</option>
-                    <option value="Y" th:selected="${sailor.isRestriction eq 'Y'}">O</option>
-                    <option value="N" th:selected="${sailor.isRestriction eq 'N'}">X</option>
-                  </select>
-                </th:block>
-              </th:block>
-            </div>
-          </th:block>
-        </div>
-        <div class="row mb-1">
-          <label for="sailorAddBtn" class="col-sm-1 col-form-label col-form-label-sm text-center">
-            선원구속
-            <button type="button" class="border-0 sailorInfo" id="sailorAddBtn">
-              <i class="bi bi-plus-square text-primary"></i>
-            </button>
-          </label>
-          <div class="col-sm-10 row" id="sailorRestrictionHome">
-            <th:block th:each="sailor:${crackdownStatus.sailorList}">
-              <th:block th:if="${sailor.position eq 'POS005' or sailor.position eq 'POS006'}">
-                <div class="col-4 sailorRestriction">
-                  <div class="input-group">
-                    <select class="form-select form-select-sm sailorInfo isRestriction normalSailorPosition" style="width: 75px">
-                      <option value="">직책</option>
-                      <option value="POS005" th:selected="${sailor.position eq 'POS005'}">기타 간부선원</option>
-                      <option value="POS006" th:selected="${sailor.position eq 'POS006'}">일반선원 또는 확인불가</option>
-                    </select>
-                    <select class="form-select form-select-sm sailorInfo isRestriction w-auto normalSailorRestriction">
-                      <option value="">선택</option>
-                      <option value="Y" th:selected="${sailor.isRestriction eq 'Y'}">O</option>
-                      <option value="N" th:selected="${sailor.isRestriction eq 'N'}">X</option>
-                    </select>
-                    <input type="text" class="form-control form-control-sm sailorInfo normalSailorNm w-auto" placeholder="이름" th:value="${sailor.sailorNameKr}">
-                    <button type="button" class="btn btn-sm btn-outline-secondary sailorInfo w-auto opacity-75 sailorRemoveBtn">
-                      <i class="bi bi-dash-square text-danger"></i>
-                    </button>
-                  </div>
-                </div>
-              </th:block>
-            </th:block>
-          </div>
-        </div>
-        <div class="row mb-1">
-          <label for="exileCnt" class="col-sm-1 col-form-label col-form-label-sm text-center">추방인원</label>
-          <div class="col-sm-2">
-            <input type="text" class="form-control form-control-sm processResultInfo" id="exileCnt" name="processResult.exileCnt" placeholder="00명" th:value="${crackdownStatus.processResult.exileCnt}">
-          </div>
-          <label for="exileDt" class="col-sm-1 col-form-label col-form-label-sm text-center">추방일</label>
-          <div class="col-sm-2">
-            <input type="text" class="form-control form-control-sm processResultInfo dateSelector" id="exileDt" name="processResult.exileDt" placeholder="0000-00-00" th:value="${crackdownStatus.processResult.exileDt}" autocomplete="off">
-          </div>
-          <label for="flight" class="col-sm-1 col-form-label col-form-label-sm text-center">항공편</label>
-          <div class="col-sm-2">
-            <input type="text" class="form-control form-control-sm processResultInfo" id="flight" name="processResult.flight" th:value="${crackdownStatus.processResult.flight}">
-          </div>
-        </div>
-        <div class="row mb-3">
-          <label for="immigrationOfficeName" class="col-sm-1 col-form-label col-form-label-sm text-center">출입국 담당자</label>
-          <div class="col-sm-4">
-            <div class="input-group w-auto">
-              <input type="text" class="form-control form-control-sm processResultInfo" id="immigrationOfficeName" name="processResult.immigrationOfficeName" placeholder="사무소명" th:value="${crackdownStatus.processResult.immigrationOfficeName}">
-              <input type="text" class="form-control form-control-sm processResultInfo" id="immigrationOfficeOfficerName" name="processResult.immigrationOfficeOfficerName" placeholder="이름" th:value="${crackdownStatus.processResult.immigrationOfficeOfficerName}">
-              <input type="text" class="form-control form-control-sm processResultInfo" id="immigrationOfficeOfficerContact" name="processResult.immigrationOfficeOfficerContact" placeholder="연락처" th:value="${crackdownStatus.processResult.immigrationOfficeOfficerContact}">
-            </div>
-          </div>
-        </div>
+        <label for="asfcovActionDetail" class="col-sm-1 col-form-label col-form-label-sm text-center">검/방역조치내용</label>
+        <div class="col-sm-11">
+          <textarea class="form-control form-control-sm" rows="5" cols="30" name="asfcovActionDetail" th:value="${asfCov.asfcovActionDetail}"></textarea>
         </div>
     </div>
   </form>
 </div>
 <div class="modal-footer bg-light">
-  <!--<button type="button" class="btn btn-warning" id="saveTempBtn">임시저장</button>-->
-  <button type="button" class="btn btn-primary" id="saveResultBtn">저장</button>
+<!--  <button type="button" class="btn btn-warning" id="saveTempBtn" data-contentStatus="DST001">임시저장</button>-->
   <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
+  <button type="button" class="btn btn-primary" id="saveBtn">저장</button>
 </div>

src/main/resources/templates/faStatistics/asfCov/asfCovViewModal.html

@@ -1,10 +1,69 @@
 <!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Title</title>
-</head>
-<body>
+<html lang="ko" xmlns:th="http://www.thymeleaf.org">
+<div class="modal-header bg-dark">
+    <h5 class="modal-title text-white" id="processResultEditModalLabel" th:text="${asfCov.asfCovKey eq null ? '불법조업 외국어선 처리현황' : '불법조업 외국어선 처리현황'}">></h5>
+    <button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
+</div>
+<!-- 탭 메뉴 -->
+<ul class="nav nav-tabs" role="tablist">
+    <li class="nav-item" role="presentation">
+        <button class="nav-link processResultTab active" id="processResult-tab" data-bs-toggle="tab"
+                data-bs-target="#processResult" type="button" role="tab" aria-controls="processResult" data-processResult-type="processResult"
+                aria-selected="true">상세</button>
+    </li>
+    <li class="nav-item" role="presentation">
+        <button class="nav-link processResultTab" id="history-tab" data-bs-toggle="tab"
+                data-bs-target="#history" type="button" role="tab" data-history-type="history"
+                aria-controls="history">수정이력</button>
+    </li>
+</ul>
+<!-- 내용 -->
+<div class="tab-content" style="overflow-y: auto;">
+    <div class="tab-pane fade show active" id="processResult" role="tabpanel" aria-labelledby="processResult-tab">
+        <div class="modal-body" id="processResultEditBody">
+            <form action="#" method="post" id="processResultEditForm">
+                <input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
+                <input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
+                <input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
+                <input type="hidden" name="cdsKey" th:value="${asfCov.cdsKey}">
+                <input type="hidden" name="fbKey" th:value="${asfCov.fbKey}">
+                <input type="hidden" name="wrtOrgan" th:value="${asfCov.wrtOrgan}">
+                <input type="hidden" name="wrtUserNm" th:value="${asfCov.wrtUserNm}">
+                <input type="hidden" name="wrtDt" th:value="${#temporals.format(asfCov.wrtDt, 'yyyy-MM-dd HH:mm')}">
+                <input type="hidden" id="saveYn" name="saveYn">
+                <div class="row mb-1">
+                    <label class="col-sm-1 col-form-label col-form-label-sm text-center">사건번호</label>
+                    <div class="col-sm-2">
+                        <input class="form-control form-control-sm" name="caseNum" id="caseNum" th:value="${asfCov.caseNum}" readonly>
+                    </div>
+                    <label class="col-sm-1 col-form-label col-form-label-sm text-center">사건담당<br>경찰서</label>
+                    <div class="col-sm-2">
+                        <select class="form-select form-select-sm" name="crackdownPolice" id="crackdownPolice" disabled>
+                            <option value="">선택</option>
+                            <th:block th:each="commonCode:${session.commonCode.get('CPO')}">
+                                <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
+                                        th:selected="${pasfCov.crackdownPolice eq commonCode.itemCd}"></option>
+                            </th:block>
+                            <option value="etc" th:selected="${asfCov.crackdownPolice ne null && asfCov.crackdownPolice ne '' && !#strings.contains(asfCov.crackdownPolice, 'CPO')}">직접입력</option>
+                        </select>
+                    </div>
+                </div>
+                <div class="row mb-1">
+                    <label class="col-sm-1 col-form-label col-form-label-sm text-center">선명</label>
+                    <div class="col-sm-2">
+                        <input class="form-control form-control-sm" name="boatNameKr" id="boatNameKr" th:value="${asfCov.boatNameKr}" readonly>
+                    </div>
 
-</body>
+                </div>
+
+            </form>
+        </div>
+    </div>
+</div>
+<div class="modal-footer bg-light">
+    <th:block th:if="${userSeq eq asfCov.wrtUserSeq or accessAuth eq 'ACC003'}"><!--작성자일 경우 수정 허용--><!--관리자일 경우 수정 허용-->
+        <button type="button" class="btn btn-warning" id="processResultEditBtn">수정</button>
+    </th:block>
+    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
+</div>
 </html>