불법조업 외국어선 정보 작업중.

src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/UnlawfulFishingController.java

@@ -112,19 +112,10 @@ public class UnlawfulFishingController {
     AccessConfig accessConfig = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/unlawfulFishing/illegalShipInfo").get(0);
     mav.addObject("menuKey", accessConfig.getMenuKey());
     mav.addObject("accessAuth", accessConfig.getAccessAuth());
-
+    params.setQueryInfo();
-    if(params.getYear()==null){
+    mav.addObject("illegalShipInfoList", unlawfulFishingService.selectIllegalShipInfoList(params));
-      params.setYear(LocalDateTime.now().getYear());
+    params.setContentCnt(unlawfulFishingService.selectIllegalShipInfoListCnt(params));
-    }
+    params.setPaginationInfo();
-    List<Integer> yearList = unlawfulFishingService.selectFishingBoatYearParam();
-    if(!yearList.contains(params.getYear())){
-      yearList.add(params.getYear());
-    }
-    List<CrackdownStatusDTO> csDTOList = new ArrayList<>();
-    CSStatistics statistics = new CSStatistics();
-
-    mav.addObject("illegalShipInfoList", csDTOList);
-    mav.addObject("yearList", yearList);
     mav.addObject("searchParams", params);
     return mav;
   }
@@ -140,12 +131,17 @@ public class UnlawfulFishingController {
       illegalShipInfo.setWrtUserSeq(loginUser.getUserSeq());
       illegalShipInfo.setWrtUserGrd(loginUser.getTitleCd());
       illegalShipInfo.setWrtUserNm(loginUser.getUserNm());
-      illegalShipInfo.setWrtDt(LocalDateTime.now());
     }
     mav.addObject("illegalShipInfo", illegalShipInfo);
     return mav;
   }
 
