Merge branch 'master' of http://118.219.150.34:50501/DBNT/FAISP

# Conflicts:
#	src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/FishingBoat.java

src/main/java/com/dbnt/faisp/config/SecurityConfig.java

@@ -79,20 +79,22 @@ public class SecurityConfig{
               "/modal/**",
               "/publicBoard/**",
               "/faRpt/**",
+              "/ivsgt/**",
+              "/target/**",
+              "/equip/**",
               "/affairPlan/**",
               "/affair/**",
               "/affairResult/**",
-              "/equip/**",
+              "/faStatistics/**",
-              "/target/**",
               "/translator/**"
           ).hasRole(Role.USER.name()) // USER 접근 허용
           .antMatchers(
               "/authMgt/**",
-              "/userMgt/**",
+              "/userMgt/**"
-              "/organMgt/**"
           ).hasRole(Role.SUB_ADMIN.name()) // SUB_ADMIN 접근 허용
           .antMatchers(
               "/codeMgt/**",
+              "/organMgt/**",
               "/menuMgt/**"
           ).hasRole(Role.ADMIN.name()) // ADMIN 접근 허용
           .antMatchers(

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

@@ -74,20 +74,23 @@ public class FishingBoatController {
   }
 
   @GetMapping("/fishingBoatEditModal")
-  public ModelAndView crackdownStatusEditModal(@AuthenticationPrincipal UserInfo loginUser, ProcessResult processResult){
+  public ModelAndView fishingBoatEditModal(@AuthenticationPrincipal UserInfo loginUser, FishingBoat fishingBoat){
-    ModelAndView mav = new ModelAndView("faStatistics/processResult/processResultEditModal");
+    ModelAndView mav = new ModelAndView("faStatistics/fishingBoat/fishingBoatEditModal");
-    if(processResult.getPrKey()!=null){
+    if(fishingBoat.getFbKey()!=null && fishingBoat.getCdsKey()!=null){
-      processResult = processResultService.selectProcessResult(processResult.getPrKey());
+      /*processResult = processResultService.selectProcessResult(processResult.getPrKey());
       processResult.setCrackdownStatus(crackdownStatusRepository.findByCdsKey(processResult.getCdsKey()));
       processResult.setFbKey(fishingBoatRepository.findByCdsKey(processResult.getCdsKey()).getFbKey());
       processResult.setBoatNameKr(fishingBoatRepository.findByCdsKey(processResult.getCdsKey()).getBoatNameKr());
-      processResult.setViolationList(violationRepository.findByFbKey(processResult.getFbKey()));
+      processResult.setViolationList(violationRepository.findByFbKey(processResult.getFbKey()));*/
     }else{
-      processResult.setWrtOrgan(loginUser.getOgCd());
+      fishingBoat.setWrtOrgan(loginUser.getOgCd());
-      processResult.setWrtNm(loginUser.getUserNm());
+      fishingBoat.setWrtPart(loginUser.getOfcCd());
-      processResult.setWrtDt(LocalDateTime.now());
+      fishingBoat.setWrtUserSeq(loginUser.getUserSeq());
+      fishingBoat.setWrtUserNm(loginUser.getUserNm());
+      fishingBoat.setWrtUserGrd(loginUser.getTitleCd());
+      fishingBoat.setWrtDt(LocalDateTime.now());
     }
-    mav.addObject("processResult", processResult);
+    mav.addObject("fishingBoat", fishingBoat);
     return mav;
   }
 

src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/FishingBoat.java

@@ -24,108 +24,77 @@ public class FishingBoat extends BaseModel {
   @GeneratedValue(strategy = GenerationType.IDENTITY)
   @Column(name = "fb_key")
   private Integer fbKey;
-
   @Column(name = "cds_key")
   private Integer cdsKey;
-
   @Column(name = "boat_name_kr")
   private String boatNameKr;
-
   @Column(name = "boat_name_cn")
   private String boatNameCn;
-
   @Column(name = "permit_num")
   private String permitNum;
-
   @Column(name = "nationality")
   private String nationality;
-
   @Column(name = "ton_cnt")
   private Integer tonCnt;
-
   @Column(name = "fishery_type")
   private String fisheryType;
-
   @Column(name = "boat_material")
   private String boatMaterial;
-
   @Column(name = "boat_nny_sung")
   private String boatNnySung;
-
   @Column(name = "boat_nny_si")
   private String boatNnySi;
-
   @Column(name = "offense_type")
   private String offenseType;
-
   @Column(name = "offense_quantity")
   private Integer offenseQuantity;
-
   @Column(name = "offense_amount")
   private Integer offenseAmount;
-
   @Column(name = "offense_illegal_waste_quantity")
   private Integer offenseIllegalWasteQuantity;
-
   @Column(name = "dambo_unpaid_amount")
   private Integer damboUnpaidAmount;
-
   @Column(name = "dambo_payment")
   private Integer damboPayment;
-
   @Column(name = "payment_payment_dt")
   @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
   private LocalDateTime paymentPaymentDt;
-
   @Column(name = "confiscation_frame")
   private String confiscationFrame;
-
   @Column(name = "confiscation_width")
   private String confiscationWidth;
-
   @Column(name = "confiscation_jo")
   private String confiscationJo;
-
   @Column(name = "confiscation_gae")
   private String confiscationGae;
-
   @Column(name = "confiscation_etc")
   private String confiscationEtc;
-
   @Column(name = "catch_fish_species")
   private String catchFishSpecies;
-
   @Column(name = "catch_cnt")
   private Integer catchCnt;
-
   @Column(name = "offense_fish_species")
   private String offenseFishSpecies;
-
   @Column(name = "offense_catch_cnt")
   private Integer offenseCatchCnt;
-
   @Column(name = "save_yn")
   private String saveYn;
-
   @Column(name = "wrt_organ")
   private String wrtOrgan;
-
   @Column(name = "wrt_part")
   private String wrtPart;
-
   @Column(name = "wrt_user_seq")
   private Integer wrtUserSeq;
-
-  @Column(name = "wrt_user_grd")
-  private String wrtUserGrd;
-
   @Column(name = "wrt_user_nm")
   private String wrtUserNm;
-
+  @Column(name = "wrt_user_grd")
+  private String wrtUserGrd;
   @Column(name = "wrt_dt")
   @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
   private LocalDateTime wrtDt;
 
+  @Transient
+  private String year;
   @Transient
   private String caseAgency;
   @Transient

src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/Violation.java

@@ -1,13 +1,12 @@
 package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model;
 
 import com.dbnt.faisp.config.BaseModel;
-import lombok.Getter;
+import lombok.*;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
+import java.io.Serializable;
 
 @Getter
 @Setter
@@ -16,11 +15,12 @@ import javax.persistence.*;
 @DynamicInsert
 @DynamicUpdate
 @Table(name = "violation")
+@IdClass(Violation.ViolationId.class)
 public class Violation extends BaseModel {
   @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
   @Column(name = "violation_key")
   private Integer violationKey;
+  @Id
   @Column(name = "fb_key")
   private Integer fbKey;
   @Column(name = "violation")
@@ -28,4 +28,13 @@ public class Violation extends BaseModel {
 
   @Transient
   private String violationEtc;
+
+  @Embeddable
+  @Data
+  @NoArgsConstructor
+  @AllArgsConstructor
+  public static class ViolationId implements Serializable{
+    private Integer violationKey;
+    private Integer fbKey;
+  }
 }

src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/ViolationRepository.java

@@ -9,7 +9,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
-public interface ViolationRepository extends JpaRepository<Violation, Integer> {
+public interface ViolationRepository extends JpaRepository<Violation, Violation.ViolationId> {
     List<Violation> findByFbKey(Integer fbKey);
 
     @Transactional

src/main/resources/static/css/common.css

@@ -70,3 +70,10 @@
   /*왜 안돌까?*/
   /*transform: rotate(90deg);*/
 }
+
+.fs-13{
+  font-size: 13px;
+}
+.fs-11{
+  font-size: 11px;
+}

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

@@ -0,0 +1,19 @@
+$(document).on('click', '#getFishingBoatEditModalBtn', function (){
+  getFishingBoatEditModal(null, null);
+})
+
+function getFishingBoatEditModal(fbKey, cdsKey){
+  $.ajax({
+    url: '/faStatistics/fishingBoatEditModal',
+    data: {fbKey: fbKey, cdsKey: cdsKey},
+    type: 'GET',
+    dataType:"html",
+    success: function(html){
+      $("#fishingBoatEditModalContent").empty().append(html)
+      $("#fishingBoatEditModal").modal('show');
+    },
+    error:function(){
+
+    }
+  });
+}

src/main/resources/templates/faStatistics/fishingBoat/fishingBoatEditModal.html

@@ -0,0 +1,379 @@
+<!DOCTYPE html>
+<html lang="ko" xmlns:th="http://www.thymeleaf.org">
+<div class="modal-header">
+  <h5 class="modal-title" id="fishingBoatEditModalLabel" th:text="${fishingBoat.fbKey eq null?'외국어선정보 작성':'외국어선정보 수정'}"></h5>
+  <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+</div>
+<div class="modal-body">
+  <form action="#" method="post" id="fishingBoatEditForm">
+    <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="fbKey" th:value="${fishingBoat.fbKey}">
+    <input type="hidden" name="cdsKey" th:value="${fishingBoat.cdsKey}">
+    <input type="hidden" name="saveYn" id="saveYn" th:value="${fishingBoat.saveYn}">
+    <input type="hidden" name="wrtOrgan" th:value="${fishingBoat.wrtOrgan}">
+    <input type="hidden" name="wrtPart" th:value="${fishingBoat.wrtPart}">
+    <input type="hidden" name="wrtUserSeq" th:value="${fishingBoat.wrtUserSeq}">
+    <input type="hidden" name="wrtUserNm" th:value="${fishingBoat.wrtUserNm}">
+    <input type="hidden" name="wrtUserGrd" th:value="${fishingBoat.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 border border-top-0">
+      <div class="tab-pane fade p-2 show active" id="baseInfoTabPanel" role="tabpanel" aria-labelledby="baseInfoTab" tabindex="0">
+        <div class="mb-3 row">
+          <label for="wrtUserNm" 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" id="wrtUserNm" name="wrtUserNm">
+          </div>
+          <label for="wrtDt" 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" id="wrtDt" name="wrtDt">
+          </div>
+          <label for="wrtUserNm" 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" id="wrtUserNm" name="wrtUserNm">
+          </div>
+          <label for="wrtDt" 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" id="wrtDt" name="wrtDt">
+          </div>
+        </div>
+        <div class="mb-3 row">
+          <label for="wrtUserNm" 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" id="wrtUserNm" name="wrtUserNm">
+          </div>
+          <label for="wrtDt" 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" id="wrtDt" name="wrtDt">
+          </div>
+        </div>
+        <div class="mb-3 row">
+          <label for="wrtUserNm" 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" id="wrtUserNm" name="wrtUserNm">
+          </div>
+          <label for="wrtDt" 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" id="wrtDt" name="wrtDt">
+          </div>
+          <label for="wrtDt" 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" id="wrtDt" name="wrtDt">
+          </div>
+        </div>
+      </div>
+      <div class="tab-pane fade p-2" id="sailorTabPanel" role="tabpanel" aria-labelledby="sailorTab" tabindex="0">
+        <div class="row">
+          <div class="col-6">
+            <div class="mb-3 row">
+              <label for="wrtUserNm" class="col-sm-2 col-form-label col-form-label-sm text-center">&nbsp;</label>
+            </div>
+            <div class="mb-3 row">
+              <label for="wrtUserNm" class="col-sm-2 col-form-label col-form-label-sm text-center">선장명</label>
+              <div class="col-sm-10 input-group w-auto">
+                <input type="text" class="form-control form-control-sm" id="wrtUserNm" name="wrtUserNm" placeholder="한글">
+                <input type="text" class="form-control form-control-sm" id="wrtUserNm" name="wrtUserNm" placeholder="중문">
+                <input type="text" class="form-control form-control-sm" id="wrtUserNm" name="wrtUserNm" placeholder="병음">
+              </div>
+            </div>
+            <div class="mb-3 row">
+              <label for="wrtUserNm" class="col-sm-2 col-form-label col-form-label-sm text-center">생년월일</label>
+              <div class="col-sm-4">
+                <input type="text" class="form-control form-control-sm" id="wrtUserNm" name="wrtUserNm">
+              </div>
+              <label for="wrtUserNm" class="col-sm-2 col-form-label col-form-label-sm text-center">연락처</label>
+              <div class="col-sm-4">
+                <input type="text" class="form-control form-control-sm" id="wrtUserNm" name="wrtUserNm">
+              </div>
+            </div>
+            <div class="mb-3 row">
+              <label for="wrtUserNm" class="col-sm-2 col-form-label col-form-label-sm text-center">주소</label>
+              <div class="col-sm-4">
+                <input type="text" class="form-control form-control-sm" id="wrtUserNm" name="wrtUserNm">
+              </div>
+              <label for="wrtUserNm" class="col-sm-2 col-form-label col-form-label-sm text-center">재범횟수</label>
+              <div class="col-sm-4">
+                <input type="text" class="form-control form-control-sm" id="wrtUserNm" name="wrtUserNm">
+              </div>
+            </div>
+            <div class="mb-3 row">
+              <label for="wrtUserNm" class="col-sm-2 col-form-label col-form-label-sm text-center">비고</label>
+              <div class="col-sm-10">
+                <input type="text" class="form-control form-control-sm" id="wrtUserNm" name="wrtUserNm">
+              </div>
+            </div>
+          </div>
+          <div class="col-6 border-start">
+            <div class="mb-3 row">
+              <div class="col-sm-4 ms-3 input-group w-auto">
+                <input type="checkbox" id="wrtUserNm">
+                <label for="wrtUserNm" class="col-form-label col-form-label-sm ps-2">좌측동일</label>
+              </div>
+            </div>
+            <div class="mb-3 row">
+              <label for="wrtUserNm" class="col-sm-2 col-form-label col-form-label-sm text-center">선주명</label>
+              <div class="col-sm-10 input-group w-auto">
+                <input type="text" class="form-control form-control-sm" id="wrtUserNm" name="wrtUserNm" placeholder="한글">
+                <input type="text" class="form-control form-control-sm" id="wrtUserNm" name="wrtUserNm" placeholder="중문">
+                <input type="text" class="form-control form-control-sm" id="wrtUserNm" name="wrtUserNm" placeholder="병음">
+              </div>
+            </div>
+            <div class="mb-3 row">
+              <label for="wrtUserNm" class="col-sm-2 col-form-label col-form-label-sm text-center">생년월일</label>
+              <div class="col-sm-4">
+                <input type="text" class="form-control form-control-sm" id="wrtUserNm" name="wrtUserNm">
+              </div>
+              <label for="wrtUserNm" class="col-sm-2 col-form-label col-form-label-sm text-center">연락처</label>
+              <div class="col-sm-4">
+                <input type="text" class="form-control form-control-sm" id="wrtUserNm" name="wrtUserNm">
+              </div>
+            </div>
+            <div class="mb-3 row">
+              <label for="wrtUserNm" class="col-sm-2 col-form-label col-form-label-sm text-center">주소</label>
+              <div class="col-sm-4">
+                <input type="text" class="form-control form-control-sm" id="wrtUserNm" name="wrtUserNm">
+              </div>
+            </div>
+            <div class="mb-3 row">
+              <label for="wrtUserNm" class="col-sm-2 col-form-label col-form-label-sm text-center">비고</label>
+              <div class="col-sm-10">
+                <input type="text" class="form-control form-control-sm" id="wrtUserNm" name="wrtUserNm">
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="tab-pane fade p-2" id="fishingBoatTabPanel" role="tabpanel" aria-labelledby="fishingBoatTab" tabindex="0">
+        <div class="mb-3 row">
+          <label for="wrtUserNm" class="col-sm-1 col-form-label col-form-label-sm text-center">선명</label>
+          <div class="col-sm-4 input-group w-auto">
+            <input type="text" class="form-control form-control-sm" id="wrtUserNm" name="wrtUserNm" placeholder="한글">
+            <input type="text" class="form-control form-control-sm" id="wrtUserNm" name="wrtUserNm" placeholder="중문">
+          </div>
+          <div class="col-sm-1"></div>
+          <label for="wrtDt" 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" id="wrtDt" name="wrtDt">
+          </div>
+        </div>
+        <div class="mb-3 row">
+          <label for="wrtUserNm" 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" id="wrtUserNm" name="wrtUserNm">
+          </div>
+          <label for="wrtDt" 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" id="wrtDt" name="wrtDt">
+          </div>
+          <label for="wrtDt" 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" id="wrtDt" name="wrtDt">
+          </div>
+          <label for="wrtDt" 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" id="wrtDt" name="wrtDt">
+          </div>
+        </div>
+        <div class="mb-3 row">
+          <label for="wrtUserNm" 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" id="wrtUserNm" name="wrtUserNm">
+          </div>
+          <label for="wrtDt" 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" id="wrtDt" name="wrtDt">
+          </div>
+          <label for="wrtDt" class="col-sm-1 col-form-label col-form-label-sm text-center">선적지</label>
+          <div class="col-sm-2 input-group w-auto">
+            <input type="text" class="form-control form-control-sm" id="wrtDt" name="wrtDt" placeholder="성">
+            <input type="text" class="form-control form-control-sm" id="wrtDt" name="wrtDt" placeholder="시">
+          </div>
+        </div>
+        <div class="mb-3 row">
+          <label for="wrtUserNm" class="col-sm-1 col-form-label col-form-label-sm text-center">범칙물</label>
+          <div class="col-sm-3 input-group w-auto">
+            <input type="text" class="form-control form-control-sm" id="wrtUserNm" name="wrtUserNm">
+            <input type="text" class="form-control form-control-sm" id="wrtUserNm" name="wrtUserNm" placeholder="kg">
+          </div>
+          <div class="col-sm-1"></div>
+          <label for="wrtDt" 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" id="wrtDt" name="wrtDt">
+          </div>
+          <label for="wrtDt" class="col-sm-1 col-form-label col-form-label-sm text-center fs-11">범칙물 위판금액</label>
+          <div class="col-sm-2">
+            <input type="text" class="form-control form-control-sm" id="wrtDt" name="wrtDt">
+          </div>
+        </div>
+        <div class="mb-3 row">
+          <label for="wrtUserNm" 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" id="wrtUserNm" name="wrtUserNm">
+          </div>
+          <label for="wrtDt" 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" id="wrtDt" name="wrtDt">
+          </div>
+          <label for="wrtDt" 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" id="wrtDt" name="wrtDt">
+          </div>
+          <label for="wrtDt" class="col-sm-1 col-form-label col-form-label-sm text-center fs-11">담보금 납부일시</label>
+          <div class="col-sm-2">
+            <input type="text" class="form-control form-control-sm" id="wrtDt" name="wrtDt">
+          </div>
+        </div>
+        <div class="mb-3 row">
+          <label for="wrtUserNm" class="col-sm-1 col-form-label col-form-label-sm text-center">압수어구</label>
+          <div class="col-sm-8 input-group w-auto">
+            <input type="text" class="form-control form-control-sm" id="wrtUserNm" name="wrtUserNm" placeholder="틀">
+            <input type="text" class="form-control form-control-sm" id="wrtUserNm" name="wrtUserNm" placeholder="폭">
+            <input type="text" class="form-control form-control-sm" id="wrtUserNm" name="wrtUserNm" placeholder="조">
+            <input type="text" class="form-control form-control-sm" id="wrtUserNm" name="wrtUserNm" placeholder="개">
+            <input type="text" class="form-control form-control-sm" id="wrtUserNm" name="wrtUserNm" placeholder="기타">
+          </div>
+        </div>
+      </div>
+      <div class="tab-pane fade p-2" id="processResultTabPanel" role="tabpanel" aria-labelledby="processResultTab" tabindex="0">
+        <div class="mb-3 row">
+          <label for="wrtUserNm" 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" id="wrtUserNm" name="wrtUserNm">
+          </div>
+          <label for="wrtDt" 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" id="wrtDt" name="wrtDt">
+          </div>
+          <label for="wrtDt" class="col-sm-1 col-form-label col-form-label-sm text-center fs-11">영장청구 소요시간</label>
+          <div class="col-sm-2">
+            <input type="text" class="form-control form-control-sm" id="wrtDt" name="wrtDt">
+          </div>
+          <label for="wrtDt" 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" id="wrtDt" name="wrtDt">
+          </div>
+        </div>
+        <div class="mb-3 row">
+          <label for="wrtUserNm" 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" id="wrtUserNm" name="wrtUserNm">
+          </div>
+          <label for="wrtDt" 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" id="wrtDt" name="wrtDt">
+          </div>
+          <label for="wrtDt" 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" id="wrtDt" name="wrtDt">
+          </div>
+          <label for="wrtDt" 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" id="wrtDt" name="wrtDt">
+          </div>
+        </div>
+        <div class="mb-3 row">
+          <label for="wrtUserNm" 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" id="wrtUserNm" name="wrtUserNm">
+          </div>
+          <label for="wrtDt" 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" id="wrtDt" name="wrtDt">
+          </div>
+        </div>
+        <hr>
+        <div class="mb-3 row">
+          <label for="wrtUserNm" 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" id="wrtUserNm" name="wrtUserNm">
+          </div>
+          <label for="wrtDt" 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" id="wrtDt" name="wrtDt">
+          </div>
+          <label for="wrtDt" 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" id="wrtDt" name="wrtDt">
+          </div>
+          <label for="wrtDt" 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" id="wrtDt" name="wrtDt">
+          </div>
+        </div>
+        <div class="mb-3 row">
+          <label for="wrtUserNm" 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" id="wrtUserNm" name="wrtUserNm">
+          </div>
+          <label for="wrtDt" 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" id="wrtDt" name="wrtDt">
+          </div>
+        </div>
+        <div class="mb-3 row">
+          <label for="wrtUserNm" 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" id="wrtUserNm" name="wrtUserNm">
+          </div>
+          <label for="wrtDt" 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" id="wrtDt" name="wrtDt">
+          </div>
+          <label for="wrtDt" 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" id="wrtDt" name="wrtDt">
+          </div>
+        </div>
+        <div class="mb-3 row">
+          <label for="wrtUserNm" 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" id="wrtUserNm" name="wrtUserNm">
+          </div>
+          <label for="wrtDt" 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" id="wrtDt" name="wrtDt">
+          </div>
+        </div>
+        <div class="mb-3 row">
+          <label for="wrtUserNm" 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" id="wrtUserNm" name="wrtUserNm">
+          </div>
+          <label for="wrtDt" 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" id="wrtDt" name="wrtDt">
+          </div>
+          <label for="wrtDt" 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" id="wrtDt" name="wrtDt">
+          </div>
+        </div>
+        <div class="row mb-3">
+          <label for="wrtDt" class="col-sm-1 col-form-label col-form-label-sm text-center">선원구속</label>
+          <div class="col-sm-3 input-group w-auto">
+            <input type="text" class="form-control form-control-sm" id="wrtDt" name="wrtDt">
+            <input type="text" class="form-control form-control-sm" id="wrtDt" name="wrtDt" placeholder="인원수">
+          </div>
+        </div>
+      </div>
+    </div>
+  </form>
+</div>
+<div class="modal-footer">
+  <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
+  <button type="button" class="btn btn-warning" id="saveTempBtn">임시저장</button>
+  <button type="button" class="btn btn-primary" id="saveResultBtn">저장</button>
+</div>

src/main/resources/templates/faStatistics/fishingBoat/fishingBoatMgt.html

@@ -4,8 +4,7 @@
       xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
       layout:decorate="~{layout/layout}">
 <th:block layout:fragment="script">
-  <script type="text/javascript" th:src="@{/js/publicBoard/publicBoard.js}"></script>
+  <script type="text/javascript" th:src="@{/js/faStatistics/fishingBoatMgt.js}"></script>
-  <script type="text/javascript" th:src="@{/js/publicBoard/notice.js}"></script>
 </th:block>
 <div layout:fragment="content">
   <main class="pt-3">
@@ -66,7 +65,14 @@
                 </div>
                 <div class="row justify-content-end">
                   <div class="col-auto">
-
+                    <select class="form-select form-select-sm">
+                      <option value="">연도</option>
+                      <th:block th:each="year : ${#numbers.sequence(2020, 2030)}">
+                        <option th:value="${year}" th:text="${year}" th:selected="${searchParams.year eq year}"></option>
+                      </th:block>
+                    </select>
+                  </div>
+                  <div class="col-auto">
                     <select class="form-select form-select-sm">
                       <option value="">선질</option>
                       <th:block th:each="commonCode:${session.commonCode.get('BM')}">
@@ -182,7 +188,7 @@
                       </nav>
                     </div>
                     <div class="col-auto">
-                      <input type="button" class="btn btn-success" value="등록" id="addNoticeBtn" sec:authorize="hasRole('ROLE_SUB_ADMIN')">
+                      <input type="button" class="btn btn-success" value="등록" id="getFishingBoatEditModalBtn">
                     </div>
                   </div>
                 </div>
@@ -194,9 +200,9 @@
     </div>
   </main>
 
-  <div class="modal fade" id="editModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="editModalLabel" aria-hidden="true">
+  <div class="modal fade" id="fishingBoatEditModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="fishingBoatEditModalLabel" aria-hidden="true">
-    <div class="modal-dialog modal-xl modal-dialog-scrollable">
+    <div class="modal-dialog modal-xxl modal-dialog-scrollable">
-      <div class="modal-content" id="editContent">
+      <div class="modal-content" id="fishingBoatEditModalContent">
 
       </div>
     </div>