+  @PostMapping("/saveIllegalShipInfo")
+  public Integer saveIllegalShipInfo(@AuthenticationPrincipal UserInfo loginUser, IllegalShipInfo illegalShipInfo){
+    illegalShipInfo.setWrtDt(LocalDateTime.now());
+    return unlawfulFishingService.saveIllegalShipInfo(illegalShipInfo);
+  }
+
   @GetMapping("/isiSelectModal")
   public ModelAndView illegalShipInfoSelectModal(@AuthenticationPrincipal UserInfo loginUser, IllegalShipInfo params){
     ModelAndView mav = new ModelAndView("faStatistics/unlawfulFishing/illegalShipInfo/isiSelectModal");

src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/mapper/UnlawfulFishingMapper.java

@@ -2,6 +2,7 @@ package com.dbnt.faisp.main.faStatistics.unlawfulFishing.mapper;
 
 import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.UnlawfulFishingParam;
 import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.crackdownStatus.CrackdownInfo;
+import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.fishingBoat.IllegalShipInfo;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -14,4 +15,8 @@ public interface UnlawfulFishingMapper {
   List<CrackdownInfo> selectCrackdownInfoList(UnlawfulFishingParam params);
 
   Integer selectCrackdownInfoListCnt(UnlawfulFishingParam params);
+
+  List<IllegalShipInfo> selectIllegalShipInfoList(UnlawfulFishingParam params);
+
+  Integer selectIllegalShipInfoListCnt(UnlawfulFishingParam params);
 }

src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/fishingBoat/IllegalShipInfo.java

@@ -26,27 +26,5 @@ public class IllegalShipInfo extends FishingBoatBaseEntity {
   private String status;
 
   @Transient
-  private String year;
+  private String caseNum;
-  @Transient
-  private String caseAgency;
-  @Transient
-  private String crackdownPolice;
-  @Transient
-  private String crackdownBoat;
-  @Transient
-  private String boatNny;
-  @Transient
-  private String processStatus;
-  @Transient
-  private String violation;
-
-  @Transient
-  private String boatMaterialEtc;
-  @Transient
-  private String fisheryTypeEtc;
-
-  @Transient
-  private Double tonMin;
-  @Transient
-  private Double tonMax;
 }

src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/service/UnlawfulFishingService.java

@@ -4,6 +4,7 @@ import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.UnlawfulFishingPar
 import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.crackdownStatus.*;
 import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.fishingBoat.FishingBoat;
 import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.fishingBoat.IllegalShipInfo;
+import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.fishingBoat.IllegalShipInfoHistory;
 import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.processResult.ShipProcessInfo;
 import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.sailor.IllegalShipSailor;
 import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.sailor.Sailor;
@@ -172,4 +173,25 @@ public class UnlawfulFishingService {
   public Integer selectCrackdownInfoListCnt(UnlawfulFishingParam params) {
     return unlawfulFishingMapper.selectCrackdownInfoListCnt(params);
   }
+
+  @Transactional
+  public Integer saveIllegalShipInfo(IllegalShipInfo illegalShipInfo) {
+    Integer fbKey = isiRepository.save(illegalShipInfo).getFbKey();
+    if(!illegalShipInfo.getStatus().equals("DST001")){
+      IllegalShipInfoHistory lastHistory = isihRepository.findTop1ByFbKeyOrderByVersionNoDesc(fbKey).orElse(null);
+      IllegalShipInfoHistory isiHistory = new IllegalShipInfoHistory();
+      BeanUtils.copyProperties(illegalShipInfo, isiHistory);
+      isiHistory.setVersionNo(lastHistory==null?1:lastHistory.getVersionNo()+1);
+      isihRepository.save(isiHistory);
+    }
+    return fbKey;
+  }
+
+  public List<IllegalShipInfo> selectIllegalShipInfoList(UnlawfulFishingParam params) {
+    return unlawfulFishingMapper.selectIllegalShipInfoList(params);
+  }
+
+  public Integer selectIllegalShipInfoListCnt(UnlawfulFishingParam params) {
+    return unlawfulFishingMapper.selectIllegalShipInfoListCnt(params);
+  }
 }

src/main/resources/mybatisMapper/UnlawfulFishingMapper.xml

@@ -101,4 +101,38 @@
       </if>
     </if>
   </sql>
+
+
+  <select id="selectIllegalShipInfoList" resultType="IllegalShipInfo" parameterType="UnlawfulFishingParam">
+    select fb_key,
+           a.cds_key ,
+           b.case_num ,
+           boat_name_kr,
+           permit_num,
+           nationality,
+           sailor_cnt,
+           ton_cnt,
+           fishery_type,
+           boat_material,
+           boat_nny_sung,
+           boat_nny_si,
+           a.wrt_organ ,
+           a.wrt_part ,
+           a.wrt_user_grd ,
+           a.wrt_user_nm ,
+           a.wrt_dt
+    from illegal_ship_info a
+          left outer join crackdown_info b on a.cds_key = b.cds_key
+    <include refid="selectIllegalShipInfoListWhere"></include>
+    order by a.wrt_dt desc
+    limit #{rowCnt} offset #{firstIndex}
+  </select>
+  <select id="selectIllegalShipInfoListCnt" resultType="int" parameterType="UnlawfulFishingParam">
+    select count(*)
+    from illegal_ship_info a
+    <include refid="selectIllegalShipInfoListWhere"></include>
+  </select>
+  <sql id="selectIllegalShipInfoListWhere">
+    where a.status &lt;> 'DST008'
+  </sql>
 </mapper>

src/main/resources/static/js/faStatistics/unlawfulFishing/cdiSelectModal.js

@@ -0,0 +1,42 @@
+
+$(document).on('click', '#selectCrackdownInfoBtn', function (){
+  getCdiSelectModal(null);
+})
+
+$(document).on('click', '.cdiTr', function (){
+  $(".cdiCheckbox").prop('checked', false)
+  $(this).find('.cdiCheckbox').prop('checked', true)
+})
+
+$(document).on('click', '#cdiSelectBtn', function (){
+  const selectedCheckbox = $(".cdiCheckbox:checked")
+  if(selectedCheckbox.length>0){
+    const modalBody = $(".modal-body")
+    modalBody.find("#cdsKey").val(selectedCheckbox.attr('data-cdskey'))
+    modalBody.find("#caseNum").val(selectedCheckbox.attr('data-casenum'))
+    $("#cdiSelectModal").modal('hide');
+  }else{
+    alert("대상을 선택해주세요.")
+  }
+})
+
+function getCdiSelectModal(){
+  $.ajax({
+    url: '/unlawfulFishing/cdiSelectModal',
+    type: 'GET',
+    dataType:"html",
+    success: function(html){
+      const contentDiv = $("#cdiSelectModalContent");
+      contentDiv.empty().append(html)
+      $(".dateSelector").datepicker({
+        format: "yyyy-mm-dd",
+        language: "ko",
+        autoclose: true
+      });
+      $("#cdiSelectModal").modal('show');
+    },
+    error:function(e){
+      ajaxErrorAction(e);
+    }
+  });
+}

src/main/resources/static/js/faStatistics/unlawfulFishing/illegalShipInfo.js

@@ -1,8 +1,39 @@
 
+$(function(){
+  $("#dateSelectorDiv").datepicker({
+    format: "yyyy-mm-dd",
+    language: "ko",
+    autoclose: true
+  });
+})
+
 $(document).on('click', '#addIllegalShipInfoBtn', function (){
   getIsiEditModal(null);
 })
 
+$(document).on('change', '#offenseSelector', function (){
+  const offenseInput = $(".offenseInput")
+  if(this.value === "1"){
+    offenseInput.val("")
+    offenseInput.attr('disabled', 'disabled')
+  }else{
+    offenseInput.removeAttr('disabled')
+  }
+})
+$(document).on('change', '#confiscationSelector', function (){
+  const confiscationInput = $(".confiscationInput")
+  if(this.value === "1"){
+    confiscationInput.val("")
+    confiscationInput.attr('disabled', 'disabled')
+  }else{
+    confiscationInput.removeAttr('disabled')
+  }
+})
+
+$(document).on('click', '.saveEditInfoBtn', function (){
+  saveIllegalShipInfo($(this).attr("data-status"))
+})
+
 function getIsiEditModal(fbKey){
   $.ajax({
     url: '/unlawfulFishing/isiEditModal',
@@ -25,29 +56,42 @@ function getIsiEditModal(fbKey){
   });
 }
 
-
+function saveIllegalShipInfo(status){
-
+  if (confirm("저장하시겠습니까?")) {
-$(document).on('click', '#selectCrackdownInfoBtn', function (){
+    if (valueCheck(status)) {
-  getCdiSelectModal(null);
+      $("#infoStatus").val(status)
-})
+      contentFade("in");
-
+      const formData = new FormData($("#isiEditForm")[0]);
-function getCdiSelectModal(){
       $.ajax({
-    url: '/unlawfulFishing/cdiSelectModal',
+        type : 'POST',
-    type: 'GET',
+        data : formData,
-    dataType:"html",
+        url : "/unlawfulFishing/saveIllegalShipInfo",
-    success: function(html){
+        processData: false,
-      const contentDiv = $("#cdiSelectModalContent");
+        contentType: false,
-      contentDiv.empty().append(html)
+        beforeSend: function (xhr){
-      $(".dateSelector").datepicker({
+          xhr.setRequestHeader($("[name='_csrf_header']").val(), $("[name='_csrf']").val());
-        format: "yyyy-mm-dd",
-        language: "ko",
-        autoclose: true
-      });
-      $("#cdiSelectModal").modal('show');
         },
-    error:function(e){
+        success : function() {
-      ajaxErrorAction(e);
+          alert("저장되었습니다.");
+          contentFade("out");
+          location.reload();
+        },
+        error : function(xhr, status) {
+          alert("저장에 실패하였습니다.");
+          contentFade("out");
+        }
+      })
+    }
   }
-  });
+}
+
+function valueCheck(status){
+  if(status === "DST007"){
+    const isiEditForm = $("#isiEditForm")
+    if(!isiEditForm.find("#caseNum").val()){
+      alert("사건번호를 선택해주세요.")
+      return false;
+    }
+  }
+  return true;
 }

src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/cdiSelectModal.html

@@ -83,7 +83,7 @@
               <table class="table table-sm table-hover table-bordered text-nowrap" id="cdsTable">
                 <thead class="align-middle">
                 <tr class="table-secondary">
-                  <th>순번</th>
+                  <th></th>
                   <th>사건번호</th>
                   <th>MMSI.NO</th>
                   <th>나포일시</th>
@@ -100,9 +100,9 @@
                 </tr>
                 </thead>
                 <tbody class="table-group-divider align-middle">
-                <th:block th:each="cdi,cnt:${crackdownInfoList}">
+                <th:block th:each="cdi:${crackdownInfoList}">
-                  <tr class="cdiTr" th:data-cdskey="${cdi.cdsKey}">
+                  <tr class="cdiTr">
-                    <td th:text="${searchParams.contentCnt-(20*(searchParams.pageIndex-1))-cnt.index}"></td>
+                    <td><input type="checkbox" class="cdiCheckbox" th:data-cdskey="${cdi.cdsKey}" th:data-casenum="${cdi.caseNum}"></td>
                     <td th:text="${cdi.caseNum}"></td>
                     <td th:text="${cdi.mmsi}"></td>
                     <td th:text="${#temporals.format(cdi.napoDt, 'yyyy-MM-dd HH:mm')}"></td>
@@ -180,6 +180,6 @@
   </div>
 </div>
 <div class="modal-footer">
-  <button type="button" class="btn btn-primary">불러오기</button>
+  <button type="button" class="btn btn-primary" id="cdiSelectBtn">불러오기</button>
 </div>
 </html>

src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/illegalShipInfoPage.html

@@ -4,6 +4,7 @@
       layout:decorate="~{layout/layout}">
 <th:block layout:fragment="script">
   <script type="text/javascript" th:src="@{/js/faStatistics/unlawfulFishing/illegalShipInfo.js}"></script>
+  <script type="text/javascript" th:src="@{/js/faStatistics/unlawfulFishing/cdiSelectModal.js}"></script>
 </th:block>
 <th:block layout:fragment="css">
   <style>
@@ -103,31 +104,41 @@
                     <tr class="table-secondary">
                       <th>순번</th>
                       <th>사건번호</th>
-                      <th>MMSI.NO</th>
+                      <th>선명</th>
-                      <th>나포일시</th>
+                      <th>허가번호</th>
-                      <th>나포장소</th>
+                      <th>국적</th>
-                      <th>사건담당경찰서</th>
+                      <th>승선원</th>
-                      <th>사건담당경찰관</th>
+                      <th>톤수</th>
-                      <th>단속경찰서</th>
+                      <th>선종</th>
-                      <th>단속함정</th>
+                      <th>선질</th>
-                      <th>침범유형</th>
+                      <th>선적지</th>
-                      <th>NLL침범여부</th>
-                      <th>압송여부</th>
                       <th>작성일시</th>
                     </tr>
                     </thead>
                     <tbody class="table-group-divider align-middle">
-                    <!--<th:block th:each="dto,cnt:${crackdownInfoList}">
+                    <th:block th:each="shipInfo,cnt:${illegalShipInfoList}">
-                      <tr class="crackdownStatusTr" th:data-cdskey="${dto.cdsKey}" data-modaltype="viewOnly">
+                      <tr class="shipInfoTr" th:data-fbkey="${shipInfo.fbKey}">
-                        <td th:text="${cnt.count}"></td>
+                        <td th:text="${searchParams.contentCnt-(20*(searchParams.pageIndex-1))-cnt.index}"></td>
-                        <td th:text="${#temporals.format(dto.napoDt, 'yyyy-MM-dd HH:mm')}"></td>
+                        <td th:text="${shipInfo.caseNum}"></td>
+                        <td th:text="${shipInfo.boatNameKr}"></td>
+                        <td th:text="${shipInfo.permitNum}"></td>
+                        <td th:text="${shipInfo.nationality}"></td>
+                        <td th:text="${shipInfo.sailorCnt}"></td>
+                        <td th:text="${shipInfo.tonCnt}"></td>
                         <td>
-                          <div th:if="${!#strings.isEmpty(dto.napoSeaPointLon) and !#strings.isEmpty(dto.napoSeaPointLon)}" th:text="${#strings.concat(dto.napoSeaPointLon, ' ~ ', dto.napoSeaPointLat)}"></div>
+                          <th:block th:each="code:${session.commonCode.get('FT')}">
-                          <div th:if="${!#strings.isEmpty(dto.napoSeaPointLon) or !#strings.isEmpty(dto.napoSeaPointLon)}" th:text="${#strings.concat(dto.napoSeaPointLon, dto.napoSeaPointLat)}"></div>
+                            <th:block th:if="${code.itemCd eq shipInfo.fisheryType}" th:text="${code.itemValue}"></th:block>
-                          <div th:text="${dto.napoSeaPointDetail}"></div>
+                          </th:block>
                         </td>
+                        <td>
+                          <th:block th:each="code:${session.commonCode.get('BM')}">
+                            <th:block th:if="${code.itemCd eq shipInfo.boatMaterial}" th:text="${code.itemValue}"></th:block>
+                          </th:block>
+                        </td>
+                        <td th:text="|${shipInfo.boatNnySung} ${shipInfo.boatNnySi}|"></td>
+                        <td th:text="${#temporals.format(shipInfo.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
                       </tr>
-                    </th:block>-->
+                    </th:block>
                     </tbody>
                   </table>
                 </div>
@@ -136,6 +147,31 @@
                 <div class="col-auto">
                   <button class="btn btn-success" id="cdsDownExcel">엑셀 다운로드</button>
                 </div>
+                <div class="col-auto">
+                  <nav aria-label="Page navigation">
+                    <ul class="pagination mb-0">
+                      <th:block th:if="${searchParams.pageIndex>3}">
+                        <li class="page-item" th:data-pageindex="${(searchParams.pageIndex)-3}">
+                          <a class="page-link" href="#" aria-label="Previous">
+                            <span aria-hidden="true">&laquo;</span>
+                          </a>
+                        </li>
+                      </th:block>
+                      <th:block th:each="num : ${#numbers.sequence(searchParams.startNum, searchParams.endNum)}">
+                        <li class="page-item" th:data-pageindex="${num}" th:classappend="${searchParams.pageIndex eq num?'active':''}">
+                          <a class="page-link" href="#" th:text="${num}"></a>
+                        </li>
+                      </th:block>
+                      <th:block th:if="${searchParams.maxNum>searchParams.endNum+2}">
+                        <li class="page-item" th:data-pageindex="${(searchParams.pageIndex)+3}">
+                          <a class="page-link" href="#" aria-label="Next">
+                            <span aria-hidden="true">&raquo;</span>
+                          </a>
+                        </li>
+                      </th:block>
+                    </ul>
+                  </nav>
+                </div>
                 <div class="col-auto">
                   <button class="btn btn-primary" id="addIllegalShipInfoBtn">등록</button>
                 </div>

src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiEditModal.html

@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <html lang="ko" xmlns:th="http://www.thymeleaf.org">
 <div class="modal-header bg-dark">
-  <h5 class="modal-title text-white" id="issEditModalLabel" th:text="|불법조업 외국어선 정보 ${illegalShipInfo.fbKey eq null?'작성':'수정'}|"></h5>
+  <h5 class="modal-title text-white" id="isiEditModalLabel" th:text="|불법조업 외국어선 정보 ${illegalShipInfo.fbKey eq null?'작성':'수정'}|"></h5>
   <button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
 </div>
 <div class="modal-body">
-  <form action="#" method="post" id="fbEditForm">
+  <form action="#" method="post" id="isiEditForm">
     <input type="hidden" name="fbKey" id="fbKey" th:value="${illegalShipInfo.fbKey}">
     <input type="hidden" class="status" name="status" id="infoStatus" th:value="${illegalShipInfo.status}">
     <input type="hidden" name="wrtOrgan" th:value="${illegalShipInfo.wrtOrgan}">
@@ -18,7 +18,8 @@
       <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 " id="caseNum" name="caseNum">
+          <input type="hidden" id="cdsKey" name="cdsKey" th:value="${illegalShipInfo.cdsKey}">
+          <input type="text" class="form-control form-control-sm " id="caseNum" name="caseNum" th:value="${illegalShipInfo.caseNum}">
           <input type="button" class="btn btn-sm btn-outline-primary  w-auto" id="selectCrackdownInfoBtn" value="불러오기">
         </div>
       </div>
@@ -27,37 +28,11 @@
       <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">
-          <input type="text" class="form-control form-control-sm  boatNameKr" placeholder="한글" th:value="${illegalShipInfo.boatNameKr}">
+          <input type="text" class="form-control form-control-sm  boatNameKr" name="boatNameKr" placeholder="한글" th:value="${illegalShipInfo.boatNameKr}">
           <input type="text" class="form-control form-control-sm " id="boatNameCn" name="boatNameCn" placeholder="중문" th:value="${illegalShipInfo.boatNameCn}">
         </div>
       </div>
       <div class="col-sm-1"></div>
-      <!--<label for="violationSelector" class="col-sm-1 col-form-label col-form-label-sm text-center">위반사항</label>
-      <div class="col-sm-1">
-        <select class="form-select form-select-sm" id="violationSelector">
-          <option value="">선택</option>
-          <th:block th:each="code:${vtList}">
-            <option th:value="${code.itemCd}" th:text="${code.itemValue}"></option>
-          </th:block>
-        </select>
-      </div>
-      <div class="col-sm-4">
-        <div class="row" id="violationDiv">
-          <th:block th:each="violation:${violationList}">
-            <div class="col-6 violation">
-              <input type="hidden" class="form-control form-control-sm  violationCd" th:value="${violation.violation}">
-              <div class="input-group w-auto">
-                <th:block th:each="code:${vtList}">
-                  <input type="text" class="form-control form-control-sm" th:if="${code.itemCd eq violation.violation}" th:value="${code.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 class="row mb-1">
       <label for="permitNum" class="col-sm-1 col-form-label col-form-label-sm text-center">허가번호</label>
@@ -82,7 +57,7 @@
       <div class="col-sm-2">
         <select class="form-select form-select-sm " id="fisheryType" name="fisheryType">
           <option value="">선택</option>
-          <th:block th:each="code:${ftList}">
+          <th:block th:each="code:${session.commonCode.get('FT')}">
             <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq illegalShipInfo.fisheryType}"></option>
           </th:block>
         </select>
@@ -91,7 +66,7 @@
       <div class="col-sm-2">
         <select class="form-select form-select-sm " id="boatMaterial" name="boatMaterial">
           <option value="">선택</option>
-          <th:block th:each="code:${bmList}">
+          <th:block th:each="code:${session.commonCode.get('BM')}">
             <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq illegalShipInfo.boatMaterial}"></option>
           </th:block>
         </select>
@@ -109,25 +84,25 @@
       <label for="offenseType" class="col-sm-1 col-form-label col-form-label-sm text-center">범칙물</label>
       <div class="col-sm-2">
         <div class="input-group w-auto">
-          <select class="form-select w-30 form-select-sm oxSelector" id="offenseSelector">
+          <select class="form-select w-30 form-select-sm" id="offenseSelector">
             <option value="1" th:selected="${illegalShipInfo.offenseType eq null}">없음</option>
             <option value="2" th:selected="${illegalShipInfo.offenseType ne null}">직접입력</option>
           </select>
-          <input type="text" class="form-control w-40 form-control-sm " id="offenseType" name="offenseType" placeholder="범칙물" th:value="${illegalShipInfo.offenseType}" th:disabled="${illegalShipInfo.offenseType eq null}">
+          <input type="text" class="form-control w-40 form-control-sm offenseInput" id="offenseType" name="offenseType" placeholder="범칙물" th:value="${illegalShipInfo.offenseType}" th:disabled="${illegalShipInfo.offenseType eq null}">
-          <input type="text" class="form-control w-30 form-control-sm " id="offenseWeight" name="offenseWeight" placeholder="000kg" th:value="${illegalShipInfo.offenseWeight>0?illegalShipInfo.offenseWeight:''}" th:disabled="${illegalShipInfo.offenseType eq null}">
+          <input type="text" class="form-control w-30 form-control-sm offenseInput" id="offenseWeight" name="offenseWeight" placeholder="000kg" th:value="${illegalShipInfo.offenseWeight>0?illegalShipInfo.offenseWeight:''}" th:disabled="${illegalShipInfo.offenseType eq null}">
         </div>
       </div>
       <label for="offenseIllegalWasteQuantity" 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="offenseIllegalWasteQuantity" name="offenseIllegalWasteQuantity" placeholder="000kg" th:value="${illegalShipInfo.offenseIllegalWasteQuantity>0?illegalShipInfo.offenseIllegalWasteQuantity:''}" th:disabled="${illegalShipInfo.offenseType eq null}">
+        <input type="text" class="form-control form-control-sm offenseInput" id="offenseIllegalWasteQuantity" name="offenseIllegalWasteQuantity" placeholder="000kg" th:value="${illegalShipInfo.offenseIllegalWasteQuantity>0?illegalShipInfo.offenseIllegalWasteQuantity:''}" th:disabled="${illegalShipInfo.offenseType eq null}">
       </div>
       <label for="offenseQuantity" 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="offenseQuantity" name="offenseQuantity" placeholder="000kg" th:value="${illegalShipInfo.offenseQuantity>0?illegalShipInfo.offenseQuantity:''}" th:disabled="${illegalShipInfo.offenseType eq null}">
+        <input type="text" class="form-control form-control-sm offenseInput" id="offenseQuantity" name="offenseQuantity" placeholder="000kg" th:value="${illegalShipInfo.offenseQuantity>0?illegalShipInfo.offenseQuantity:''}" th:disabled="${illegalShipInfo.offenseType eq null}">
       </div>
       <label for="offenseAmount" 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="offenseAmount" name="offenseAmount" placeholder="단위: 만원" th:value="${illegalShipInfo.offenseAmount>0?illegalShipInfo.offenseAmount:''}" th:disabled="${illegalShipInfo.offenseType eq null}">
+        <input type="text" class="form-control form-control-sm offenseInput" id="offenseAmount" name="offenseAmount" placeholder="단위: 만원" th:value="${illegalShipInfo.offenseAmount>0?illegalShipInfo.offenseAmount:''}" th:disabled="${illegalShipInfo.offenseType eq null}">
       </div>
     </div>
     <div class="row mb-1">
@@ -157,15 +132,15 @@
                                            illegalShipInfo.confiscationJo ne null ||
                                            illegalShipInfo.confiscationGae ne null ||
                                            illegalShipInfo.confiscationEtc ne null}">
-          <select class="form-select form-select-sm oxSelector">
+          <select class="form-select form-select-sm" id="confiscationSelector">
             <option value="1" th:selected="${!confiscationFlag}">없음</option>
             <option value="2" th:selected="${confiscationFlag}">수량기입</option>
           </select>
-          <input type="text" class="form-control form-control-sm " id="confiscationFrame" name="confiscationFrame" placeholder="틀" th:value="${illegalShipInfo.confiscationFrame}" th:disabled="${!confiscationFlag}">
+          <input type="text" class="form-control form-control-sm confiscationInput" id="confiscationFrame" name="confiscationFrame" placeholder="틀" th:value="${illegalShipInfo.confiscationFrame}" th:disabled="${!confiscationFlag}">
-          <input type="text" class="form-control form-control-sm " id="confiscationWidth" name="confiscationWidth" placeholder="폭" th:value="${illegalShipInfo.confiscationWidth}" th:disabled="${!confiscationFlag}">
+          <input type="text" class="form-control form-control-sm confiscationInput" id="confiscationWidth" name="confiscationWidth" placeholder="폭" th:value="${illegalShipInfo.confiscationWidth}" th:disabled="${!confiscationFlag}">
-          <input type="text" class="form-control form-control-sm " id="confiscationJo" name="confiscationJo" placeholder="조" th:value="${illegalShipInfo.confiscationJo}" th:disabled="${!confiscationFlag}">
+          <input type="text" class="form-control form-control-sm confiscationInput" id="confiscationJo" name="confiscationJo" placeholder="조" th:value="${illegalShipInfo.confiscationJo}" th:disabled="${!confiscationFlag}">
-          <input type="text" class="form-control form-control-sm " id="confiscationGae" name="confiscationGae" placeholder="개" th:value="${illegalShipInfo.confiscationGae}" th:disabled="${!confiscationFlag}">
+          <input type="text" class="form-control form-control-sm confiscationInput" id="confiscationGae" name="confiscationGae" placeholder="개" th:value="${illegalShipInfo.confiscationGae}" th:disabled="${!confiscationFlag}">
-          <input type="text" class="form-control form-control-sm " id="confiscationEtc" name="confiscationEtc" placeholder="기타" th:value="${illegalShipInfo.confiscationEtc}" th:disabled="${!confiscationFlag}">
+          <input type="text" class="form-control form-control-sm confiscationInput" id="confiscationEtc" name="confiscationEtc" placeholder="기타" th:value="${illegalShipInfo.confiscationEtc}" th:disabled="${!confiscationFlag}">
         </div>
       </div>
     </div>