처리현황, 단속현황, 선원세부현황 디자인 수정

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

@@ -80,6 +80,9 @@ public class CrackdownStatusController {
             crackdownStatus.setViolationList(violationRepository.findByFbKey(crackdownStatus.getFishingBoat().getFbKey()));
             crackdownStatus.setSailorList(sailorRepository.findByFbKey(crackdownStatus.getFishingBoat().getFbKey()));
         }else{
+            crackdownStatus.setWrtOrgan(loginUser.getOgCd());
+            crackdownStatus.setWrtPart(loginUser.getOfcCd());
+            crackdownStatus.setWrtUserGrd(loginUser.getGroupCd());
             crackdownStatus.setWrtOrgan(loginUser.getOgCd());
             crackdownStatus.setWrtUserNm(loginUser.getUserNm());
             crackdownStatus.setWrtDt(LocalDateTime.now());

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

@@ -78,6 +78,8 @@ public class ProcessResultController {
             processResult.setViolationList(violationRepository.findByFbKey(processResult.getFbKey()));
         }else{
             processResult.setWrtOrgan(loginUser.getOgCd());
+            processResult.setWrtPart(loginUser.getOfcCd());
+            processResult.setWrtUserGrd(loginUser.getGroupCd());
             processResult.setWrtUserNm(loginUser.getUserNm());
             processResult.setWrtDt(LocalDateTime.now());
         }

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

@@ -111,6 +111,8 @@ public class SailorController {
         sailor.setFishingBoatList(fishingBoatRepository.findAll());
 
         sailor.setWrtOrgan(loginUser.getOgCd());
+        sailor.setWrtPart(loginUser.getOfcCd());
+        sailor.setWrtUserGrd(loginUser.getGroupCd());
         sailor.setWrtUserNm(loginUser.getUserNm());
         sailor.setWrtDt(LocalDateTime.now());
 

src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/processResult/ProcessResult.java

@@ -8,8 +8,10 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.persistence.*;
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Getter
@@ -28,7 +30,9 @@ public class ProcessResult extends ProcessResultBaseEntity {
 
     @Column(name = "cds_key")
     private Integer cdsKey;
-
+    @Transient
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDateTime updDt;
     @Transient
     private CrackdownStatus crackdownStatus;
     @Transient

src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/sailor/Sailor.java

@@ -8,6 +8,7 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.persistence.*;
 import java.time.LocalDate;
@@ -31,6 +32,9 @@ public class Sailor extends SailorBaseEntity {
     @Column(name = "fb_key")
     private Integer fbKey;
 
+    @Transient
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDateTime updDt;
     @Transient
     private Integer cdsKey;
     @Transient

src/main/resources/mybatisMapper/ProcessResultMapper.xml

@@ -66,6 +66,7 @@
         , pr.confiscation_dt
         , pr.boat_disposal_dt
         , pr.wrt_dt
+        , prv.upd_dt AS updDt
     FROM process_result pr
     INNER JOIN crackdown_status cs
     ON pr.cds_key = cs.cds_key
@@ -73,6 +74,12 @@
     ON pr.cds_key = fb.cds_key
     LEFT JOIN violation v
     ON fb.fb_key = v.fb_key
+    INNER JOIN (
+        SELECT pr_key ,MAX(wrt_dt) AS upd_dt
+        FROM process_result_version
+        GROUP BY pr_key
+    ) prv
+    ON pr.pr_key = prv.pr_key
     <include refid="selectProcessResultListWhere"></include>
     ORDER BY pr.pr_key DESC
     LIMIT #{rowCnt} OFFSET #{firstIndex}

src/main/resources/mybatisMapper/SailorMapper.xml

@@ -68,11 +68,18 @@
         , s.wrt_user_grd
         , s.wrt_user_nm
         , s.wrt_dt
+        , sv.upd_dt AS updDt
     FROM sailor s
     INNER JOIN fishing_boat f
     ON s.fb_key = f.fb_key
     INNER JOIN crackdown_status cs
     ON f.cds_key = cs.cds_key
+    INNER JOIN (
+        SELECT sailor_key ,MAX(wrt_dt) AS upd_dt
+        FROM sailor_version
+        GROUP BY sailor_key
+    ) sv
+    ON s.sailor_key = sv.sailor_key
     <include refid="selectSailorListWhere"></include>
     ORDER BY s.sailor_key DESC
     </select>

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

@@ -113,7 +113,7 @@ $(document).on('click', '#violationAddBtn', function (){
 
     $('#violationDiv').append(
         '<div class="row">'
-        + '<select class="form-select form-select-sm violation" name="violation">'
+        + '<select class="form-select form-select-sm violation" name="violation" style="max-width: 90% !important;">'
         + '<option value="">선택</option>'
         + violation
         + '<option value="etc">직접입력</option>'
@@ -447,13 +447,13 @@ function saveCrackdownStatus(saveYn){
 function contentCheck(){
     let flag = true;
 
-    if(!$('input[name="boatNameKr"]').val()) {
+    if(!$('#cdsEditForm').find($('input[name="boatNameKr"]').val())) {
         alert('선명을 입력해주세요.');
         $('input[name="boatNameKr"]').focus();
         return false;
     }
 
-    if(!$('select[name="processStatus"]').val()) {
+    if(!$('#cdsEditForm').find($('select[name="processStatus"]').val())) {
         alert('처리현황을 선택해주세요.');
         $('select[name="processStatus"]').focus();
         return false;

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

@@ -1,21 +1,21 @@
 $(function(){
-    $("#consignmentStartDt").datepicker({
+    $("#consignmentStartDate").datepicker({
         format: "yyyy-mm-dd",
         language: "ko"
     });
-    $("#consignmentEndDt").datepicker({
+    $("#consignmentEndDate").datepicker({
         format: "yyyy-mm-dd",
         language: "ko"
     });
-    $("#returnDt").datepicker({
+    $("#returnDate").datepicker({
         format: "yyyy-mm-dd",
         language: "ko"
     });
-    $("#confiscationDt").datepicker({
+    $("#confiscationDate").datepicker({
         format: "yyyy-mm-dd",
         language: "ko"
     });
-    $("#boatDisposalDt").datepicker({
+    $("#boatDisposalDate").datepicker({
         format: "yyyy-mm-dd",
         language: "ko"
     });
@@ -101,7 +101,7 @@ $(document).on('click', '#violationAddBtn', function (){
 
     $('#violationDiv').append(
         '<div class="row">'
-        + '<select class="form-select form-select-sm violation" name="violation">'
+        + '<select class="form-select form-select-sm violation" name="violation" style="max-width: 90% !important;">'
         + '<option value="">선택</option>'
         + violation
         + '<option value="etc">직접입력</option>'

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

@@ -48,7 +48,7 @@ $(document).on('click', '#violationAddBtn', function (){
 
     $('#violationDiv').append(
         '<div class="row">'
-        + '<select class="form-select form-select-sm violation" name="violation">'
+        + '<select class="form-select form-select-sm violation" name="violation" style="max-width: 90% !important;">'
         + '<option value="">선택</option>'
         + violation
         + '<option value="etc">직접입력</option>'

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

@@ -40,7 +40,7 @@
                                 </div>
                             </div>
                             <div class="col-10">
-                                <div class="row justify-content-end">
+                                <div class="row justify-content-between">
                                     <div class="col-auto">
                                         <input class="form-control form-control-sm" name="napoDate" id="napoDate" placeholder="나포일시" th:value="${#temporals.format(searchParams.napoDate, 'yyyy-MM-dd')}">
                                     </div>
@@ -334,8 +334,8 @@
                         </div>
                     </form>
                     <div class="row justify-content-start" style="overflow: hidden; overflow-x: scroll">
-                        <table class="table table-striped table-bordered" style="max-width: none; width: auto;" id="cdsTable">
+                        <table class="table table-hover table-bordered ws-nowrap" style="max-width: none; width: auto;" id="cdsTable">
-                            <thead>
+                            <thead class="align-middle text-center">
                             <tr>
                                 <th rowspan="4">연번</th>
                                 <th rowspan="4">나포일시</th>
@@ -445,9 +445,9 @@
                                 <th th:text="${#aggregates.sum(crackdownStatusList.?[nll == 'Y'].![1]) ne null ? #aggregates.sum(crackdownStatusList.?[nll == 'Y'].![1]) : 0}"></th>
                                 <th th:text="${#aggregates.sum(crackdownStatusList.?[personDamageCnt > 0 || personDamageAmount > 0].![1]) ne null ? 1 : 0}"></th>
                                 <th th:text="${#aggregates.sum(crackdownStatusList.![personDamageCnt])}"></th>
-                                <th th:text="${#aggregates.sum(crackdownStatusList.![personDamageAmount])}"></th>
+                                <th th:text="${#numbers.formatInteger(#aggregates.sum(crackdownStatusList.![personDamageAmount]), 3, 'COMMA')}"></th>
                                 <th th:text="${#aggregates.sum(crackdownStatusList.?[materialDamageCnt > 0 || materialDamageAmount > 0].![1]) ne null ? 1 : 0}"></th>
-                                <th th:text="${#aggregates.sum(crackdownStatusList.![materialDamageAmount])}"></th>
+                                <th th:text="${#numbers.formatInteger(#aggregates.sum(crackdownStatusList.![materialDamageAmount]), 3, 'COMMA')}"></th>
                                 <th>단속경찰서</th>
                                 <th>단속함정</th>
                                 <th>성</th>
@@ -456,16 +456,16 @@
                                 <th>출생년도</th>
                                 <th>어종</th>
                                 <th>수량</th>
-                                <th th:text="${#aggregates.sum(crackdownStatusList.![fishingBoat.offenseCatchCnt])}"></th>
+                                <th th:text="${#numbers.formatInteger(#aggregates.sum(crackdownStatusList.![fishingBoat.offenseCatchCnt]), 3, 'COMMA')}"></th>
-                                <th th:text="${#aggregates.sum(crackdownStatusList.![fishingBoat.offenseIllegalWasteQuantity])}"></th>
+                                <th th:text="${#numbers.formatInteger(#aggregates.sum(crackdownStatusList.![fishingBoat.offenseIllegalWasteQuantity]), 3, 'COMMA')}"></th>
-                                <th th:text="${#aggregates.sum(crackdownStatusList.![fishingBoat.offenseQuantity])}"></th>
+                                <th th:text="${#numbers.formatInteger(#aggregates.sum(crackdownStatusList.![fishingBoat.offenseQuantity]), 3, 'COMMA')}"></th>
-                                <th th:text="${#aggregates.sum(crackdownStatusList.![fishingBoat.offenseAmount])}"></th>
+                                <th th:text="${#numbers.formatInteger(#aggregates.sum(crackdownStatusList.![fishingBoat.offenseAmount]), 3, 'COMMA')}"></th>
                                 <th th:text="${#aggregates.sum(crackdownStatusList.?[processResult.processStatus == 'PR001'].![1]) ne null ? #aggregates.sum(crackdownStatusList.?[processResult.processStatus == 'PR001'].![1]) : 0}"></th>
                                 <th th:text="${#aggregates.sum(crackdownStatusList.?[processResult.processStatus == 'PR009'].![1]) ne null ? #aggregates.sum(crackdownStatusList.?[processResult.processStatus == 'PR009'].![1]) : 0}"></th>
                                 <th th:text="${#aggregates.sum(crackdownStatusList.?[fishingBoat.damboPayment > 0].![1]) ne null ? 1 : 0}"></th>
-                                <th th:text="${#aggregates.sum(crackdownStatusList.![fishingBoat.damboPayment])}"></th>
+                                <th th:text="${#numbers.formatInteger(#aggregates.sum(crackdownStatusList.![fishingBoat.damboPayment]), 3, 'COMMA')}"></th>
                                 <th th:text="${#aggregates.sum(crackdownStatusList.?[fishingBoat.damboUnpaidAmount > 0].![1]) ne null ? 1 : 0}"></th>
-                                <th th:text="${#aggregates.sum(crackdownStatusList.![fishingBoat.damboUnpaidAmount])}"></th>
+                                <th th:text="${#numbers.formatInteger(#aggregates.sum(crackdownStatusList.![fishingBoat.damboUnpaidAmount]), 3, 'COMMA')}"></th>
                                 <th th:text="${#aggregates.sum(crackdownStatusList.?[processResult.consignmentStartDt != null].![1]) ne null ? 1 : 0}"></th>
                                 <th th:text="${#aggregates.sum(crackdownStatusList.?[processResult.evictionDt != null].![1]) ne null ? 1 : 0}"></th>
                                 <th th:text="${#aggregates.sum(crackdownStatusList.?[processResult.directHandoverDt != null].![1]) ne null ? 1 : 0}"></th>
@@ -499,11 +499,11 @@
                                 <th th:text="${#aggregates.sum(crackdownStatusList.?[fishingBoat.confiscationFrame != null && fishingBoat.confiscationEtc != ''].![1]) ne null ? #aggregates.sum(crackdownStatusList.?[fishingBoat.confiscationEtc != null && fishingBoat.confiscationEtc != ''].![1]) : 0}"></th>
                             </tr>
                             </thead>
-                            <tbody class="table-group-divider">
+                            <tbody class="table-group-divider align-middle text-center">
                                 <th:block th:each="crackdownStatus:${crackdownStatusList}">
                                     <tr class="tr" th:data-key="${crackdownStatus.cdsKey}">
                                         <td th:text="${crackdownStatus.cdsKey}"></td>
-                                        <td th:text="${crackdownStatus.napoDt}"></td>
+                                        <td th:text="${#temporals.format(crackdownStatus.napoDt, 'yyyy-MM-dd HH:mm')}"></td>
                                         <td>
                                             <th:block th:if="${#lists.size(crackdownStatus.violationList) >= 1}">
                                                 <th:block th:each="violation:${crackdownStatus.violationList}">
@@ -525,10 +525,10 @@
                                         <td th:text="${crackdownStatus.nll eq 'Y' ? 1 : 0}"></td>
                                         <td th:text="${crackdownStatus.obstrExspdCnt}"></td>
                                         <td th:text="${crackdownStatus.personDamageCnt}"></td>
-                                        <td th:text="${crackdownStatus.personDamageAmount}"></td>
+                                        <td th:text="${#numbers.formatInteger(crackdownStatus.personDamageAmount, 3, 'COMMA')}"></td>
                                         <td th:text="${crackdownStatus.personDamageDetail}"></td>
                                         <td th:text="${crackdownStatus.materialDamageCnt}"></td>
-                                        <td th:text="${crackdownStatus.materialDamageAmount}"></td>
+                                        <td th:text="${#numbers.formatInteger(crackdownStatus.materialDamageAmount, 3, 'COMMA')}"></td>
                                         <td th:text="${crackdownStatus.materialDamageDetail}"></td>
                                         <th:block th:each="commonCode:${session.commonCode.get('ATA')}">
                                             <td th:if="${crackdownStatus.caseAgency eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
@@ -564,7 +564,7 @@
                                         <td th:text="${crackdownStatus.fishingBoat.boatNnySi}"></td>
                                         <th:block th:each="sailor:${crackdownStatus.sailorList}">
                                             <td th:if="${sailor.position eq 'POS001'}" th:text="${sailor.sailorNameKr}"></td>
-                                            <td th:if="${sailor.position eq 'POS001'}" th:text="${sailor.birthdate}"></td>
+                                            <td th:if="${sailor.position eq 'POS001'}" th:text="${#temporals.format(sailor.birthdate, 'yyyy-MM-dd')}"></td>
                                         </th:block>
                                         <th:block th:if="${#lists.size(crackdownStatus.sailorList) == 0}">
                                             <td></td>
@@ -577,19 +577,19 @@
                                             <td th:text="${crackdownStatus.fishingBoat.fisheryType}"></td>
                                         </th:block>
                                         <td th:text="${crackdownStatus.fishingBoat.catchFishSpecies}"></td>
-                                        <td th:text="${crackdownStatus.fishingBoat.catchCnt}"></td>
+                                        <td th:text="${#numbers.formatInteger(crackdownStatus.fishingBoat.catchCnt, 3, 'COMMA')}"></td>
                                         <td th:text="${crackdownStatus.fishingBoat.offenseFishSpecies}"></td>
-                                        <td th:text="${crackdownStatus.fishingBoat.offenseCatchCnt}"></td>
+                                        <td th:text="${#numbers.formatInteger(crackdownStatus.fishingBoat.offenseCatchCnt, 3, 'COMMA')}"></td>
-                                        <td th:text="${crackdownStatus.fishingBoat.offenseIllegalWasteQuantity}"></td>
+                                        <td th:text="${#numbers.formatInteger(crackdownStatus.fishingBoat.offenseIllegalWasteQuantity, 3, 'COMMA')}"></td>
-                                        <td th:text="${crackdownStatus.fishingBoat.offenseQuantity}"></td>
+                                        <td th:text="${#numbers.formatInteger(crackdownStatus.fishingBoat.offenseQuantity, 3, 'COMMA')}"></td>
-                                        <td th:text="${crackdownStatus.fishingBoat.offenseAmount}"></td>
+                                        <td th:text="${#numbers.formatInteger(crackdownStatus.fishingBoat.offenseAmount, 3, 'COMMA')}"></td>
                                         <td th:text="${crackdownStatus.processResult.processStatus eq 'PR001' ? 1 : 0}"></td>
                                         <td th:text="${crackdownStatus.processResult.processStatus eq 'PR009' ? 1 : 0}"></td>
                                         <td th:text="${crackdownStatus.fishingBoat.damboPayment ne 0 ? 1 : 0}"></td>
-                                        <td th:text="${crackdownStatus.fishingBoat.damboPayment}"></td>
+                                        <td th:text="${#numbers.formatInteger(crackdownStatus.fishingBoat.damboPayment, 3, 'COMMA')}"></td>
-                                        <td th:text="${crackdownStatus.fishingBoat.paymentPaymentDt}"></td>
+                                        <td th:text="${#temporals.format(crackdownStatus.fishingBoat.paymentPaymentDt, 'yyyy-MM-dd HH:mm')}"></td>
                                         <td th:text="${crackdownStatus.fishingBoat.damboUnpaidAmount ne 0 ? 1 : 0}"></td>
-                                        <td th:text="${crackdownStatus.fishingBoat.damboUnpaidAmount}"></td>
+                                        <td th:text="${#numbers.formatInteger(crackdownStatus.fishingBoat.damboUnpaidAmount, 3, 'COMMA')}"></td>
                                         <td th:text="${crackdownStatus.processResult.consignmentStartDt ne null ? 1 : 0}"></td>
                                         <td th:text="${crackdownStatus.processResult.consignmentStartDt}"></td>
                                         <td th:text="${crackdownStatus.processResult.consignmentEndDt}"></td>
@@ -620,8 +620,8 @@
                                         <td th:text="${crackdownStatus.notRestrictionSailor}"></td>
                                         <td th:text="${crackdownStatus.processResult.confiscationDt ne null ? 0 : 1}"></td>
                                         <td th:text="${crackdownStatus.fieldIvsgtNapoDt ne null? 1 : 0}"></td>
-                                        <td th:text="${crackdownStatus.fieldIvsgtNapoDt }"></td>
+                                        <td th:text="${#temporals.format(crackdownStatus.fieldIvsgtNapoDt, 'yyyy-MM-dd HH:mm')}"></td>
-                                        <td th:text="${crackdownStatus.fieldIvsgtReleaseDt}"></td>
+                                        <td th:text="${#temporals.format(crackdownStatus.fieldIvsgtReleaseDt, 'yyyy-MM-dd HH:mm')}"></td>
                                         <td th:text="${crackdownStatus.fieldIvsgtTimeTaken}"></td>
                                         <td th:text="${crackdownStatus.processResult.pressurizedTimeTaken}"></td>
                                         <td th:text="${crackdownStatus.distance}"></td>
@@ -637,7 +637,6 @@
                         </table>
                     </div>
                     <div class="row justify-content">
-                        <button class="btn btn-sm btn-primary col-auto" id="">관리자마감</button>
                         <button class="btn btn-sm btn-primary col-auto" id="cdsDownExcel">엑셀 다운로드</button>
                         <button class="btn btn-sm btn-primary col-auto" id="crackdownStatusAddBtn">등록</button>
                     </div>

src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatusEditModal.html

@@ -17,6 +17,8 @@
       <input type="hidden" name="prKey" th:value="${crackdownStatus.processResult.prKey}">
     </th:block>
     <input type="hidden" name="wrtOrgan" th:value="${crackdownStatus.wrtOrgan}">
+    <input type="hidden" name="wrtPart" th:value="${crackdownStatus.wrtPart}">
+    <input type="hidden" name="wrtUserGrd" th:value="${crackdownStatus.wrtUserGrd}">
     <input type="hidden" name="wrtUserNm" th:value="${crackdownStatus.wrtUserNm}">
     <input type="hidden" name="wrtDt" th:value="${#temporals.format(crackdownStatus.wrtDt, 'yyyy-MM-dd HH:mm')}">
     <input type="hidden" id="saveYn" name="saveYn">
@@ -25,64 +27,68 @@
     </div>
     <div class="mb-3 row">
       <div class="col-sm-1">
-        <label class="col-auto col-form-label text-center">나포일시</label>
+        <label class="col-auto col-form-label col-form-label-sm text-center">나포일시</label>
-        <label class="col-auto col-form-label text-center">NLL</label>
+        <label class="col-12 col-form-label col-form-label-sm text-center">NLL</label>
       </div>
       <div class="col-sm-2">
-        <input class="form-control" name="napoDt" id="napoDt" th:value="${#temporals.format(crackdownStatus.napoDt, 'yyyy-MM-dd HH:mm')}">
+        <input class="form-control form-control-sm" name="napoDt" id="napoDt" th:value="${#temporals.format(crackdownStatus.napoDt, 'yyyy-MM-dd HH:mm')}">
         <select class="form-select form-select-sm" name="nll">
           <option value="Y" th:selected="${crackdownStatus.nll == 'Y'}">O</option>
           <option value="N" th:selected="${crackdownStatus.nll == 'N'}">X</option>
         </select>
       </div>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">위반장소</label>
+      <div class="col-sm-6">
+        <input class="form-control form-control-sm" placeholder="위도" name="napoSeaPointLat" th:value="${crackdownStatus.napoSeaPointLat}">
+        <input class="form-control form-control-sm" placeholder="경도" name="napoSeaPointLon" th:value="${crackdownStatus.napoSeaPointLon}">
+        <input class="form-control form-control-sm" placeholder="상세내용" name="napoSeaPointDetail" th:value="${crackdownStatus.napoSeaPointDetail}">
+      </div>
+    </div>
+    <div class="mb-3 row">
       <div class="col-sm-1">
-        <label class="col-form-label text-center">위반내용</label>
+        <label class="col-form-label col-form-label-sm text-center">위반내용</label>
         <button type="button" class="btn btn-primary col-auto" id="violationAddBtn">+</button>
       </div>
-      <div class="col-sm-2" id="violationDiv">
+      <div class="col-auto">
-        <th:block th:if="${#lists.isEmpty(crackdownStatus.violationList)}">
+        <div class="col-auto" id="violationDiv">
-          <div class="row">
+          <th:block th:if="${#lists.isEmpty(crackdownStatus.violationList)}">
-            <select class="form-select form-select-sm violation" name="violation">
-              <option value="">선택</option>
-              <th:block th:each="commonCode:${session.commonCode.get('VT')}">
-                <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"></option>
-              </th:block>
-              <option value="etc">직접입력</option>
-            </select>
-          </div>
-        </th:block>
-        <th:block th:if="${!#lists.isEmpty(crackdownStatus.violationList)}">
-          <th:block th:each="violation, i : ${crackdownStatus.violationList}">
             <div class="row">
-              <input type="hidden" name="violationKey" th:value="${violation.violationKey}">
+              <select class="form-select form-select-sm violation" name="violation" style="max-width: 90% !important;">
-              <select class="form-select form-select-sm violation" name="violation">
                 <option value="">선택</option>
                 <th:block th:each="commonCode:${session.commonCode.get('VT')}">
-                  <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
+                  <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"></option>
-                          th:selected="${crackdownStatus.violationList != null and commonCode.itemCd eq violation.violation}"></option>
                 </th:block>
-                <option th:selected="${violation.violation ne null && !#strings.contains(violation.violation, 'VT')}" value="etc">직접입력</option>
+                <option value="etc">직접입력</option>
               </select>
-              <th:block th:if="${violation.violation ne null and !#strings.contains(violation.violation, 'VT')}">
-                <div class="col-auto">
-                  <input type="text" class="form-control" name="violationEtc" th:value="${violation.violation}">
-                </div>
-              </th:block>
-              <th:block th:if="${i.index > 0}">
-                <button type="button" class="btn btn-primary col-auto" id="violationRemoveBtn">-</button>
-                <input type="hidden" name="violationKey" th:value="${violation.violationKey}">
-              </th:block>
             </div>
           </th:block>
-        </th:block>
+          <th:block th:if="${!#lists.isEmpty(crackdownStatus.violationList)}">
+            <th:block th:each="violation, i : ${crackdownStatus.violationList}">
+              <div class="row">
+                <input type="hidden" name="violationKey" th:value="${violation.violationKey}">
+                <select class="form-select form-select-sm violation" name="violation" style="max-width: 90% !important;">
+                  <option value="">선택</option>
+                  <th:block th:each="commonCode:${session.commonCode.get('VT')}">
+                    <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
+                            th:selected="${crackdownStatus.violationList != null and commonCode.itemCd eq violation.violation}"></option>
+                  </th:block>
+                  <option th:selected="${violation.violation ne null && !#strings.contains(violation.violation, 'VT')}" value="etc">직접입력</option>
+                </select>
+                <th:block th:if="${violation.violation ne null and !#strings.contains(violation.violation, 'VT')}">
+                  <div class="col-auto">
+                    <input type="text" class="form-control form-control-sm" name="violationEtc" th:value="${violation.violation}">
+                  </div>
+                </th:block>
+                <th:block th:if="${i.index > 0}">
+                  <button type="button" class="btn btn-primary col-auto" id="violationRemoveBtn">-</button>
+                  <input type="hidden" name="violationKey" th:value="${violation.violationKey}">
+                </th:block>
+              </div>
+            </th:block>
+          </th:block>
+        </div>
       </div>
-      <label class="col-sm-1 col-form-label text-center">위반장소</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">침범유형</label>
-      <div class="col-sm-2">
-        <input class="form-control" placeholder="위도" name="napoSeaPointLat" th:value="${crackdownStatus.napoSeaPointLat}">
-        <input class="form-control" placeholder="경도" name="napoSeaPointLon" th:value="${crackdownStatus.napoSeaPointLon}">
-        <input class="form-control" placeholder="상세내용" name="napoSeaPointDetail" th:value="${crackdownStatus.napoSeaPointDetail}">
-      </div>
-      <label class="col-sm-1 col-form-label text-center">침범유형</label>
       <div class="col-sm-2">
         <select class="form-select form-select-sm" name="invasionType">
           <option value="">선택</option>
@@ -97,40 +103,40 @@
       특수공무집행방해
     </div>
     <div class="mb-3 row">
-      <label class="col-sm-1 col-form-label text-center">발생건수</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">발생건수</label>
       <div class="col-sm-2">
-        <input type="number" min="0" class="form-control" name="obstrExspdCnt" th:value="${crackdownStatus.obstrExspdCnt}">
+        <input type="number" min="0" class="form-control form-control-sm" name="obstrExspdCnt" th:value="${crackdownStatus.obstrExspdCnt}">
       </div>
-      <label class="col-sm-1 col-form-label text-center">피해인원</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">피해인원</label>
       <div class="col-sm-2">
-        <input type="number" min="0" class="form-control" name="personDamageCnt" th:value="${crackdownStatus.personDamageCnt}">
+        <input type="number" min="0" class="form-control form-control-sm" name="personDamageCnt" th:value="${crackdownStatus.personDamageCnt}">
       </div>
-      <label class="col-sm-1 col-form-label text-center">피해액</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">피해액</label>
       <div class="col-sm-2">
-        <input type="number" min="0" class="form-control" name="personDamageAmount" th:value="${crackdownStatus.personDamageAmount}">
+        <input type="number" min="0" class="form-control form-control-sm" name="personDamageAmount" th:value="${crackdownStatus.personDamageAmount}">
       </div>
-      <label class="col-sm-1 col-form-label text-center">상세내용</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">상세내용</label>
       <div class="col-sm-2">
-        <input class="form-control" name="personDamageDetail" th:value="${crackdownStatus.personDamageDetail}">
+        <input class="form-control form-control-sm" name="personDamageDetail" th:value="${crackdownStatus.personDamageDetail}">
       </div>
-      <label class="col-sm-1 col-form-label text-center">발생건수</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">발생건수</label>
       <div class="col-sm-2">
-        <input type="number" min="0" class="form-control" name="materialDamageCnt" th:value="${crackdownStatus.materialDamageCnt}">
+        <input type="number" min="0" class="form-control form-control-sm" name="materialDamageCnt" th:value="${crackdownStatus.materialDamageCnt}">
       </div>
-      <label class="col-sm-1 col-form-label text-center">피해액</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">피해액</label>
       <div class="col-sm-2">
-        <input type="number" min="0" class="form-control" name="materialDamageAmount" th:value="${crackdownStatus.materialDamageAmount}">
+        <input type="number" min="0" class="form-control form-control-sm" name="materialDamageAmount" th:value="${crackdownStatus.materialDamageAmount}">
       </div>
-      <label class="col-sm-1 col-form-label text-center">상세내용</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">상세내용</label>
       <div class="col-sm-2">
-        <input class="form-control" name="materialDamageDetail" th:value="${crackdownStatus.materialDamageDetail}">
+        <input class="form-control form-control-sm" name="materialDamageDetail" th:value="${crackdownStatus.materialDamageDetail}">
       </div>
     </div>
     <div class="mb-3 row">
       검거기관
     </div>
     <div class="mb-3 row">
-      <label class="col-sm-1 col-form-label text-center">사건담당 기관</label>
+      <label 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" name="caseAgency">
           <option value="">선택</option>
@@ -140,7 +146,7 @@
           </th:block>
         </select>
       </div>
-      <label class="col-sm-1 col-form-label text-center">단속<br>경찰서</label>
+      <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">
           <option value="">선택</option>
@@ -150,7 +156,7 @@
           </th:block>
         </select>
       </div>
-      <label class="col-sm-1 col-form-label text-center">단속함정</label>
+      <label 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" name="crackdownBoat" id="crackdownBoat">
           <option value="">선택</option>
@@ -161,24 +167,24 @@
           </th:block>
         </select>
       </div>
-      <label class="col-sm-1 col-form-label text-center">MMSI.NO</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">MMSI.NO</label>
       <div class="col-sm-2">
-        <input class="form-control" name="mmsi" th:value="${crackdownStatus.mmsi}">
+        <input class="form-control form-control-sm" name="mmsi" th:value="${crackdownStatus.mmsi}">
       </div>
     </div>
     <div class="mb-3 row">
       선박제원
     </div>
     <div class="mb-3 row">
-      <label class="col-sm-1 col-form-label text-center">선명</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">선명</label>
       <div class="col-sm-2">
-        <input class="form-control" name="boatNameKr" th:value="${crackdownStatus.fishingBoat.boatNameKr}">
+        <input class="form-control form-control-sm" name="boatNameKr" th:value="${crackdownStatus.fishingBoat.boatNameKr}">
       </div>
-      <label class="col-sm-1 col-form-label text-center">톤수</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">톤수</label>
       <div class="col-sm-2">
-        <input type="number" min="0" class="form-control" name="tonCnt" th:value="${crackdownStatus.fishingBoat.tonCnt}">
+        <input type="number" min="0" class="form-control form-control-sm" name="tonCnt" th:value="${crackdownStatus.fishingBoat.tonCnt}">
       </div>
-      <label class="col-sm-1 col-form-label text-center">선질</label>
+      <label 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" name="boatMaterial" id="boatMaterial">
           <option value="">선택</option>
@@ -189,33 +195,33 @@
           <option value="etc">직접입력</option>
         </select>
       </div>
-      <label class="col-sm-1 col-form-label text-center">선적 성</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">선적 성</label>
       <div class="col-sm-2">
-        <input class="form-control" name="boatNnySung" th:value="${crackdownStatus.fishingBoat.boatNnySung}">
+        <input class="form-control form-control-sm" name="boatNnySung" th:value="${crackdownStatus.fishingBoat.boatNnySung}">
       </div>
-      <label class="col-sm-1 col-form-label text-center">선적 시</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">선적 시</label>
       <div class="col-sm-2">
-        <input class="form-control" name="boatNnySi" th:value="${crackdownStatus.fishingBoat.boatNnySi}">
+        <input class="form-control form-control-sm" name="boatNnySi" th:value="${crackdownStatus.fishingBoat.boatNnySi}">
       </div>
-      <label class="col-sm-1 col-form-label text-center">선장명</label>
+      <label 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:if="${#strings.contains(sailor.position, 'POS001')}">
-          <input th:if="${sailor.position eq 'POS001'}" class="form-control" name="sailorNameKr" th:value="${sailor.sailorNameKr}">
+          <input th:if="${sailor.position eq 'POS001'}" class="form-control form-control-sm" name="sailorNameKr" th:value="${sailor.sailorNameKr}">
         </th:block>
         <th:block th:if="${crackdownStatus.sailorList eq null || #aggregates.sum(crackdownStatus.sailorList.?[position == 'POS001'].![1]) == null}">
-          <input class="form-control" name="sailorNameKr">
+          <input class="form-control form-control-sm" name="sailorNameKr">
         </th:block>
       </div>
-      <label class="col-sm-1 col-form-label text-center">출생년도</label>
+      <label 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:if="${#strings.contains(sailor.position, 'POS001')}">
-          <input th:if="${sailor.position eq 'POS001'}" class="form-control" name="birthdate" id="birthdate" th:value="${#temporals.format(sailor.birthdate, 'yyyy-MM-dd')}">
+          <input th:if="${sailor.position eq 'POS001'}" class="form-control form-control-sm" name="birthdate" id="birthdate" th:value="${#temporals.format(sailor.birthdate, 'yyyy-MM-dd')}">
         </th:block>
         <th:block th:if="${crackdownStatus.sailorList eq null || #aggregates.sum(crackdownStatus.sailorList.?[position == 'POS001'].![1]) == null}">
-          <input class="form-control" name="birthdate" id="birthdate">
+          <input class="form-control form-control-sm" name="birthdate" id="birthdate">
         </th:block>
       </div>
-      <label class="col-sm-1 col-form-label text-center">선종</label>
+      <label 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" name="fisheryType" id="fisheryType">
           <option value="">선택</option>
@@ -227,7 +233,7 @@
         </select>
         <th:block th:if="${crackdownStatus.fishingBoat.fisheryType ne null && !#strings.contains(crackdownStatus.fishingBoat.fisheryType, 'FT')}">
           <div class="col-auto">
-            <input type="text" class="form-control" name="fisheryTypeEtc" th:value="${crackdownStatus.fishingBoat.fisheryType}">
+            <input type="text" class="form-control form-control-sm" name="fisheryTypeEtc" th:value="${crackdownStatus.fishingBoat.fisheryType}">
           </div>
         </th:block>
       </div>
@@ -236,45 +242,45 @@
       어획물 축소기재
     </div>
     <div class="mb-3 row">
-      <label class="col-sm-1 col-form-label text-center">어종</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">어종</label>
       <div class="col-sm-2">
-        <input class="form-control" name="catchFishSpecies" th:value="${crackdownStatus.fishingBoat.catchFishSpecies}">
+        <input class="form-control form-control-sm" name="catchFishSpecies" th:value="${crackdownStatus.fishingBoat.catchFishSpecies}">
       </div>
-      <label class="col-sm-1 col-form-label text-center">수량</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">수량</label>
       <div class="col-sm-2">
-        <input type="number" min="0" class="form-control" name="catchCnt" th:value="${crackdownStatus.fishingBoat.catchCnt}">
+        <input type="number" min="0" class="form-control form-control-sm" name="catchCnt" th:value="${crackdownStatus.fishingBoat.catchCnt}">
       </div>
     </div>
     <div class="mb-3 row">
       범칙물
     </div>
     <div class="mb-3 row">
-      <label class="col-sm-1 col-form-label text-center">어종</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">어종</label>
       <div class="col-sm-2">
-        <input class="form-control" name="offenseFishSpecies" th:value="${crackdownStatus.fishingBoat.offenseFishSpecies}">
+        <input class="form-control form-control-sm" name="offenseFishSpecies" th:value="${crackdownStatus.fishingBoat.offenseFishSpecies}">
       </div>
-      <label class="col-sm-1 col-form-label text-center">어획량</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">어획량</label>
       <div class="col-sm-2">
-        <input type="number" min="0" class="form-control" name="offenseCatchCnt" th:value="${crackdownStatus.fishingBoat.offenseCatchCnt}">
+        <input type="number" min="0" class="form-control form-control-sm" name="offenseCatchCnt" th:value="${crackdownStatus.fishingBoat.offenseCatchCnt}">
       </div>
-      <label class="col-sm-1 col-form-label text-center">폐기량</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">폐기량</label>
       <div class="col-sm-2">
-        <input type="number" min="0" class="form-control" name="offenseIllegalWasteQuantity" th:value="${crackdownStatus.fishingBoat.offenseIllegalWasteQuantity}">
+        <input type="number" min="0" class="form-control form-control-sm" name="offenseIllegalWasteQuantity" th:value="${crackdownStatus.fishingBoat.offenseIllegalWasteQuantity}">
       </div>
-      <label class="col-sm-1 col-form-label text-center">위판량</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">위판량</label>
       <div class="col-sm-2">
-        <input type="number" min="0" class="form-control" name="offenseQuantity" th:value="${crackdownStatus.fishingBoat.offenseQuantity}">
+        <input type="number" min="0" class="form-control form-control-sm" name="offenseQuantity" th:value="${crackdownStatus.fishingBoat.offenseQuantity}">
       </div>
-      <label class="col-sm-1 col-form-label text-center">위판금액</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">위판금액</label>
       <div class="col-sm-2">
-        <input type="number" min="0" class="form-control" name="offenseAmount" th:value="${crackdownStatus.fishingBoat.offenseAmount}">
+        <input type="number" min="0" class="form-control form-control-sm" name="offenseAmount" th:value="${crackdownStatus.fishingBoat.offenseAmount}">
       </div>
     </div>
     <div class="mb-3 row">
       처리결과
     </div>
     <div class="mb-3 row">
-      <label class="col-sm-1 col-form-label text-center">처리현황</label>
+      <label 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" name="processStatus" id="processStatus">
           <option value="">선택</option>
@@ -286,7 +292,7 @@
         </select>
         <th:block th:if="${crackdownStatus.processResult.processStatus ne null && !#strings.contains(crackdownStatus.processResult.processStatus, 'PR')}">
           <div class="col-auto">
-            <input type="text" class="form-control" name="processStatusEtc" th:value="${crackdownStatus.processResult.processStatus}">
+            <input type="text" class="form-control form-control-sm" name="processStatusEtc" th:value="${crackdownStatus.processResult.processStatus}">
           </div>
         </th:block>
       </div>
@@ -295,53 +301,53 @@
       담보금 납부
     </div>
     <div class="mb-3 row">
-      <label class="col-sm-1 col-form-label text-center">납부액</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">납부액</label>
       <div class="col-sm-2">
-        <input type="number" min="0" class="form-control" name="damboPayment" th:value="${crackdownStatus.fishingBoat.damboPayment}">
+        <input type="number" min="0" class="form-control form-control-sm" name="damboPayment" th:value="${crackdownStatus.fishingBoat.damboPayment}">
       </div>
-      <label class="col-sm-1 col-form-label text-center">납부일시</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">납부일시</label>
       <div class="col-sm-2">
-        <input class="form-control" name="paymentPaymentDt" id="paymentPaymentDt" th:value="${#temporals.format(crackdownStatus.fishingBoat.paymentPaymentDt, 'yyyy-MM-dd HH:mm')}">
+        <input class="form-control form-control-sm" name="paymentPaymentDt" id="paymentPaymentDt" th:value="${#temporals.format(crackdownStatus.fishingBoat.paymentPaymentDt, 'yyyy-MM-dd HH:mm')}">
       </div>
     </div>
     <div class="mb-3 row">
       담보금 미납
     </div>
     <div class="mb-3 row">
-      <label class="col-sm-1 col-form-label text-center">미납액</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">미납액</label>
       <div class="col-sm-2">
-        <input type="number" min="0" class="form-control" name="damboUnpaidAmount" th:value="${crackdownStatus.fishingBoat.damboUnpaidAmount}">
+        <input type="number" min="0" class="form-control form-control-sm" name="damboUnpaidAmount" th:value="${crackdownStatus.fishingBoat.damboUnpaidAmount}">
       </div>
     </div>
     <div class="mb-3 row">
       선박처리
     </div>
     <div class="mb-3 row">
-      <label class="col-sm-1 col-form-label text-center">위탁시작일</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">위탁시작일</label>
       <div class="col-sm-2">
-        <input class="form-control" name="consignmentStartDt" id="consignmentStartDt" th:value="${#temporals.format(crackdownStatus.processResult.consignmentStartDt, 'yyyy-MM-dd')}">
+        <input class="form-control form-control-sm" name="consignmentStartDt" id="consignmentStartDt" th:value="${#temporals.format(crackdownStatus.processResult.consignmentStartDt, 'yyyy-MM-dd')}">
       </div>
-      <label class="col-sm-1 col-form-label text-center">위탁종료일</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">위탁종료일</label>
       <div class="col-sm-2">
-        <input class="form-control" name="consignmentEndDt" id="consignmentEndDt" th:value="${#temporals.format(crackdownStatus.processResult.consignmentEndDt, 'yyyy-MM-dd')}">
+        <input class="form-control form-control-sm" name="consignmentEndDt" id="consignmentEndDt" th:value="${#temporals.format(crackdownStatus.processResult.consignmentEndDt, 'yyyy-MM-dd')}">
       </div>
-      <label class="col-sm-1 col-form-label text-center">퇴거일</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">퇴거일</label>
       <div class="col-sm-2">
-        <input class="form-control" name="evictionDt" id="evictionDt" th:value="${#temporals.format(crackdownStatus.processResult.evictionDt, 'yyyy-MM-dd')}">
+        <input class="form-control form-control-sm" name="evictionDt" id="evictionDt" th:value="${#temporals.format(crackdownStatus.processResult.evictionDt, 'yyyy-MM-dd')}">
       </div>
-      <label class="col-sm-1 col-form-label text-center">환부일</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">환부일</label>
       <div class="col-sm-2">
-        <input class="form-control" name="returnDt" id="returnDt" th:value="${#temporals.format(crackdownStatus.processResult.returnDt, 'yyyy-MM-dd')}">
+        <input class="form-control form-control-sm" name="returnDt" id="returnDt" th:value="${#temporals.format(crackdownStatus.processResult.returnDt, 'yyyy-MM-dd')}">
       </div>
-      <label class="col-sm-1 col-form-label text-center">몰수확정일</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">몰수확정일</label>
       <div class="col-sm-2">
-        <input class="form-control" name="confiscationDt" id="confiscationDt" th:value="${#temporals.format(crackdownStatus.processResult.confiscationDt, 'yyyy-MM-dd')}">
+        <input class="form-control form-control-sm" name="confiscationDt" id="confiscationDt" th:value="${#temporals.format(crackdownStatus.processResult.confiscationDt, 'yyyy-MM-dd')}">
       </div>
-      <label class="col-sm-1 col-form-label text-center">폐선일</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">폐선일</label>
       <div class="col-sm-2">
-        <input class="form-control" name="boatDisposalDt" id="boatDisposalDt" th:value="${#temporals.format(crackdownStatus.processResult.boatDisposalDt, 'yyyy-MM-dd')}">
+        <input class="form-control form-control-sm" name="boatDisposalDt" id="boatDisposalDt" th:value="${#temporals.format(crackdownStatus.processResult.boatDisposalDt, 'yyyy-MM-dd')}">
       </div>
-      <label class="col-sm-1 col-form-label text-center">폐선종류</label>
+      <label 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" name="boatDisposalType" th:value="${crackdownStatus.processResult.boatDisposalType}">
           <option value="">선택</option>
@@ -356,30 +362,30 @@
       직접인계
     </div>
     <div class="mb-3 row">
-      <label class="col-sm-1 col-form-label text-center">직접인계일</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">직접인계일</label>
       <div class="col-sm-2">
-        <input class="form-control" name="directHandoverDt" id="directHandoverDt" th:value="${#temporals.format(crackdownStatus.processResult.directHandoverDt, 'yyyy-MM-dd')}">
+        <input class="form-control form-control-sm" name="directHandoverDt" id="directHandoverDt" th:value="${#temporals.format(crackdownStatus.processResult.directHandoverDt, 'yyyy-MM-dd')}">
       </div>
-      <label class="col-sm-1 col-form-label text-center">해점</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">해점</label>
       <div class="col-sm-2">
-        <input class="form-control" placeholder="위도" name="handoverSeaPointLat" th:value="${crackdownStatus.processResult.handoverSeaPointLat}">
+        <input class="form-control form-control-sm" placeholder="위도" name="handoverSeaPointLat" th:value="${crackdownStatus.processResult.handoverSeaPointLat}">
-        <input class="form-control" placeholder="경도" name="handoverSeaPointLon" th:value="${crackdownStatus.processResult.handoverSeaPointLon}">
+        <input class="form-control form-control-sm" placeholder="경도" name="handoverSeaPointLon" th:value="${crackdownStatus.processResult.handoverSeaPointLon}">
-        <input class="form-control" placeholder="상세내용" name="handoverSeaPointDetail" th:value="${crackdownStatus.processResult.handoverSeaPointDetail}">
+        <input class="form-control form-control-sm" placeholder="상세내용" name="handoverSeaPointDetail" th:value="${crackdownStatus.processResult.handoverSeaPointDetail}">
       </div>
-      <label class="col-sm-1 col-form-label text-center">인계함정</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">인계함정</label>
       <div class="col-sm-2">
-        <input class="form-control" name="handoverBoat" th:value="${crackdownStatus.processResult.handoverBoat}">
+        <input class="form-control form-control-sm" name="handoverBoat" th:value="${crackdownStatus.processResult.handoverBoat}">
       </div>
-      <label class="col-sm-1 col-form-label text-center">중측</br>인수함정</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">중측</br>인수함정</label>
       <div class="col-sm-2">
-        <input class="form-control" name="middleTakeoverBoat" th:value="${crackdownStatus.processResult.middleTakeoverBoat}">
+        <input class="form-control form-control-sm" name="middleTakeoverBoat" th:value="${crackdownStatus.processResult.middleTakeoverBoat}">
       </div>
     </div>
     <div class="mb-3 row">
       구속/ 불구속
     </div>
     <div class="mb-3 row">
-      <label class="col-sm-1 col-form-label text-center">선장</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">선장</label>
       <div class="col-sm-2">
         <input type="hidden" name="captinSailorKey" th:value="${crackdownStatus.sailorList ne null ? #aggregates.sum(crackdownStatus.sailorList.?[position == 'POS001'].![sailorKey]) : null}">
         <select class="form-select form-select-sm" name="captin">
@@ -388,7 +394,7 @@
           <option value="N" th:selected="${crackdownStatus.sailorList ne null && #aggregates.sum(crackdownStatus.sailorList.?[position == 'POS001' && isRestriction == 'N'].![1]) != null}">불구속</option>
         </select>
       </div>
-      <label class="col-sm-1 col-form-label text-center">항해장</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">항해장</label>
       <div class="col-sm-2">
         <input type="hidden" name="mateSailorKey" th:value="${crackdownStatus.sailorList ne null ? #aggregates.sum(crackdownStatus.sailorList.?[position == 'POS002'].![sailorKey]) : null}">
         <select class="form-select form-select-sm" name="mate">
@@ -397,7 +403,7 @@
           <option value="N" th:selected="${crackdownStatus.sailorList ne null && #aggregates.sum(crackdownStatus.sailorList.?[position == 'POS002' && isRestriction == 'N'].![1]) != null}">불구속</option>
         </select>
       </div>
-      <label class="col-sm-1 col-form-label text-center">기관장</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">기관장</label>
       <div class="col-sm-2">
         <input type="hidden" name="wardenSailorKey" th:value="${crackdownStatus.sailorList ne null ? #aggregates.sum(crackdownStatus.sailorList.?[position == 'POS003'].![sailorKey]) : null}">
         <select class="form-select form-select-sm" name="warden">
@@ -412,9 +418,9 @@
       <th:block th:each="sailor:${crackdownStatus.sailorList}" th:if="${#strings.contains(sailor.position, 'POS005') || #strings.contains(sailor.position, 'POS006')}">
         <div class="row">
           <input type="hidden" name="sailorKey" th:value="${sailor.sailorKey}">
-          <label class="col-sm-1 col-form-label text-center">선원 이름</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">선원 이름</label>
           <div class="col-sm-2">
-            <input class="form-control" name="sailorNameKr" th:value="${sailor.sailorNameKr}">
+            <input class="form-control form-control-sm" name="sailorNameKr" th:value="${sailor.sailorNameKr}">
           </div>
           <div class="col-sm-2">
             <select class="form-select form-select-sm sailor-list" name="sailor">
@@ -432,74 +438,74 @@
       현장조사
     </div>
     <div class="mb-3 row">
-      <label class="col-sm-1 col-form-label text-center">나포일시</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">나포일시</label>
       <div class="col-sm-2">
-        <input class="form-control" name="fieldIvsgtNapoDt" id="fieldIvsgtNapoDt" th:value="${#temporals.format(crackdownStatus.fieldIvsgtNapoDt, 'yyyy-MM-dd HH:mm')}">
+        <input class="form-control form-control-sm" name="fieldIvsgtNapoDt" id="fieldIvsgtNapoDt" th:value="${#temporals.format(crackdownStatus.fieldIvsgtNapoDt, 'yyyy-MM-dd HH:mm')}">
       </div>
-      <label class="col-sm-1 col-form-label text-center">석방일시</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">석방일시</label>
       <div class="col-sm-2">
-        <input class="form-control" name="fieldIvsgtReleaseDt" id="fieldIvsgtReleaseDt" th:value="${#temporals.format(crackdownStatus.fieldIvsgtReleaseDt, 'yyyy-MM-dd HH:mm')}">
+        <input class="form-control form-control-sm" name="fieldIvsgtReleaseDt" id="fieldIvsgtReleaseDt" th:value="${#temporals.format(crackdownStatus.fieldIvsgtReleaseDt, 'yyyy-MM-dd HH:mm')}">
       </div>
-      <!--<label class="col-sm-1 col-form-label text-center">소요시간</label>
+      <!--<label class="col-sm-1 col-form-label col-form-label-sm text-center">소요시간</label>
       <div class="col-sm-2">
-        <input class="form-control" name="fieldIvsgtTimeTaken" readonly>
+        <input class="form-control form-control-sm" name="fieldIvsgtTimeTaken" readonly>
       </div>-->
-      <label class="col-sm-1 col-form-label text-center">영장청구<br>소요시간</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">영장청구<br>소요시간</label>
       <div class="col-sm-2">
-        <input class="form-control" name="warrantReqTakeTime">
+        <input class="form-control form-control-sm" name="warrantReqTakeTime">
       </div>
     </div>
     <div class="mb-3 row">
       압송
     </div>
     <div class="mb-3 row">
-      <label class="col-sm-1 col-form-label text-center">압송시작</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">압송시작</label>
       <div class="col-sm-2">
-        <input class="form-control" name="pressurizedStartDt" id="pressurizedStartDt" th:value="${#temporals.format(crackdownStatus.pressurizedStartDt, 'yyyy-MM-dd HH:mm')}">
+        <input class="form-control form-control-sm" name="pressurizedStartDt" id="pressurizedStartDt" th:value="${#temporals.format(crackdownStatus.pressurizedStartDt, 'yyyy-MM-dd HH:mm')}">
       </div>
-      <label class="col-sm-1 col-form-label text-center">압송종료</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">압송종료</label>
       <div class="col-sm-2">
-        <input class="form-control" name="pressurizedEndDt" id="pressurizedEndDt" th:value="${#temporals.format(crackdownStatus.pressurizedEndDt, 'yyyy-MM-dd HH:mm')}">
+        <input class="form-control form-control-sm" name="pressurizedEndDt" id="pressurizedEndDt" th:value="${#temporals.format(crackdownStatus.pressurizedEndDt, 'yyyy-MM-dd HH:mm')}">
       </div>
-      <!--<label class="col-sm-1 col-form-label text-center">압송<br>소요시간</label>
+      <!--<label class="col-sm-1 col-form-label col-form-label-sm text-center">압송<br>소요시간</label>
       <div class="col-sm-2">
-        <input class="form-control" name="pressurizedTimeTaken" readonly>
+        <input class="form-control form-control-sm" name="pressurizedTimeTaken" readonly>
       </div>-->
-      <label class="col-sm-1 col-form-label text-center">거리</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">거리</label>
       <div class="col-sm-2">
-        <input class="form-control" name="distance" th:value="${crackdownStatus.distance}">
+        <input class="form-control form-control-sm" name="distance" th:value="${crackdownStatus.distance}">
       </div>
     </div>
     <div class="mb-3 row">
       압수어구
     </div>
     <div class="mb-3 row">
-      <label class="col-sm-1 col-form-label text-center">틀</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">틀</label>
       <div class="col-sm-2">
-        <input class="form-control" name="confiscationFrame" th:value="${crackdownStatus.fishingBoat.confiscationFrame}">
+        <input class="form-control form-control-sm" name="confiscationFrame" th:value="${crackdownStatus.fishingBoat.confiscationFrame}">
       </div>
-      <label class="col-sm-1 col-form-label text-center">폭</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">폭</label>
       <div class="col-sm-2">
-        <input class="form-control" name="confiscationWidth" th:value="${crackdownStatus.fishingBoat.confiscationWidth}">
+        <input class="form-control form-control-sm" name="confiscationWidth" th:value="${crackdownStatus.fishingBoat.confiscationWidth}">
       </div>
-      <label class="col-sm-1 col-form-label text-center">조</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">조</label>
       <div class="col-sm-2">
-        <input class="form-control" name="confiscationJo" th:value="${crackdownStatus.fishingBoat.confiscationJo}">
+        <input class="form-control form-control-sm" name="confiscationJo" th:value="${crackdownStatus.fishingBoat.confiscationJo}">
       </div>
-      <label class="col-sm-1 col-form-label text-center">개</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">개</label>
       <div class="col-sm-2">
-        <input class="form-control" name="confiscationGae" th:value="${crackdownStatus.fishingBoat.confiscationGae}">
+        <input class="form-control form-control-sm" name="confiscationGae" th:value="${crackdownStatus.fishingBoat.confiscationGae}">
       </div>
-      <label class="col-sm-1 col-form-label text-center">기타</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">기타</label>
       <div class="col-sm-2">
-        <input class="form-control" name="confiscationEtc" th:value="${crackdownStatus.fishingBoat.confiscationEtc}">
+        <input class="form-control form-control-sm" name="confiscationEtc" th:value="${crackdownStatus.fishingBoat.confiscationEtc}">
       </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-warning" id="saveTempBtn">임시저장</button>-->
   <button type="button" class="btn btn-primary" id="saveCrackdownStatusBtn">저장</button>
 </div>
 </html>

src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatusHistoryDetail.html

@@ -4,26 +4,22 @@
         나포정보
     </div>
     <div class="mb-3 row">
-        <div class="col-sm-1">
+        <label class="col-sm-2 col-form-label col-form-label-sm text-center">나포일시</label>
-            <label class="col-auto col-form-label text-center">나포일시</label>
+        <div class="col-4">
-            <label class="col-auto col-form-label text-center">NLL</label>
+            <input class="form-control form-control-sm" name="napoDt" id="napoDt" th:value="${#temporals.format(crackdownStatusVersion.napoDt, 'yyyy-MM-dd HH:mm')}" readonly>
         </div>
-        <div class="col-sm-2">
+        <label class="col-sm-2 col-form-label col-form-label-sm text-center">NLL</label>
-            <input class="form-control" name="napoDt" id="napoDt" th:value="${#temporals.format(crackdownStatusVersion.napoDt, 'yyyy-MM-dd HH:mm')}">
+        <div class="col-4">
-            <select class="form-select form-select-sm" name="nll">
+            <select class="form-select form-select-sm" name="nll" disabled>
                 <option value="Y" th:selected="${crackdownStatusVersion.nll == 'Y'}">O</option>
                 <option value="N" th:selected="${crackdownStatusVersion.nll == 'N'}">X</option>
             </select>
         </div>
-        <label class="col-sm-1 col-form-label text-center">위반장소</label>
+    </div>
-        <div class="col-sm-2">
+    <div class="mb-3 row">
-            <input class="form-control" placeholder="위도" name="napoSeaPointLat" th:value="${crackdownStatusVersion.napoSeaPointLat}">
+        <label class="col-sm-2 col-form-label col-form-label-sm text-center">침범유형</label>
-            <input class="form-control" placeholder="경도" name="napoSeaPointLon" th:value="${crackdownStatusVersion.napoSeaPointLon}">
+        <div class="col-4">
-            <input class="form-control" placeholder="상세내용" name="napoSeaPointDetail" th:value="${crackdownStatusVersion.napoSeaPointDetail}">
+            <select class="form-select form-select-sm" name="invasionType" disabled>
-        </div>
-        <label class="col-sm-1 col-form-label text-center">침범유형</label>
-        <div class="col-sm-2">
-            <select class="form-select form-select-sm" name="invasionType">
                 <option value="">선택</option>
                 <th:block th:each="commonCode:${session.commonCode.get('IST')}">
                     <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
@@ -32,46 +28,60 @@
             </select>
         </div>
     </div>
+    <div class="mb-3 row">
+        <label class="col-sm-2 col-form-label col-form-label-sm text-center">위반장소</label>
+        <div class="col-6">
+            <input class="form-control form-control-sm" placeholder="위도" name="napoSeaPointLat" th:value="${crackdownStatusVersion.napoSeaPointLat}" readonly>
+            <input class="form-control form-control-sm" placeholder="경도" name="napoSeaPointLon" th:value="${crackdownStatusVersion.napoSeaPointLon}" readonly>
+            <input class="form-control form-control-sm" placeholder="상세내용" name="napoSeaPointDetail" th:value="${crackdownStatusVersion.napoSeaPointDetail}" readonly>
+        </div>
+    </div>
     <div class="mb-3 row">
         특수공무집행방해
     </div>
     <div class="mb-3 row">
-        <label class="col-sm-1 col-form-label text-center">발생건수</label>
+        <label class="col-sm-2 col-form-label col-form-label-sm text-center">발생건수</label>
-        <div class="col-sm-2">
+        <div class="col-4">
-            <input type="number" min="0" class="form-control" name="obstrExspdCnt" th:value="${crackdownStatusVersion.obstrExspdCnt}">
+            <input type="number" min="0" class="form-control form-control-sm" name="obstrExspdCnt" th:value="${crackdownStatusVersion.obstrExspdCnt}" readonly>
         </div>
-        <label class="col-sm-1 col-form-label text-center">피해인원</label>
+        <label class="col-sm-2 col-form-label col-form-label-sm text-center">피해인원</label>
-        <div class="col-sm-2">
+        <div class="col-4">
-            <input type="number" min="0" class="form-control" name="personDamageCnt" th:value="${crackdownStatusVersion.personDamageCnt}">
+            <input type="number" min="0" class="form-control form-control-sm" name="personDamageCnt" th:value="${crackdownStatusVersion.personDamageCnt}" readonly>
         </div>
-        <label class="col-sm-1 col-form-label text-center">피해액</label>
+    </div>
-        <div class="col-sm-2">
+    <div class="mb-3 row">
-            <input type="number" min="0" class="form-control" name="personDamageAmount" th:value="${crackdownStatusVersion.personDamageAmount}">
+        <label class="col-sm-2 col-form-label col-form-label-sm text-center">피해액</label>
+        <div class="col-4">
+            <input type="number" min="0" class="form-control form-control-sm" name="personDamageAmount" th:value="${crackdownStatusVersion.personDamageAmount}" readonly>
         </div>
-        <label class="col-sm-1 col-form-label text-center">상세내용</label>
+        <label class="col-sm-2 col-form-label col-form-label-sm text-center">상세내용</label>
-        <div class="col-sm-2">
+        <div class="col-4">
-            <input class="form-control" name="personDamageDetail" th:value="${crackdownStatusVersion.personDamageDetail}">
+            <input class="form-control form-control-sm" name="personDamageDetail" th:value="${crackdownStatusVersion.personDamageDetail}" readonly>
         </div>
-        <label class="col-sm-1 col-form-label text-center">발생건수</label>
+    </div>
-        <div class="col-sm-2">
+    <div class="mb-3 row">
-            <input type="number" min="0" class="form-control" name="materialDamageCnt" th:value="${crackdownStatusVersion.materialDamageCnt}">
+        <label class="col-sm-2 col-form-label col-form-label-sm text-center">발생건수</label>
+        <div class="col-4">
+            <input type="number" min="0" class="form-control form-control-sm" name="materialDamageCnt" th:value="${crackdownStatusVersion.materialDamageCnt}" readonly>
         </div>
-        <label class="col-sm-1 col-form-label text-center">피해액</label>
+        <label class="col-sm-2 col-form-label col-form-label-sm text-center">피해액</label>
-        <div class="col-sm-2">
+        <div class="col-4">
-            <input type="number" min="0" class="form-control" name="materialDamageAmount" th:value="${crackdownStatusVersion.materialDamageAmount}">
+            <input type="number" min="0" class="form-control form-control-sm" name="materialDamageAmount" th:value="${crackdownStatusVersion.materialDamageAmount}" readonly>
         </div>
-        <label class="col-sm-1 col-form-label text-center">상세내용</label>
+    </div>
-        <div class="col-sm-2">
+    <div class="mb-3 row">
-            <input class="form-control" name="materialDamageDetail" th:value="${crackdownStatusVersion.materialDamageDetail}">
+        <label class="col-sm-2 col-form-label col-form-label-sm text-center">상세내용</label>
+        <div class="col-4">
+            <input class="form-control form-control-sm" name="materialDamageDetail" th:value="${crackdownStatusVersion.materialDamageDetail}" readonly>
         </div>
     </div>
     <div class="mb-3 row">
         검거기관
     </div>
     <div class="mb-3 row">
-        <label class="col-sm-1 col-form-label text-center">사건담당 기관</label>
+        <label class="col-sm-2 col-form-label col-form-label-sm text-center">사건담당 기관</label>
-        <div class="col-sm-2">
+        <div class="col-4">
-            <select class="form-select form-select-sm" name="caseAgency">
+            <select class="form-select form-select-sm" name="caseAgency" disabled>
                 <option value="">선택</option>
                 <th:block th:each="commonCode:${session.commonCode.get('ATA')}">
                     <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
@@ -79,9 +89,9 @@
                 </th:block>
             </select>
         </div>
-        <label class="col-sm-1 col-form-label text-center">단속<br>경찰서</label>
+        <label class="col-sm-2 col-form-label col-form-label-sm text-center">단속<br>경찰서</label>
-        <div class="col-sm-2">
+        <div class="col-4">
-            <select class="form-select form-select-sm" name="crackdownPolice" id="crackdownPolice">
+            <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}"
@@ -90,9 +100,11 @@
                 <option value="etc">직접입력</option>
             </select>
         </div>
-        <label class="col-sm-1 col-form-label text-center">단속함정</label>
+    </div>
-        <div class="col-sm-2">
+    <div class="mb-3 row">
-            <select class="form-select form-select-sm" name="crackdownBoat" id="crackdownBoat">
+        <label class="col-sm-2 col-form-label col-form-label-sm text-center">단속함정</label>
+        <div class="col-4">
+            <select class="form-select form-select-sm" name="crackdownBoat" id="crackdownBoat" disabled>
                 <option value="">선택</option>
                 <th:block th:each="num : ${#numbers.sequence(1,#lists.size(session.commonCode.get('CPO')))}">
                     <th:block th:if="${'CPO'+num == crackdownStatusVersion.crackdownPolice}" th:each="commonCode:${session.commonCode.get('CPO'+num)}">
@@ -101,43 +113,47 @@
                 </th:block>
             </select>
         </div>
-        <label class="col-sm-1 col-form-label text-center">MMSI.NO</label>
+        <label class="col-sm-2 col-form-label col-form-label-sm text-center">MMSI.NO</label>
-        <div class="col-sm-2">
+        <div class="col-4">
-            <input class="form-control" name="mmsi" th:value="${crackdownStatusVersion.mmsi}">
+            <input class="form-control form-control-sm" name="mmsi" th:value="${crackdownStatusVersion.mmsi}" readonly>
         </div>
     </div>
     <div class="mb-3 row">
         현장조사
     </div>
     <div class="mb-3 row">
-        <label class="col-sm-1 col-form-label text-center">나포일시</label>
+        <label class="col-sm-2 col-form-label col-form-label-sm text-center">나포일시</label>
-        <div class="col-sm-2">
+        <div class="col-4">
-            <input class="form-control" name="fieldIvsgtNapoDt" id="fieldIvsgtNapoDt" th:value="${#temporals.format(crackdownStatusVersion.fieldIvsgtNapoDt, 'yyyy-MM-dd HH:mm')}">
+            <input class="form-control form-control-sm" name="fieldIvsgtNapoDt" id="fieldIvsgtNapoDt" th:value="${#temporals.format(crackdownStatusVersion.fieldIvsgtNapoDt, 'yyyy-MM-dd HH:mm')}" readonly>
         </div>
-        <label class="col-sm-1 col-form-label text-center">석방일시</label>
+    </div>
-        <div class="col-sm-2">
+    <div class="mb-3 row">
-            <input class="form-control" name="fieldIvsgtReleaseDt" id="fieldIvsgtReleaseDt" th:value="${#temporals.format(crackdownStatusVersion.fieldIvsgtReleaseDt, 'yyyy-MM-dd HH:mm')}">
+        <label class="col-sm-2 col-form-label col-form-label-sm text-center">석방일시</label>
+        <div class="col-4">
+            <input class="form-control form-control-sm" name="fieldIvsgtReleaseDt" id="fieldIvsgtReleaseDt" th:value="${#temporals.format(crackdownStatusVersion.fieldIvsgtReleaseDt, 'yyyy-MM-dd HH:mm')}" readonly>
         </div>
-        <label class="col-sm-1 col-form-label text-center">소요시간</label>
+        <label class="col-sm-2 col-form-label col-form-label-sm text-center">소요시간</label>
-        <div class="col-sm-2">
+        <div class="col-4">
-            <input class="form-control" name="fieldIvsgtTimeTaken" th:value="${crackdownStatusVersion.fieldIvsgtTimeTaken}" readonly>
+            <input class="form-control form-control-sm" name="fieldIvsgtTimeTaken" th:value="${crackdownStatusVersion.fieldIvsgtTimeTaken}" readonly>
         </div>
     </div>
     <div class="mb-3 row">
         압송
     </div>
     <div class="mb-3 row">
-        <label class="col-sm-1 col-form-label text-center">압송시작</label>
+        <label class="col-sm-2 col-form-label col-form-label-sm text-center">압송시작</label>
-        <div class="col-sm-2">
+        <div class="col-4">
-            <input class="form-control" name="pressurizedStartDt" id="pressurizedStartDt" th:value="${#temporals.format(crackdownStatusVersion.pressurizedStartDt, 'yyyy-MM-dd HH:mm')}">
+            <input class="form-control form-control-sm" name="pressurizedStartDt" id="pressurizedStartDt" th:value="${#temporals.format(crackdownStatusVersion.pressurizedStartDt, 'yyyy-MM-dd HH:mm')}" readonly>
         </div>
-        <label class="col-sm-1 col-form-label text-center">압송종료</label>
+        <label class="col-sm-2 col-form-label col-form-label-sm text-center">압송종료</label>
-        <div class="col-sm-2">
+        <div class="col-4">
-            <input class="form-control" name="pressurizedEndDt" id="pressurizedEndDt" th:value="${#temporals.format(crackdownStatusVersion.pressurizedEndDt, 'yyyy-MM-dd HH:mm')}">
+            <input class="form-control form-control-sm" name="pressurizedEndDt" id="pressurizedEndDt" th:value="${#temporals.format(crackdownStatusVersion.pressurizedEndDt, 'yyyy-MM-dd HH:mm')}" readonly>
         </div>
-        <label class="col-sm-1 col-form-label text-center">거리</label>
+    </div>
-        <div class="col-sm-2">
+    <div class="mb-3 row">
-            <input class="form-control" name="distance" th:value="${crackdownStatusVersion.distance}">
+        <label class="col-sm-2 col-form-label col-form-label-sm text-center">거리</label>
+        <div class="col-4">
+            <input class="form-control form-control-sm" name="distance" th:value="${crackdownStatusVersion.distance}" readonly>
         </div>
     </div>
 </html>

src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatusHistoryViewModal.html

@@ -19,7 +19,7 @@
 </ul>
 
 <!-- 내용 -->
-<div class="tab-content">
+<div class="tab-content" style="overflow-y: scroll">
   <div class="tab-pane fade show active" id="history" role="tabpanel" aria-labelledby="history-tab">
     <div class="modal-body" id="cdsEditBody">
       <form action="#" method="post" id="cdsEditForm">
@@ -29,8 +29,8 @@
         <input type="hidden" name="cdsKey" th:value="${crackdownStatus.cdsKey}">
         <th:block th:if="${!#lists.isEmpty(crackdownStatusVersionList)}">
           <div class="row justify-content-start">
-            <div class="col-4">
+            <div class="col-3">
-              <table class="table table-striped table-bordered" style="max-width: none; width: auto;" id="crackdownStatusVersionTable">
+              <table class="table table-striped table-bordered"  id="crackdownStatusVersionTable">
                 <thead>
                 <tr>
                   <th></th>
@@ -51,122 +51,138 @@
                 </tbody>
               </table>
             </div>
-          </div>
+            <div class="col-9">
-          <div class="col-8">
+              <div id="historyDetailDiv">
-            <div id="historyDetailDiv">
+                <div class="mb-3 row">
-              <div class="mb-3 row">
+                  나포정보
-                나포정보
-              </div>
-              <div class="mb-3 row">
-                <div class="col-sm-1">
-                  <label class="col-auto col-form-label text-center">나포일시</label>
-                  <label class="col-auto col-form-label text-center">NLL</label>
                 </div>
-                <div class="col-sm-2">
+                <div class="mb-3 row">
-                  <input class="form-control" name="napoDt" id="napoDt" readonly>
+                  <label class="col-sm-2 col-form-label col-form-label-sm text-center">나포일시</label>
-                  <input class="form-control" name="nll" id="nll" readonly>
+                  <div class="col-4">
+                    <input class="form-control form-control-sm" name="napoDt" id="napoDt" readonly>
+                  </div>
+                  <label class="col-sm-2 col-form-label col-form-label-sm text-center">NLL</label>
+                  <div class="col-4">
+                    <input class="form-control form-control-sm" name="nll" id="nll" readonly>
+                  </div>
                 </div>
-                <label class="col-sm-1 col-form-label text-center">위반장소</label>
+                <div class="mb-3 row">
-                <div class="col-sm-2">
+                  <label class="col-sm-2 col-form-label col-form-label-sm text-center">침범유형</label>
-                  <input class="form-control" placeholder="위도" name="napoSeaPointLat" readonly>
+                  <div class="col-4">
-                  <input class="form-control" placeholder="경도" name="napoSeaPointLon" readonly>
+                    <input class="form-control form-control-sm" name="invasionType" id="invasionType" readonly>
-                  <input class="form-control" placeholder="상세내용" name="napoSeaPointDetail" readonly>
+                  </div>
                 </div>
-                <label class="col-sm-1 col-form-label text-center">침범유형</label>
+                <div class="mb-3 row">
-                <div class="col-sm-2">
+                  <label class="col-sm-2 col-form-label col-form-label-sm text-center">위반장소</label>
-                  <input class="form-control" name="invasionType" id="invasionType" readonly>
+                  <div class="col-6">
+                    <input class="form-control form-control-sm" placeholder="위도" name="napoSeaPointLat" readonly>
+                    <input class="form-control form-control-sm" placeholder="경도" name="napoSeaPointLon" readonly>
+                    <input class="form-control form-control-sm" placeholder="상세내용" name="napoSeaPointDetail" readonly>
+                  </div>
                 </div>
-              </div>
+                <div class="mb-3 row">
-              <div class="mb-3 row">
+                  특수공무집행방해
-                특수공무집행방해
-              </div>
-              <div class="mb-3 row">
-                <label class="col-sm-1 col-form-label text-center">발생건수</label>
-                <div class="col-sm-2">
-                  <input type="number" min="0" class="form-control" name="obstrExspdCnt" readonly>
                 </div>
-                <label class="col-sm-1 col-form-label text-center">피해인원</label>
+                <div class="mb-3 row">
-                <div class="col-sm-2">
+                  <label class="col-sm-2 col-form-label col-form-label-sm text-center">발생건수</label>
-                  <input type="number" min="0" class="form-control" name="personDamageCnt" readonly>
+                  <div class="col-4">
+                    <input type="number" min="0" class="form-control form-control-sm" name="obstrExspdCnt" readonly>
+                  </div>
+                  <label class="col-sm-2 col-form-label col-form-label-sm text-center">피해인원</label>
+                  <div class="col-4">
+                    <input type="number" min="0" class="form-control form-control-sm" name="personDamageCnt" readonly>
+                  </div>
                 </div>
-                <label class="col-sm-1 col-form-label text-center">피해액</label>
+                <div class="mb-3 row">
-                <div class="col-sm-2">
+                  <label class="col-sm-2 col-form-label col-form-label-sm text-center">피해액</label>
-                  <input type="number" min="0" class="form-control" name="personDamageAmount" readonly>
+                  <div class="col-4">
+                    <input type="number" min="0" class="form-control form-control-sm" name="personDamageAmount" readonly>
+                  </div>
+                  <label class="col-sm-2 col-form-label col-form-label-sm text-center">상세내용</label>
+                  <div class="col-4">
+                    <input class="form-control form-control-sm" name="personDamageDetail" readonly>
+                  </div>
                 </div>
-                <label class="col-sm-1 col-form-label text-center">상세내용</label>
+                <div class="mb-3 row">
-                <div class="col-sm-2">
+                  <label class="col-sm-2 col-form-label col-form-label-sm text-center">발생건수</label>
-                  <input class="form-control" name="personDamageDetail" readonly>
+                  <div class="col-4">
+                    <input type="number" min="0" class="form-control form-control-sm" name="materialDamageCnt" readonly>
+                  </div>
+                  <label class="col-sm-2 col-form-label col-form-label-sm text-center">피해액</label>
+                  <div class="col-4">
+                    <input type="number" min="0" class="form-control form-control-sm" name="materialDamageAmount" readonly>
+                  </div>
                 </div>
-                <label class="col-sm-1 col-form-label text-center">발생건수</label>
+                <div class="mb-3 row">
-                <div class="col-sm-2">
+                  <label class="col-sm-2 col-form-label col-form-label-sm text-center">상세내용</label>
-                  <input type="number" min="0" class="form-control" name="materialDamageCnt" readonly>
+                  <div class="col-4">
+                    <input class="form-control form-control-sm" name="materialDamageDetail" readonly>
+                  </div>
                 </div>
-                <label class="col-sm-1 col-form-label text-center">피해액</label>
+                <div class="mb-3 row">
-                <div class="col-sm-2">
+                  검거기관
-                  <input type="number" min="0" class="form-control" name="materialDamageAmount" readonly>
                 </div>
-                <label class="col-sm-1 col-form-label text-center">상세내용</label>
+                <div class="mb-3 row">
-                <div class="col-sm-2">
+                  <label class="col-sm-2 col-form-label col-form-label-sm text-center">사건담당 기관</label>
-                  <input class="form-control" name="materialDamageDetail" readonly>
+                  <div class="col-4">
+                    <input class="form-control form-control-sm" name="caseAgency" readonly>
+                  </div>
+                  <label class="col-sm-2 col-form-label col-form-label-sm text-center">단속<br>경찰서</label>
+                  <div class="col-4">
+                    <input class="form-control form-control-sm" name="crackdownPolice" readonly>
+                  </div>
                 </div>
-              </div>
+                <div class="mb-3 row">
-              <div class="mb-3 row">
+                  <label class="col-sm-2 col-form-label col-form-label-sm text-center">단속함정</label>
-                검거기관
+                  <div class="col-4">
-              </div>
+                    <input class="form-control form-control-sm" name="crackdownBoat" readonly>
-              <div class="mb-3 row">
+                  </div>
-                <label class="col-sm-1 col-form-label text-center">사건담당 기관</label>
+                  <label class="col-sm-2 col-form-label col-form-label-sm text-center">MMSI.NO</label>
-                <div class="col-sm-2">
+                  <div class="col-4">
-                  <input class="form-control" name="caseAgency" readonly>
+                    <input class="form-control form-control-sm" name="mmsi" readonly>
+                  </div>
                 </div>
-                <label class="col-sm-1 col-form-label text-center">단속<br>경찰서</label>
+                <div class="mb-3 row">
-                <div class="col-sm-2">
+                  현장조사
-                  <input class="form-control" name="crackdownPolice" readonly>
                 </div>
-                <label class="col-sm-1 col-form-label text-center">단속함정</label>
+                <div class="mb-3 row">
-                <div class="col-sm-2">
+                  <label class="col-sm-2 col-form-label col-form-label-sm text-center">나포일시</label>
-                  <input class="form-control" name="crackdownBoat" readonly>
+                  <div class="col-4">
+                    <input class="form-control form-control-sm" name="fieldIvsgtNapoDt" id="fieldIvsgtNapoDt" readonly>
+                  </div>
+                  <label class="col-sm-2 col-form-label col-form-label-sm text-center">석방일시</label>
+                  <div class="col-4">
+                    <input class="form-control form-control-sm" name="fieldIvsgtReleaseDt" id="fieldIvsgtReleaseDt" readonly>
+                  </div>
                 </div>
-                <label class="col-sm-1 col-form-label text-center">MMSI.NO</label>
+                <div class="mb-3 row">
-                <div class="col-sm-2">
+                  <label class="col-sm-2 col-form-label col-form-label-sm text-center">소요시간</label>
-                  <input class="form-control" name="mmsi" readonly>
+                  <div class="col-4">
+                    <input class="form-control form-control-sm" name="fieldIvsgtTimeTaken" readonly>
+                  </div>
                 </div>
-              </div>
+                <div class="mb-3 row">
-              <div class="mb-3 row">
+                  압송
-                현장조사
-              </div>
-              <div class="mb-3 row">
-                <label class="col-sm-1 col-form-label text-center">나포일시</label>
-                <div class="col-sm-2">
-                  <input class="form-control" name="fieldIvsgtNapoDt" id="fieldIvsgtNapoDt" readonly>
                 </div>
-                <label class="col-sm-1 col-form-label text-center">석방일시</label>
+                <div class="mb-3 row">
-                <div class="col-sm-2">
+                  <label class="col-sm-2 col-form-label col-form-label-sm text-center">압송시작</label>
-                  <input class="form-control" name="fieldIvsgtReleaseDt" id="fieldIvsgtReleaseDt" readonly>
+                  <div class="col-4">
+                    <input class="form-control form-control-sm" name="pressurizedStartDt" id="pressurizedStartDt" readonly>
+                  </div>
+                  <label class="col-sm-2 col-form-label col-form-label-sm text-center">압송종료</label>
+                  <div class="col-4">
+                    <input class="form-control form-control-sm" name="pressurizedEndDt" id="pressurizedEndDt" readonly>
+                  </div>
                 </div>
-                <label class="col-sm-1 col-form-label text-center">소요시간</label>
+                <div class="mb-3 row">
-                <div class="col-sm-2">
+                  <label class="col-sm-2 col-form-label col-form-label-sm text-center">영장청구<br>소요시간</label>
-                  <input class="form-control" name="fieldIvsgtTimeTaken" readonly>
+                  <div class="col-4">
-                </div>
+                    <input class="form-control form-control-sm" name="warrantReqTakeTime" readonly>
-              </div>
+                  </div>
-              <div class="mb-3 row">
+                  <label class="col-sm-2 col-form-label col-form-label-sm text-center">거리</label>
-                압송
+                  <div class="col-4">
-              </div>
+                    <input class="form-control form-control-sm" name="distance" readonly>
-              <div class="mb-3 row">
+                  </div>
-                <label class="col-sm-1 col-form-label text-center">압송시작</label>
-                <div class="col-sm-2">
-                  <input class="form-control" name="pressurizedStartDt" id="pressurizedStartDt" readonly>
-                </div>
-                <label class="col-sm-1 col-form-label text-center">압송종료</label>
-                <div class="col-sm-2">
-                  <input class="form-control" name="pressurizedEndDt" id="pressurizedEndDt" readonly>
-                </div>
-                <label class="col-sm-1 col-form-label text-center">영장청구<br>소요시간</label>
-                <div class="col-sm-2">
-                  <input class="form-control" name="warrantReqTakeTime" readonly>
-                </div>
-                <label class="col-sm-1 col-form-label text-center">거리</label>
-                <div class="col-sm-2">
-                  <input class="form-control" name="distance" readonly>
                 </div>
               </div>
             </div>

src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatusViewModal.html

@@ -42,30 +42,31 @@
         </div>
         <div class="mb-3 row">
           <div class="col-sm-1">
-            <label class="col-auto col-form-label text-center">나포일시</label>
+            <label class="col-auto col-form-label col-form-label-sm text-center">나포일시</label>
-            <label class="col-auto col-form-label text-center">NLL</label>
+            <label class="col-sm-12 col-form-label col-form-label-sm text-center">NLL</label>
           </div>
           <div class="col-sm-2">
-            <input class="form-control" name="napoDt" id="napoDt" th:value="${#temporals.format(crackdownStatus.napoDt, 'yyyy-MM-dd HH:mm')}">
+            <input class=" form-control form-control-sm" name="napoDt" id="napoDt" th:value="${#temporals.format(crackdownStatus.napoDt, 'yyyy-MM-dd HH:mm')}" readonly>
-            <select class="form-select form-select-sm" name="nll">
+            <select class="form-select form-select-sm" name="nll" disabled>
               <option value="Y" th:selected="${crackdownStatus.nll == 'Y'}">O</option>
               <option value="N" th:selected="${crackdownStatus.nll == 'N'}">X</option>
             </select>
           </div>
-          <label class="col-sm-1 col-form-label text-center">위반장소</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">위반장소</label>
-          <div class="col-sm-2">
+          <div class="col-6">
-            <input class="form-control" placeholder="위도" name="napoSeaPointLat" th:value="${crackdownStatus.napoSeaPointLat}">
+            <input class=" form-control form-control-sm" placeholder="위도" name="napoSeaPointLat" th:value="${crackdownStatus.napoSeaPointLat}" readonly>
-            <input class="form-control" placeholder="경도" name="napoSeaPointLon" th:value="${crackdownStatus.napoSeaPointLon}">
+            <input class=" form-control form-control-sm" placeholder="경도" name="napoSeaPointLon" th:value="${crackdownStatus.napoSeaPointLon}" readonly>
-            <input class="form-control" placeholder="상세내용" name="napoSeaPointDetail" th:value="${crackdownStatus.napoSeaPointDetail}">
+            <input class=" form-control form-control-sm" placeholder="상세내용" name="napoSeaPointDetail" th:value="${crackdownStatus.napoSeaPointDetail}" readonly>
           </div>
+        </div>
+        <div class="mb-3 row">
           <div class="col-sm-1">
-            <label class="col-form-label text-center">위반내용</label>
+            <label class="col-form-label col-form-label-sm text-center">위반내용</label>
-            <button type="button" class="btn btn-primary col-auto" id="violationAddBtn">+</button>
           </div>
-          <div class="col-sm-2" id="violationDiv">
+          <div class="col-auto" id="violationDiv">
             <th:block th:if="${#lists.isEmpty(crackdownStatus.violationList)}">
               <div class="row">
-                <select class="form-select form-select-sm violation" name="violation">
+                <select class="form-select form-select-sm violation" name="violation" disabled>
                   <option value="">선택</option>
                   <th:block th:each="commonCode:${session.commonCode.get('VT')}">
                     <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"></option>
@@ -78,7 +79,7 @@
               <th:block th:each="violation : ${crackdownStatus.violationList}">
                 <div class="row">
                   <input type="hidden" name="violationKey" th:value="${violation.violationKey}">
-                  <select class="form-select form-select-sm violation" name="violation">
+                  <select class="form-select form-select-sm violation" name="violation" disabled>
                     <option value="">선택</option>
                     <th:block th:each="commonCode:${session.commonCode.get('VT')}">
                       <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
@@ -88,16 +89,16 @@
                   </select>
                   <th:block th:if="${violation.violation ne null and !#strings.contains(violation.violation, 'VT')}">
                     <div class="col-auto">
-                      <input type="text" class="form-control" name="violationEtc" th:value="${violation.violation}">
+                      <input type="text" class=" form-control form-control-sm" name="violationEtc" th:value="${violation.violation}" readonly>
                     </div>
                   </th:block>
                 </div>
               </th:block>
             </th:block>
           </div>
-          <label class="col-sm-1 col-form-label text-center">침범유형</label>
+          <label 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" name="invasionType">
+            <select class="form-select form-select-sm" name="invasionType" disabled>
               <option value="">선택</option>
               <th:block th:each="commonCode:${session.commonCode.get('IST')}">
                 <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
@@ -110,42 +111,42 @@
           특수공무집행방해
         </div>
         <div class="mb-3 row">
-          <label class="col-sm-1 col-form-label text-center">발생건수</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">발생건수</label>
           <div class="col-sm-2">
-            <input type="number" min="0" class="form-control" name="obstrExspdCnt" th:value="${crackdownStatus.obstrExspdCnt}">
+            <input type="number" min="0" class=" form-control form-control-sm" name="obstrExspdCnt" th:value="${crackdownStatus.obstrExspdCnt}" readonly>
           </div>
-          <label class="col-sm-1 col-form-label text-center">피해인원</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">피해인원</label>
           <div class="col-sm-2">
-            <input type="number" min="0" class="form-control" name="personDamageCnt" th:value="${crackdownStatus.personDamageCnt}">
+            <input type="number" min="0" class=" form-control form-control-sm" name="personDamageCnt" th:value="${crackdownStatus.personDamageCnt}" readonly>
           </div>
-          <label class="col-sm-1 col-form-label text-center">피해액</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">피해액</label>
           <div class="col-sm-2">
-            <input type="number" min="0" class="form-control" name="personDamageAmount" th:value="${crackdownStatus.personDamageAmount}">
+            <input type="number" min="0" class=" form-control form-control-sm" name="personDamageAmount" th:value="${crackdownStatus.personDamageAmount}" readonly>
           </div>
-          <label class="col-sm-1 col-form-label text-center">상세내용</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">상세내용</label>
           <div class="col-sm-2">
-            <input class="form-control" name="personDamageDetail" th:value="${crackdownStatus.personDamageDetail}">
+            <input class=" form-control form-control-sm" name="personDamageDetail" th:value="${crackdownStatus.personDamageDetail}" readonly>
           </div>
-          <label class="col-sm-1 col-form-label text-center">발생건수</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">발생건수</label>
           <div class="col-sm-2">
-            <input type="number" min="0" class="form-control" name="materialDamageCnt" th:value="${crackdownStatus.materialDamageCnt}">
+            <input type="number" min="0" class=" form-control form-control-sm" name="materialDamageCnt" th:value="${crackdownStatus.materialDamageCnt}" readonly>
           </div>
-          <label class="col-sm-1 col-form-label text-center">피해액</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">피해액</label>
           <div class="col-sm-2">
-            <input type="number" min="0" class="form-control" name="materialDamageAmount" th:value="${crackdownStatus.materialDamageAmount}">
+            <input type="number" min="0" class=" form-control form-control-sm" name="materialDamageAmount" th:value="${crackdownStatus.materialDamageAmount}" readonly>
           </div>
-          <label class="col-sm-1 col-form-label text-center">상세내용</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">상세내용</label>
           <div class="col-sm-2">
-            <input class="form-control" name="materialDamageDetail" th:value="${crackdownStatus.materialDamageDetail}">
+            <input class=" form-control form-control-sm" name="materialDamageDetail" th:value="${crackdownStatus.materialDamageDetail}" readonly>
           </div>
         </div>
         <div class="mb-3 row">
           검거기관
         </div>
         <div class="mb-3 row">
-          <label class="col-sm-1 col-form-label text-center">사건담당 기관</label>
+          <label 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" name="caseAgency">
+            <select class="form-select form-select-sm" name="caseAgency" disabled>
               <option value="">선택</option>
               <th:block th:each="commonCode:${session.commonCode.get('ATA')}">
                 <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
@@ -153,9 +154,9 @@
               </th:block>
             </select>
           </div>
-          <label class="col-sm-1 col-form-label text-center">단속<br>경찰서</label>
+          <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">
+            <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}"
@@ -164,9 +165,9 @@
               <option value="etc">직접입력</option>
             </select>
           </div>
-          <label class="col-sm-1 col-form-label text-center">단속함정</label>
+          <label 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" name="crackdownBoat" id="crackdownBoat">
+            <select class="form-select form-select-sm" name="crackdownBoat" id="crackdownBoat" disabled>
               <option value="">선택</option>
               <th:block th:each="num : ${#numbers.sequence(1,#lists.size(session.commonCode.get('CPO')))}">
                 <th:block th:if="${'CPO'+num == crackdownStatus.crackdownPolice}" th:each="commonCode:${session.commonCode.get('CPO'+num)}">
@@ -175,26 +176,26 @@
               </th:block>
             </select>
           </div>
-          <label class="col-sm-1 col-form-label text-center">MMSI.NO</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">MMSI.NO</label>
           <div class="col-sm-2">
-            <input class="form-control" name="mmsi" th:value="${crackdownStatus.mmsi}">
+            <input class=" form-control form-control-sm" name="mmsi" th:value="${crackdownStatus.mmsi}" readonly>
           </div>
         </div>
         <div class="mb-3 row">
           선박제원
         </div>
         <div class="mb-3 row">
-          <label class="col-sm-1 col-form-label text-center">선명</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">선명</label>
           <div class="col-sm-2">
-            <input class="form-control" name="boatNameKr" th:value="${crackdownStatus.fishingBoat.boatNameKr}">
+            <input class=" form-control form-control-sm" name="boatNameKr" th:value="${crackdownStatus.fishingBoat.boatNameKr}" readonly>
           </div>
-          <label class="col-sm-1 col-form-label text-center">톤수</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">톤수</label>
           <div class="col-sm-2">
-            <input type="number" min="0" class="form-control" name="tonCnt" th:value="${crackdownStatus.fishingBoat.tonCnt}">
+            <input type="number" min="0" class=" form-control form-control-sm" name="tonCnt" th:value="${crackdownStatus.fishingBoat.tonCnt}" readonly>
           </div>
-          <label class="col-sm-1 col-form-label text-center">선질</label>
+          <label 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" name="boatMaterial" id="boatMaterial">
+            <select class="form-select form-select-sm" name="boatMaterial" id="boatMaterial" disabled>
               <option value="">선택</option>
               <th:block th:each="commonCode:${session.commonCode.get('BM')}">
                 <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
@@ -203,35 +204,35 @@
               <option value="etc">직접입력</option>
             </select>
           </div>
-          <label class="col-sm-1 col-form-label text-center">선적 성</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">선적 성</label>
           <div class="col-sm-2">
-            <input class="form-control" name="boatNnySung" th:value="${crackdownStatus.fishingBoat.boatNnySung}">
+            <input class=" form-control form-control-sm" name="boatNnySung" th:value="${crackdownStatus.fishingBoat.boatNnySung}" readonly>
           </div>
-          <label class="col-sm-1 col-form-label text-center">선적 시</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">선적 시</label>
           <div class="col-sm-2">
-            <input class="form-control" name="boatNnySi" th:value="${crackdownStatus.fishingBoat.boatNnySi}">
+            <input class=" form-control form-control-sm" name="boatNnySi" th:value="${crackdownStatus.fishingBoat.boatNnySi}" readonly>
           </div>
-          <label class="col-sm-1 col-form-label text-center">선장명</label>
+          <label 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:if="${#strings.contains(sailor.position, 'POS001')}">
-              <input th:if="${sailor.position eq 'POS001'}" class="form-control" name="sailorNameKr" th:value="${sailor.sailorNameKr}">
+              <input th:if="${sailor.position eq 'POS001'}" class=" form-control form-control-sm" name="sailorNameKr" th:value="${sailor.sailorNameKr}" readonly>
             </th:block>
             <th:block th:if="${#aggregates.sum(crackdownStatus.sailorList.?[position == 'POS001'].![1]) == null}">
-              <input class="form-control" name="sailorNameKr">
+              <input class=" form-control form-control-sm" name="sailorNameKr" readonly>
             </th:block>
           </div>
-          <label class="col-sm-1 col-form-label text-center">출생년도</label>
+          <label 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:if="${#strings.contains(sailor.position, 'POS001')}">
-                <input th:if="${sailor.position eq 'POS001'}" class="form-control" name="birthdate" id="birthdate" th:value="${#temporals.format(sailor.birthdate, 'yyyy-MM-dd')}">
+                <input th:if="${sailor.position eq 'POS001'}" class=" form-control form-control-sm" name="birthdate" id="birthdate" th:value="${#temporals.format(sailor.birthdate, 'yyyy-MM-dd')}" readonly>
             </th:block>
             <th:block th:if="${#aggregates.sum(crackdownStatus.sailorList.?[position == 'POS001'].![1]) == null}">
-              <input class="form-control" name="birthdate" id="birthdate">
+              <input class=" form-control form-control-sm" name="birthdate" id="birthdate" readonly>
             </th:block>
           </div>
-          <label class="col-sm-1 col-form-label text-center">선종</label>
+          <label 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" name="fisheryType" id="fisheryType">
+            <select class="form-select form-select-sm" name="fisheryType" id="fisheryType" disabled>
               <option value="">선택</option>
               <th:block th:each="commonCode:${session.commonCode.get('FT')}">
                 <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
@@ -241,7 +242,7 @@
             </select>
             <th:block th:if="${crackdownStatus.fishingBoat.fisheryType ne null && !#strings.contains(crackdownStatus.fishingBoat.fisheryType, 'FT')}">
               <div class="col-auto">
-                <input type="text" class="form-control" name="fisheryTypeEtc" th:value="${crackdownStatus.fishingBoat.fisheryType}">
+                <input type="text" class=" form-control form-control-sm" name="fisheryTypeEtc" th:value="${crackdownStatus.fishingBoat.fisheryType}" readonly>
               </div>
             </th:block>
           </div>
@@ -250,47 +251,47 @@
           어획물 축소기재
         </div>
         <div class="mb-3 row">
-          <label class="col-sm-1 col-form-label text-center">어종</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">어종</label>
           <div class="col-sm-2">
-            <input class="form-control" name="catchFishSpecies" th:value="${crackdownStatus.fishingBoat.catchFishSpecies}">
+            <input class=" form-control form-control-sm" name="catchFishSpecies" th:value="${crackdownStatus.fishingBoat.catchFishSpecies}" readonly>
           </div>
-          <label class="col-sm-1 col-form-label text-center">수량</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">수량</label>
           <div class="col-sm-2">
-            <input type="number" min="0" class="form-control" name="catchCnt" th:value="${crackdownStatus.fishingBoat.catchCnt}">
+            <input type="number" min="0" class=" form-control form-control-sm" name="catchCnt" th:value="${crackdownStatus.fishingBoat.catchCnt}" readonly>
           </div>
         </div>
         <div class="mb-3 row">
           범칙물
         </div>
         <div class="mb-3 row">
-          <label class="col-sm-1 col-form-label text-center">어종</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">어종</label>
           <div class="col-sm-2">
-            <input class="form-control" name="offenseFishSpecies" th:value="${crackdownStatus.fishingBoat.offenseFishSpecies}">
+            <input class=" form-control form-control-sm" name="offenseFishSpecies" th:value="${crackdownStatus.fishingBoat.offenseFishSpecies}" readonly>
           </div>
-          <label class="col-sm-1 col-form-label text-center">어획량</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">어획량</label>
           <div class="col-sm-2">
-            <input type="number" min="0" class="form-control" name="offenseCatchCnt" th:value="${crackdownStatus.fishingBoat.offenseCatchCnt}">
+            <input type="number" min="0" class=" form-control form-control-sm" name="offenseCatchCnt" th:value="${crackdownStatus.fishingBoat.offenseCatchCnt}" readonly>
           </div>
-          <label class="col-sm-1 col-form-label text-center">폐기량</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">폐기량</label>
           <div class="col-sm-2">
-            <input type="number" min="0" class="form-control" name="offenseIllegalWasteQuantity" th:value="${crackdownStatus.fishingBoat.offenseIllegalWasteQuantity}">
+            <input type="number" min="0" class=" form-control form-control-sm" name="offenseIllegalWasteQuantity" th:value="${crackdownStatus.fishingBoat.offenseIllegalWasteQuantity}" readonly>
           </div>
-          <label class="col-sm-1 col-form-label text-center">위판량</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">위판량</label>
           <div class="col-sm-2">
-            <input type="number" min="0" class="form-control" name="offenseQuantity" th:value="${crackdownStatus.fishingBoat.offenseQuantity}">
+            <input type="number" min="0" class=" form-control form-control-sm" name="offenseQuantity" th:value="${crackdownStatus.fishingBoat.offenseQuantity}" readonly>
           </div>
-          <label class="col-sm-1 col-form-label text-center">위판금액</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">위판금액</label>
           <div class="col-sm-2">
-            <input type="number" min="0" class="form-control" name="offenseAmount" th:value="${crackdownStatus.fishingBoat.offenseAmount}">
+            <input type="number" min="0" class=" form-control form-control-sm" name="offenseAmount" th:value="${crackdownStatus.fishingBoat.offenseAmount}" readonly>
           </div>
         </div>
         <div class="mb-3 row">
           처리결과
         </div>
         <div class="mb-3 row">
-          <label class="col-sm-1 col-form-label text-center">처리현황</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">처리현황</label>
-          <div class="col-sm-2">
+          <div class="col-auto">
-            <select class="form-select form-select-sm" name="processStatus" id="processStatus">
+            <select class="form-select form-select-sm" name="processStatus" id="processStatus" disabled>
               <option value="">선택</option>
               <th:block th:each="commonCode:${session.commonCode.get('PR')}">
                 <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
@@ -300,7 +301,7 @@
             </select>
             <th:block th:if="${crackdownStatus.processResult.processStatus ne null && !#strings.contains(crackdownStatus.processResult.processStatus, 'PR')}">
               <div class="col-auto">
-                <input type="text" class="form-control" name="processStatusEtc" th:value="${crackdownStatus.processResult.processStatus}">
+                <input type="text" class=" form-control form-control-sm" name="processStatusEtc" th:value="${crackdownStatus.processResult.processStatus}" readonly>
               </div>
             </th:block>
           </div>
@@ -309,55 +310,55 @@
           담보금 납부
         </div>
         <div class="mb-3 row">
-          <label class="col-sm-1 col-form-label text-center">납부액</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">납부액</label>
           <div class="col-sm-2">
-            <input type="number" min="0" class="form-control" name="damboPayment" th:value="${crackdownStatus.fishingBoat.damboPayment}">
+            <input type="number" min="0" class=" form-control form-control-sm" name="damboPayment" th:value="${crackdownStatus.fishingBoat.damboPayment}" readonly>
           </div>
-          <label class="col-sm-1 col-form-label text-center">납부일시</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">납부일시</label>
           <div class="col-sm-2">
-            <input class="form-control" name="paymentPaymentDt" id="paymentPaymentDt" th:value="${#temporals.format(crackdownStatus.fishingBoat.paymentPaymentDt, 'yyyy-MM-dd HH:mm')}">
+            <input class=" form-control form-control-sm" name="paymentPaymentDt" id="paymentPaymentDt" th:value="${#temporals.format(crackdownStatus.fishingBoat.paymentPaymentDt, 'yyyy-MM-dd HH:mm')}" readonly>
           </div>
         </div>
         <div class="mb-3 row">
           담보금 미납
         </div>
         <div class="mb-3 row">
-          <label class="col-sm-1 col-form-label text-center">미납액</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">미납액</label>
           <div class="col-sm-2">
-            <input type="number" min="0" class="form-control" name="damboUnpaidAmount" th:value="${crackdownStatus.fishingBoat.damboUnpaidAmount}">
+            <input type="number" min="0" class=" form-control form-control-sm" name="damboUnpaidAmount" th:value="${crackdownStatus.fishingBoat.damboUnpaidAmount}" readonly>
           </div>
         </div>
         <div class="mb-3 row">
           선박처리
         </div>
         <div class="mb-3 row">
-          <label class="col-sm-1 col-form-label text-center">위탁시작일</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">위탁시작일</label>
           <div class="col-sm-2">
-            <input class="form-control" name="consignmentStartDt" id="consignmentStartDt" th:value="${#temporals.format(crackdownStatus.processResult.consignmentStartDt, 'yyyy-MM-dd')}">
+            <input class=" form-control form-control-sm" name="consignmentStartDt" id="consignmentStartDt" th:value="${#temporals.format(crackdownStatus.processResult.consignmentStartDt, 'yyyy-MM-dd')}" readonly>
           </div>
-          <label class="col-sm-1 col-form-label text-center">위탁종료일</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">위탁종료일</label>
           <div class="col-sm-2">
-            <input class="form-control" name="consignmentEndDt" id="consignmentEndDt" th:value="${#temporals.format(crackdownStatus.processResult.consignmentEndDt, 'yyyy-MM-dd')}">
+            <input class=" form-control form-control-sm" name="consignmentEndDt" id="consignmentEndDt" th:value="${#temporals.format(crackdownStatus.processResult.consignmentEndDt, 'yyyy-MM-dd')}" readonly>
           </div>
-          <label class="col-sm-1 col-form-label text-center">퇴거일</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">퇴거일</label>
           <div class="col-sm-2">
-            <input class="form-control" name="evictionDt" id="evictionDt" th:value="${#temporals.format(crackdownStatus.processResult.evictionDt, 'yyyy-MM-dd')}">
+            <input class=" form-control form-control-sm" name="evictionDt" id="evictionDt" th:value="${#temporals.format(crackdownStatus.processResult.evictionDt, 'yyyy-MM-dd')}" readonly>
           </div>
-          <label class="col-sm-1 col-form-label text-center">환부일</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">환부일</label>
           <div class="col-sm-2">
-            <input class="form-control" name="returnDt" id="returnDt" th:value="${#temporals.format(crackdownStatus.processResult.returnDt, 'yyyy-MM-dd')}">
+            <input class=" form-control form-control-sm" name="returnDt" id="returnDt" th:value="${#temporals.format(crackdownStatus.processResult.returnDt, 'yyyy-MM-dd')}" readonly>
           </div>
-          <label class="col-sm-1 col-form-label text-center">몰수확정일</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">몰수확정일</label>
           <div class="col-sm-2">
-            <input class="form-control" name="confiscationDt" id="confiscationDt" th:value="${#temporals.format(crackdownStatus.processResult.confiscationDt, 'yyyy-MM-dd')}">
+            <input class=" form-control form-control-sm" name="confiscationDt" id="confiscationDt" th:value="${#temporals.format(crackdownStatus.processResult.confiscationDt, 'yyyy-MM-dd')}" readonly>
           </div>
-          <label class="col-sm-1 col-form-label text-center">폐선일</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">폐선일</label>
           <div class="col-sm-2">
-            <input class="form-control" name="boatDisposalDt" id="boatDisposalDt" th:value="${#temporals.format(crackdownStatus.processResult.boatDisposalDt, 'yyyy-MM-dd')}">
+            <input class=" form-control form-control-sm" name="boatDisposalDt" id="boatDisposalDt" th:value="${#temporals.format(crackdownStatus.processResult.boatDisposalDt, 'yyyy-MM-dd')}" readonly>
           </div>
-          <label class="col-sm-1 col-form-label text-center">폐선종류</label>
+          <label 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" name="boatDisposalType" th:value="${crackdownStatus.processResult.boatDisposalType}">
+            <select class="form-select form-select-sm" name="boatDisposalType" th:value="${crackdownStatus.processResult.boatDisposalType}" disabled>
               <option value="">선택</option>
               <th:block th:each="commonCode:${session.commonCode.get('BDT')}">
                 <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
@@ -370,71 +371,69 @@
           직접인계
         </div>
         <div class="mb-3 row">
-          <label class="col-sm-1 col-form-label text-center">직접인계일</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">직접인계일</label>
           <div class="col-sm-2">
-            <input class="form-control" name="directHandoverDt" id="directHandoverDt" th:value="${#temporals.format(crackdownStatus.processResult.directHandoverDt, 'yyyy-MM-dd')}">
+            <input class=" form-control form-control-sm" name="directHandoverDt" id="directHandoverDt" th:value="${#temporals.format(crackdownStatus.processResult.directHandoverDt, 'yyyy-MM-dd')}" readonly>
           </div>
-          <label class="col-sm-1 col-form-label text-center">해점</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">해점</label>
           <div class="col-sm-2">
-            <input class="form-control" placeholder="위도" name="handoverSeaPointLat" th:value="${crackdownStatus.processResult.handoverSeaPointLat}">
+            <input class=" form-control form-control-sm" placeholder="위도" name="handoverSeaPointLat" th:value="${crackdownStatus.processResult.handoverSeaPointLat}" readonly>
-            <input class="form-control" placeholder="경도" name="handoverSeaPointLon" th:value="${crackdownStatus.processResult.handoverSeaPointLon}">
+            <input class=" form-control form-control-sm" placeholder="경도" name="handoverSeaPointLon" th:value="${crackdownStatus.processResult.handoverSeaPointLon}" readonly>
-            <input class="form-control" placeholder="상세내용" name="handoverSeaPointDetail" th:value="${crackdownStatus.processResult.handoverSeaPointDetail}">
+            <input class=" form-control form-control-sm" placeholder="상세내용" name="handoverSeaPointDetail" th:value="${crackdownStatus.processResult.handoverSeaPointDetail}" readonly>
           </div>
-          <label class="col-sm-1 col-form-label text-center">인계함정</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">인계함정</label>
           <div class="col-sm-2">
-            <input class="form-control" name="handoverBoat" th:value="${crackdownStatus.processResult.handoverBoat}">
+            <input class=" form-control form-control-sm" name="handoverBoat" th:value="${crackdownStatus.processResult.handoverBoat}" readonly>
           </div>
-          <label class="col-sm-1 col-form-label text-center">중측</br>인수함정</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">중측</br>인수함정</label>
           <div class="col-sm-2">
-            <input class="form-control" name="middleTakeoverBoat" th:value="${crackdownStatus.processResult.middleTakeoverBoat}">
+            <input class=" form-control form-control-sm" name="middleTakeoverBoat" th:value="${crackdownStatus.processResult.middleTakeoverBoat}" readonly>
           </div>
         </div>
         <div class="mb-3 row">
           구속/ 불구속
         </div>
         <div class="mb-3 row">
-          <label class="col-sm-1 col-form-label text-center">선장</label>
+          <label 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" name="captin">
+            <select class="form-select form-select-sm" name="captin" disabled>
               <option value="">선택</option>
               <option value="Y" th:selected="${#aggregates.sum(crackdownStatus.sailorList.?[position == 'POS001' && isRestriction == 'Y'].![1]) != null}">구속</option>
               <option value="N" th:selected="${#aggregates.sum(crackdownStatus.sailorList.?[position == 'POS001' && isRestriction == 'N'].![1]) != null}">불구속</option>
             </select>
           </div>
-          <label class="col-sm-1 col-form-label text-center">항해장</label>
+          <label 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" name="mate">
+            <select class="form-select form-select-sm" name="mate" disabled>
               <option value="">선택</option>
               <option value="Y" th:selected="${#aggregates.sum(crackdownStatus.sailorList.?[position == 'POS002' && isRestriction == 'Y'].![1]) != null}">구속</option>
               <option value="N" th:selected="${#aggregates.sum(crackdownStatus.sailorList.?[position == 'POS002' && isRestriction == 'N'].![1]) != null}">불구속</option>
             </select>
           </div>
-          <label class="col-sm-1 col-form-label text-center">기관장</label>
+          <label 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" name="warden">
+            <select class="form-select form-select-sm" name="warden" disabled>
               <option value="">선택</option>
               <option value="Y" th:selected="${#aggregates.sum(crackdownStatus.sailorList.?[position == 'POS003' && isRestriction == 'Y'].![1]) != null}">구속</option>
               <option value="N" th:selected="${#aggregates.sum(crackdownStatus.sailorList.?[position == 'POS003' && isRestriction == 'N'].![1]) != null}">불구속</option>
             </select>
           </div>
-          <button type="button" class="btn btn-primary col-auto" id="sailorAddBtn">선원 추가</button>
         </div>
         <div class="mb-3 row" id="sailorDiv">
           <th:block th:each="sailor:${crackdownStatus.sailorList}" th:if="${#strings.contains(sailor.position, 'POS005') || #strings.contains(sailor.position, 'POS006')}">
             <div class="row">
               <input type="hidden" name="sailorKey" th:value="${sailor.sailorKey}">
-              <label class="col-sm-1 col-form-label text-center">선원 이름</label>
+              <label class="col-sm-1 col-form-label col-form-label-sm text-center">선원 이름</label>
               <div class="col-sm-2">
-                <input class="form-control" name="sailorNameKr" th:value="${sailor.sailorNameKr}">
+                <input class=" form-control form-control-sm" name="sailorNameKr" th:value="${sailor.sailorNameKr}" readonly>
               </div>
               <div class="col-sm-2">
-                <select class="form-select form-select-sm sailor-list" name="sailor">
+                <select class="form-select form-select-sm sailor-list" name="sailor" disabled>
                   <option value="">선택</option>
                   <option value="Y" th:selected="${sailor.isRestriction == 'Y'}">구속</option>
                   <option value="N" th:selected="${sailor.isRestriction == 'N'}">불구속</option>
                 </select>
               </div>
-              <button type="button" class="btn btn-primary col-auto" id="sailorRemoveBtn">-</button>
             </div>
           </th:block>
         </div>
@@ -442,63 +441,63 @@
           현장조사
         </div>
         <div class="mb-3 row">
-          <label class="col-sm-1 col-form-label text-center">나포일시</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">나포일시</label>
           <div class="col-sm-2">
-            <input class="form-control" name="fieldIvsgtNapoDt" id="fieldIvsgtNapoDt" th:value="${#temporals.format(crackdownStatus.fieldIvsgtNapoDt, 'yyyy-MM-dd HH:mm')}">
+            <input class=" form-control form-control-sm" name="fieldIvsgtNapoDt" id="fieldIvsgtNapoDt" th:value="${#temporals.format(crackdownStatus.fieldIvsgtNapoDt, 'yyyy-MM-dd HH:mm')}" readonly>
           </div>
-          <label class="col-sm-1 col-form-label text-center">석방일시</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">석방일시</label>
           <div class="col-sm-2">
-            <input class="form-control" name="fieldIvsgtReleaseDt" id="fieldIvsgtReleaseDt" th:value="${#temporals.format(crackdownStatus.fieldIvsgtReleaseDt, 'yyyy-MM-dd HH:mm')}">
+            <input class=" form-control form-control-sm" name="fieldIvsgtReleaseDt" id="fieldIvsgtReleaseDt" th:value="${#temporals.format(crackdownStatus.fieldIvsgtReleaseDt, 'yyyy-MM-dd HH:mm')}" readonly>
           </div>
-          <label class="col-sm-1 col-form-label text-center">소요시간</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">소요시간</label>
           <div class="col-sm-2">
-            <input class="form-control" name="fieldIvsgtTimeTaken" th:value="${crackdownStatus.fieldIvsgtTimeTaken}" readonly>
+            <input class=" form-control form-control-sm" name="fieldIvsgtTimeTaken" th:value="${crackdownStatus.fieldIvsgtTimeTaken}" readonly>
           </div>
         </div>
         <div class="mb-3 row">
           압송
         </div>
         <div class="mb-3 row">
-          <label class="col-sm-1 col-form-label text-center">압송시작</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">압송시작</label>
           <div class="col-sm-2">
-            <input class="form-control" name="pressurizedStartDt" id="pressurizedStartDt" th:value="${#temporals.format(crackdownStatus.pressurizedStartDt, 'yyyy-MM-dd HH:mm')}">
+            <input class=" form-control form-control-sm" name="pressurizedStartDt" id="pressurizedStartDt" th:value="${#temporals.format(crackdownStatus.pressurizedStartDt, 'yyyy-MM-dd HH:mm')}" readonly>
           </div>
-          <label class="col-sm-1 col-form-label text-center">압송종료</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">압송종료</label>
           <div class="col-sm-2">
-            <input class="form-control" name="pressurizedEndDt" id="pressurizedEndDt" th:value="${#temporals.format(crackdownStatus.pressurizedEndDt, 'yyyy-MM-dd HH:mm')}">
+            <input class=" form-control form-control-sm" name="pressurizedEndDt" id="pressurizedEndDt" th:value="${#temporals.format(crackdownStatus.pressurizedEndDt, 'yyyy-MM-dd HH:mm')}" readonly>
           </div>
-          <label class="col-sm-1 col-form-label text-center">영장청구<br>소요시간</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">영장청구<br>소요시간</label>
           <div class="col-sm-2">
-            <input class="form-control" name="warrantReqTakeTime" th:value="${crackdownStatus.processResult.warrantReqTakeTime}" readonly>
+            <input class=" form-control form-control-sm" name="warrantReqTakeTime" th:value="${crackdownStatus.processResult.warrantReqTakeTime}" readonly>
           </div>
-          <label class="col-sm-1 col-form-label text-center">거리</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">거리</label>
           <div class="col-sm-2">
-            <input class="form-control" name="distance" th:value="${crackdownStatus.distance}">
+            <input class=" form-control form-control-sm" name="distance" th:value="${crackdownStatus.distance}" readonly>
           </div>
         </div>
         <div class="mb-3 row">
           압수어구
         </div>
         <div class="mb-3 row">
-          <label class="col-sm-1 col-form-label text-center">틀</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">틀</label>
           <div class="col-sm-2">
-            <input class="form-control" name="confiscationFrame" th:value="${crackdownStatus.fishingBoat.confiscationFrame}">
+            <input class=" form-control form-control-sm" name="confiscationFrame" th:value="${crackdownStatus.fishingBoat.confiscationFrame}" readonly>
           </div>
-          <label class="col-sm-1 col-form-label text-center">폭</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">폭</label>
           <div class="col-sm-2">
-            <input class="form-control" name="confiscationWidth" th:value="${crackdownStatus.fishingBoat.confiscationWidth}">
+            <input class=" form-control form-control-sm" name="confiscationWidth" th:value="${crackdownStatus.fishingBoat.confiscationWidth}" readonly>
           </div>
-          <label class="col-sm-1 col-form-label text-center">조</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">조</label>
           <div class="col-sm-2">
-            <input class="form-control" name="confiscationJo" th:value="${crackdownStatus.fishingBoat.confiscationJo}">
+            <input class="form-control form-control-sm" name="confiscationJo" th:value="${crackdownStatus.fishingBoat.confiscationJo}" readonly>
           </div>
-          <label class="col-sm-1 col-form-label text-center">개</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">개</label>
           <div class="col-sm-2">
-            <input class="form-control" name="confiscationGae" th:value="${crackdownStatus.fishingBoat.confiscationGae}">
+            <input class="form-control form-control-sm" name="confiscationGae" th:value="${crackdownStatus.fishingBoat.confiscationGae}" readonly>
           </div>
-          <label class="col-sm-1 col-form-label text-center">기타</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">기타</label>
           <div class="col-sm-2">
-            <input class="form-control" name="confiscationEtc" th:value="${crackdownStatus.fishingBoat.confiscationEtc}">
+            <input class="form-control form-control-sm" name="confiscationEtc" th:value="${crackdownStatus.fishingBoat.confiscationEtc}" readonly>
           </div>
         </div>
       </form>

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

@@ -72,30 +72,30 @@
                                         </select>
                                     </div>
                                     <div class="col-auto">
-                                        <input class="form-control form-control-sm" name="returnDt" id="returnDt" placeholder="환부일" th:value="${#temporals.format(searchParams.returnDt, 'yyyy-MM-dd')}">
+                                        <input class="form-control form-control-sm" name="returnDt" id="returnDate" placeholder="환부일" th:value="${#temporals.format(searchParams.returnDt, 'yyyy-MM-dd')}">
                                     </div>
                                     <div class="col-auto">
-                                        <input class="form-control form-control-sm" name="consignmentStartDt" id="consignmentStartDt" placeholder="위탁시작일" th:value="${#temporals.format(searchParams.consignmentStartDt, 'yyyy-MM-dd')}">
+                                        <input class="form-control form-control-sm" name="consignmentStartDt" id="consignmentStartDate" placeholder="위탁시작일" th:value="${#temporals.format(searchParams.consignmentStartDt, 'yyyy-MM-dd')}">
                                     </div>
                                     <div class="col-auto">
-                                        <input class="form-control form-control-sm" name="consignmentEndDt" id="consignmentEndDt" placeholder="위탁종료일" th:value="${#temporals.format(searchParams.consignmentEndDt, 'yyyy-MM-dd')}">
+                                        <input class="form-control form-control-sm" name="consignmentEndDt" id="consignmentEndDate" placeholder="위탁종료일" th:value="${#temporals.format(searchParams.consignmentEndDt, 'yyyy-MM-dd')}">
                                     </div>
                                     <div class="col-auto">
-                                        <input class="form-control form-control-sm" name="confiscationDt" id="confiscationDt" placeholder="몰수확정일" th:value="${#temporals.format(searchParams.confiscationDt, 'yyyy-MM-dd')}">
+                                        <input class="form-control form-control-sm" name="confiscationDt" id="confiscationDate" placeholder="몰수확정일" th:value="${#temporals.format(searchParams.confiscationDt, 'yyyy-MM-dd')}">
                                     </div>
                                     <div class="col-auto">
-                                        <input class="form-control form-control-sm" name="boatDisposalDt" id="boatDisposalDt" placeholder="폐선일" th:value="${#temporals.format(searchParams.boatDisposalDt, 'yyyy-MM-dd')}">
+                                        <input class="form-control form-control-sm" name="boatDisposalDt" id="boatDisposalDate" placeholder="폐선일" th:value="${#temporals.format(searchParams.boatDisposalDt, 'yyyy-MM-dd')}">
                                     </div>
                                 </div>
-                                <div class="col-auto">
+                            </div>
-                                    <input type="submit" class="btn btn-sm btn-primary col-auto" id="searchBtn" value="검색">
+                            <div class="col-auto">
-                                </div>
+                                <input type="submit" class="btn btn-sm btn-primary col-auto" id="searchBtn" value="검색">
                             </div>
                         </div>
                     </form>
                     <div class="row justify-content-start" style="overflow: hidden; overflow-x: scroll">
-                        <table class="table table-striped" style="max-width: none; width: auto;" id="prTable">
+                        <table class="table table-hover table-bordered ws-nowrap" style="max-width: none; width: auto;" id="prTable">
-                            <thead>
+                            <thead class="align-middle text-center">
                             <tr>
                                 <th>연번</th>
                                 <th>사건번호</th>
@@ -113,7 +113,7 @@
                                 <th>최종수정일</th>
                             </tr>
                             </thead>
-                            <tbody>
+                            <tbody class="table-group-divider align-middle text-center">
                                 <th:block th:each="processResult:${processResultList}">
                                     <tr class="tr" th:data-key="${processResult.prKey}">
                                         <td th:text="${processResult.prKey}"></td>
@@ -126,16 +126,20 @@
                                         </th:block>
                                         <td th:text="${processResult.boatNameKr}"></td>
                                         <td>
-                                            <span th:text="${processResult.crackdownStatus.napoSeaPointLon}"> ~ </span>
+                                            <span th:text="${processResult.crackdownStatus.napoSeaPointLon}"></span>
+                                            <span th:if="${processResult.crackdownStatus.napoSeaPointLon ne null && processResult.crackdownStatus.napoSeaPointLon ne ''}" th:text="${' ~ '}"></span>
                                             <span th:text="${processResult.crackdownStatus.napoSeaPointLat}"></span>
                                             <div th:text="${processResult.crackdownStatus.napoSeaPointDetail}"></div>
                                             <th:block th:if="${#lists.size(processResult.violationList) >= 1}">
                                                 <div>
-                                                <th:block th:each="violation:${processResult.violationList}">
+                                                <th:block th:each="violation, i:${processResult.violationList}">
                                                     <th:block th:each="commonCode:${session.commonCode.get('VT')}">
                                                         <span th:if="${violation.violation eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></span>
                                                     </th:block>
                                                     <span th:if="${violation.violation ne null && !#strings.contains(violation.violation, 'VT')}" th:text="${violation.violation}"></span>
+                                                    <th:block th:if="${#lists.size(processResult.violationList) >= 1 && i.index < #lists.size(processResult.violationList)-1}">
+                                                        <span>, </span>
+                                                    </th:block>
                                                 </th:block>
                                                 </div>
                                             </th:block>
@@ -156,14 +160,13 @@
                                         <td th:text="${processResult.consignmentEndDt}"></td>
                                         <td th:text="${processResult.confiscationDt}"></td>
                                         <td th:text="${processResult.boatDisposalDt}"></td>
-                                        <td th:text="${processResult.wrtDt}"></td>
+                                        <td th:text="${#temporals.format(processResult.updDt, 'yyyy-MM-dd HH:mm')}"></td>
                                     </tr>
                                 </th:block>
                             </tbody>
                         </table>
                     </div>
                     <div class="row justify-content">
-                        <button class="btn btn-sm btn-primary col-auto" id="">관리자마감</button>
                         <button class="btn btn-sm btn-primary col-auto" id="processResultDownExcel">엑셀 다운로드</button>
                         <button class="btn btn-sm btn-primary col-auto" id="processResultAddBtn">등록</button>
                     </div>

src/main/resources/templates/faStatistics/processResult/processResultAddModal.html

@@ -13,11 +13,13 @@
     <input type="hidden" name="fbKey">
     <input type="hidden" name="prKey">
     <input type="hidden" name="wrtOrgan" th:value="${processResult.wrtOrgan}">
+    <input type="hidden" name="wrtPart" th:value="${processResult.wrtPart}">
+    <input type="hidden" name="wrtUserGrd" th:value="${processResult.wrtUserGrd}">
     <input type="hidden" name="wrtUserNm" th:value="${processResult.wrtUserNm}">
     <input type="hidden" name="wrtDt" th:value="${#temporals.format(processResult.wrtDt, 'yyyy-MM-dd HH:mm')}">
     <input type="hidden" id="saveYn" name="saveYn">
     <div class="mb-3 row">
-      <label class="col-sm-1 col-form-label text-center">사건번호</label>
+      <label 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" name="caseNum" id="caseNum">
           <option value="">선택</option>
@@ -26,21 +28,21 @@
           </th:block>
         </select>
       </div>
-      <label class="col-sm-1 col-form-label text-center">피의자(선박명)</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">피의자<br>(선박명)</label>
       <div class="col-sm-2">
-        <input class="form-control" name="boatNameKr" id="boatNameKr" readonly>
+        <input class="form-control form-control-sm" name="boatNameKr" id="boatNameKr" readonly>
       </div>
     </div>
     <div class="mb-3 row">
-      <label class="col-sm-1 col-form-label text-center">선고법원</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">선고법원</label>
       <div class="col-sm-2">
-        <input class="form-control" name="sentencingCourt" id="sentencingCourt">
+        <input class="form-control form-control-sm" name="sentencingCourt" id="sentencingCourt">
       </div>
-      <label class="col-sm-1 col-form-label text-center">선고내용</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">선고내용</label>
       <div class="col-sm-2">
-        <input class="form-control" name="sentencingDetail" id="sentencingDetail">
+        <input class="form-control form-control-sm" name="sentencingDetail" id="sentencingDetail">
       </div>
-      <label class="col-sm-1 col-form-label text-center">집행내용</label>
+      <label 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" name="executionDetail" id="executionDetail">
           <option value="">선택</option>
@@ -53,39 +55,35 @@
       </div>
     </div>
     <div class="mb-3 row">
-      <label class="col-sm-1 col-form-label text-center">환부일</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">환부일</label>
       <div class="col-sm-2">
-        <input class="form-control" name="returnDt" id="returnDt">
+        <input class="form-control form-control-sm" name="returnDt" id="returnDt">
       </div>
-      <label class="col-sm-1 col-form-label text-center">위탁시작일</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">위탁시작일</label>
       <div class="col-sm-2">
-        <input class="form-control" name="consignmentStartDt" id="consignmentStartDt">
+        <input class="form-control form-control-sm" name="consignmentStartDt" id="consignmentStartDt">
       </div>
-      <label class="col-sm-1 col-form-label text-center">위탁종료일</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">위탁종료일</label>
       <div class="col-sm-2">
-        <input class="form-control" name="consignmentEndDt" id="consignmentEndDt">
+        <input class="form-control form-control-sm" name="consignmentEndDt" id="consignmentEndDt">
-        <input type="hidden" class="form-control" name="warrantReqTakeTime">
+        <input type="hidden" class="form-control form-control-sm" name="warrantReqTakeTime">
       </div>
     </div>
     <div class="mb-3 row">
-      <label class="col-sm-1 col-form-label text-center">몰수확정일</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">몰수확정일</label>
       <div class="col-sm-2">
-        <input class="form-control" name="confiscationDt" id="confiscationDt">
+        <input class="form-control form-control-sm" name="confiscationDt" id="confiscationDt">
       </div>
-      <label class="col-sm-1 col-form-label text-center">폐선일</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">폐선일</label>
       <div class="col-sm-2">
-        <input class="form-control" name="boatDisposalDt" id="boatDisposalDt">
+        <input class="form-control form-control-sm" name="boatDisposalDt" id="boatDisposalDt">
-      </div>
-      <label class="col-sm-1 col-form-label text-center">최종수정일</label>
-      <div class="col-sm-2">
-        <input class="form-control" name="boatDisposalDt" id="boatDisposalDt">
       </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-warning" id="saveTempBtn">임시저장</button>-->
   <button type="button" class="btn btn-primary" id="saveProcessResultBtn">저장</button>
 </div>
 </html>

src/main/resources/templates/faStatistics/processResult/processResultEditModal.html

@@ -13,15 +13,17 @@
     <input type="hidden" name="fbKey" th:value="${processResult.fbKey}">
     <input type="hidden" name="prKey" th:value="${processResult.prKey}">
     <input type="hidden" name="wrtOrgan" th:value="${processResult.wrtOrgan}">
+    <input type="hidden" name="wrtPart" th:value="${processResult.wrtPart}">
+    <input type="hidden" name="wrtUserGrd" th:value="${processResult.wrtUserGrd}">
     <input type="hidden" name="wrtUserNm" th:value="${processResult.wrtUserNm}">
     <input type="hidden" name="wrtDt" th:value="${#temporals.format(processResult.wrtDt, 'yyyy-MM-dd HH:mm')}">
     <input type="hidden" id="saveYn" name="saveYn">
     <div class="mb-3 row">
-      <label class="col-sm-1 col-form-label text-center">사건번호</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">사건번호</label>
       <div class="col-sm-2">
-        <input class="form-control" name="caseNum" id="caseNum" th:value="${processResult.crackdownStatus.caseNum}">
+        <input class="form-control form-control-sm" name="caseNum" id="caseNum" th:value="${processResult.crackdownStatus.caseNum}">
       </div>
-      <label class="col-sm-1 col-form-label text-center">사건담당경찰서</label>
+      <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">
           <option value="">선택</option>
@@ -34,24 +36,26 @@
       </div>
     </div>
     <div class="mb-3 row">
-      <label class="col-sm-1 col-form-label text-center">피의자(선박명)</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">피의자<br>(선박명)</label>
       <div class="col-sm-2">
-        <input class="form-control" name="boatNameKr" id="boatNameKr" th:value="${processResult.boatNameKr}">
+        <input class="form-control form-control-sm" name="boatNameKr" id="boatNameKr" th:value="${processResult.boatNameKr}">
       </div>
-      <label class="col-sm-1 col-form-label text-center">위반장소</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">위반장소</label>
-      <div class="col-sm-2">
+      <div class="col-sm-6">
-        <input class="form-control" name="napoSeaPointLon" id="napoSeaPointLon" th:value="${processResult.crackdownStatus.napoSeaPointLon}">
+        <input class="form-control form-control-sm" name="napoSeaPointLon" id="napoSeaPointLon" th:value="${processResult.crackdownStatus.napoSeaPointLon}">
-        <input class="form-control" name="napoSeaPointLat" id="napoSeaPointLat" th:value="${processResult.crackdownStatus.napoSeaPointLat}">
+        <input class="form-control form-control-sm" name="napoSeaPointLat" id="napoSeaPointLat" th:value="${processResult.crackdownStatus.napoSeaPointLat}">
-        <input class="form-control" name="napoSeaPointDetail" id="napoSeaPointDetail" th:value="${processResult.crackdownStatus.napoSeaPointDetail}">
+        <input class="form-control form-control-sm" name="napoSeaPointDetail" id="napoSeaPointDetail" th:value="${processResult.crackdownStatus.napoSeaPointDetail}">
       </div>
+    </div>
+    <div class="mb-3 row">
       <div class="col-sm-1">
-        <label class="col-form-label text-center">위반내용</label>
+        <label class="col-form-label col-form-label-sm text-center">위반내용</label>
         <button type="button" class="btn btn-primary col-auto" id="violationAddBtn">+</button>
       </div>
-      <div class="col-sm-2" id="violationDiv">
+      <div class="col-auto" id="violationDiv">
         <th:block th:if="${#lists.isEmpty(processResult.violationList)}">
           <div class="row">
-            <select class="form-select form-select-sm violation" name="violation">
+            <select class="form-select form-select-sm violation" name="violation" style="max-width: 90% !important;">
               <option value="">선택</option>
               <th:block th:each="commonCode:${session.commonCode.get('VT')}">
                 <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"></option>
@@ -64,7 +68,7 @@
           <th:block th:each="violation, i : ${processResult.violationList}">
             <div class="row">
               <input type="hidden" name="violationKey" th:value="${violation.violationKey}">
-              <select class="form-select form-select-sm violation" name="violation">
+              <select class="form-select form-select-sm violation" name="violation" style="max-width: 90% !important;">
                 <option value="">선택</option>
                 <th:block th:each="commonCode:${session.commonCode.get('VT')}">
                   <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
@@ -74,7 +78,7 @@
               </select>
               <th:block th:if="${violation.violation ne null and !#strings.contains(violation.violation, 'VT')}">
                 <div class="col-auto">
-                  <input type="text" class="form-control" name="violationEtc" th:value="${violation.violation}">
+                  <input type="text" class="form-control form-control-sm" name="violationEtc" th:value="${violation.violation}">
                 </div>
               </th:block>
               <th:block th:if="${i.index > 0}">
@@ -87,15 +91,15 @@
       </div>
     </div>
     <div class="mb-3 row">
-      <label class="col-sm-1 col-form-label text-center">선고법원</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">선고법원</label>
       <div class="col-sm-2">
-        <input class="form-control" name="sentencingCourt" id="sentencingCourt" th:value="${processResult.sentencingCourt}">
+        <input class="form-control form-control-sm" name="sentencingCourt" id="sentencingCourt" th:value="${processResult.sentencingCourt}">
       </div>
-      <label class="col-sm-1 col-form-label text-center">선고내용</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">선고내용</label>
       <div class="col-sm-2">
-        <input class="form-control" name="sentencingDetail" id="sentencingDetail" th:value="${processResult.sentencingDetail}">
+        <input class="form-control form-control-sm" name="sentencingDetail" id="sentencingDetail" th:value="${processResult.sentencingDetail}">
       </div>
-      <label class="col-sm-1 col-form-label text-center">집행내용</label>
+      <label 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" name="executionDetail" id="executionDetail">
           <option value="">선택</option>
@@ -107,45 +111,45 @@
         </select>
         <th:block th:if="${processResult.executionDetail ne '' && processResult.executionDetail ne null && !#strings.contains(processResult.executionDetail, 'PR')}">
           <div class="col-auto">
-            <input type="text" class="form-control" name="executionDetailEtc" th:value="${processResult.executionDetail}">
+            <input type="text" class="form-control form-control-sm" name="executionDetailEtc" th:value="${processResult.executionDetail}">
           </div>
         </th:block>
       </div>
     </div>
     <div class="mb-3 row">
-      <label class="col-sm-1 col-form-label text-center">환부일</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">환부일</label>
       <div class="col-sm-2">
-        <input class="form-control" name="returnDt" id="returnDt" th:value="${#temporals.format(processResult.returnDt, 'yyyy-MM-dd')}">
+        <input class="form-control form-control-sm" name="returnDt" id="returnDt" th:value="${#temporals.format(processResult.returnDt, 'yyyy-MM-dd')}">
       </div>
-      <label class="col-sm-1 col-form-label text-center">위탁시작일</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">위탁시작일</label>
       <div class="col-sm-2">
-        <input class="form-control" name="consignmentStartDt" id="consignmentStartDt" th:value="${#temporals.format(processResult.consignmentStartDt, 'yyyy-MM-dd')}">
+        <input class="form-control form-control-sm" name="consignmentStartDt" id="consignmentStartDt" th:value="${#temporals.format(processResult.consignmentStartDt, 'yyyy-MM-dd')}">
       </div>
-      <label class="col-sm-1 col-form-label text-center">위탁종료일</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">위탁종료일</label>
       <div class="col-sm-2">
-        <input class="form-control" name="consignmentEndDt" id="consignmentEndDt" th:value="${#temporals.format(processResult.consignmentEndDt, 'yyyy-MM-dd')}">
+        <input class="form-control form-control-sm" name="consignmentEndDt" id="consignmentEndDt" th:value="${#temporals.format(processResult.consignmentEndDt, 'yyyy-MM-dd')}">
-        <input type="hidden" class="form-control" name="warrantReqTakeTime">
+        <input type="hidden" class="form-control form-control-sm" name="warrantReqTakeTime">
       </div>
     </div>
     <div class="mb-3 row">
-      <label class="col-sm-1 col-form-label text-center">몰수확정일</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">몰수확정일</label>
       <div class="col-sm-2">
-        <input class="form-control" name="confiscationDt" id="confiscationDt" th:value="${#temporals.format(processResult.confiscationDt, 'yyyy-MM-dd')}">
+        <input class="form-control form-control-sm" name="confiscationDt" id="confiscationDt" th:value="${#temporals.format(processResult.confiscationDt, 'yyyy-MM-dd')}">
       </div>
-      <label class="col-sm-1 col-form-label text-center">폐선일</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">폐선일</label>
       <div class="col-sm-2">
-        <input class="form-control" name="boatDisposalDt" id="boatDisposalDt" th:value="${#temporals.format(processResult.boatDisposalDt, 'yyyy-MM-dd')}">
+        <input class="form-control form-control-sm" name="boatDisposalDt" id="boatDisposalDt" th:value="${#temporals.format(processResult.boatDisposalDt, 'yyyy-MM-dd')}">
       </div>
-      <label class="col-sm-1 col-form-label text-center">최종수정일</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">최종수정일</label>
       <div class="col-sm-2">
-        <input class="form-control" name="boatDisposalDt" id="boatDisposalDt" th:value="${#temporals.format(processResult.boatDisposalDt, 'yyyy-MM-dd')}">
+        <input class="form-control form-control-sm" name="boatDisposalDt" id="boatDisposalDt" th:value="${#temporals.format(processResult.boatDisposalDt, 'yyyy-MM-dd')}">
       </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-warning" id="saveTempBtn">임시저장</button>-->
   <button type="button" class="btn btn-primary" id="saveProcessResultBtn">저장</button>
 </div>
 </html>

src/main/resources/templates/faStatistics/processResult/processResultHistoryDetail.html

@@ -1,27 +1,29 @@
 <!DOCTYPE html>
 <html lang="en">
     <div class="mb-3 row">
-        <label class="col-sm-1 col-form-label text-center">사건번호</label>
+        <label class="col-sm-2 col-form-label col-form-label-sm text-center">사건번호</label>
-        <div class="col-sm-2">
+        <div class="col-4">
-            <input class="form-control" name="caseNum" id="caseNum" th:value="${processResultVersion.crackdownStatus.caseNum}">
+            <input class="form-control form-control-sm" name="caseNum" id="caseNum" th:value="${processResultVersion.crackdownStatus.caseNum}" readonly>
         </div>
-        <label class="col-sm-1 col-form-label text-center">피의자(선박명)</label>
+        <label class="col-sm-2 col-form-label col-form-label-sm text-center">피의자(선박명)</label>
-        <div class="col-sm-2">
+        <div class="col-4">
-            <input class="form-control" name="boatNameKr" id="boatNameKr" th:value="${processResultVersion.fishingBoat.boatNameKr ne null ? processResultVersion.fishingBoat.boatNameKr : ''}">
+            <input class="form-control form-control-sm" name="boatNameKr" id="boatNameKr" th:value="${processResultVersion.fishingBoat.boatNameKr ne null ? processResultVersion.fishingBoat.boatNameKr : ''}" readonly>
         </div>
     </div>
     <div class="mb-3 row">
-        <label class="col-sm-1 col-form-label text-center">선고법원</label>
+        <label class="col-sm-2 col-form-label col-form-label-sm text-center">선고법원</label>
-        <div class="col-sm-2">
+        <div class="col-4">
-            <input class="form-control" name="sentencingCourt" id="sentencingCourt" th:value="${processResultVersion.sentencingCourt}">
+            <input class="form-control form-control-sm" name="sentencingCourt" id="sentencingCourt" th:value="${processResultVersion.sentencingCourt}" readonly>
         </div>
-        <label class="col-sm-1 col-form-label text-center">선고내용</label>
+        <label class="col-sm-2 col-form-label col-form-label-sm text-center">선고내용</label>
-        <div class="col-sm-2">
+        <div class="col-4">
-            <input class="form-control" name="sentencingDetail" id="sentencingDetail" th:value="${processResultVersion.sentencingDetail}">
+            <input class="form-control form-control-sm" name="sentencingDetail" id="sentencingDetail" th:value="${processResultVersion.sentencingDetail}" readonly>
         </div>
-        <label class="col-sm-1 col-form-label text-center">집행내용</label>
+    </div>
-        <div class="col-sm-2">
+    <div class="mb-3 row">
-            <select class="form-select form-select-sm" name="executionDetail" id="executionDetail">
+        <label class="col-sm-2 col-form-label col-form-label-sm text-center">집행내용</label>
+        <div class="col-4">
+            <select class="form-select form-select-sm" name="executionDetail" id="executionDetail" disabled>
                 <option value="">선택</option>
                 <th:block th:each="commonCode:${session.commonCode.get('PR')}">
                     <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
@@ -30,38 +32,34 @@
                 <option th:selected="${processResultVersion.executionDetail ne null && !#strings.contains(processResultVersion.executionDetail, 'PR')}" value="etc">직접입력</option>
             </select>
             <th:block th:if="${processResultVersion.executionDetail ne null && !#strings.contains(processResultVersion.executionDetail, 'PR')}">
-                <div class="col-auto">
+                <div class="col-4">
-                    <input type="text" class="form-control" name="processStatusEtc" th:value="${processResultVersion.executionDetail}">
+                    <input type="text" class="form-control form-control-sm" name="processStatusEtc" th:value="${processResultVersion.executionDetail}" readonly>
                 </div>
             </th:block>
         </div>
-    </div>
+        <label class="col-sm-2 col-form-label col-form-label-sm text-center">환부일</label>
-    <div class="mb-3 row">
+        <div class="col-4">
-        <label class="col-sm-1 col-form-label text-center">환부일</label>
+            <input class="form-control form-control-sm" name="returnDt" id="returnDt" th:value="${#temporals.format(processResultVersion.returnDt, 'yyyy-MM-dd')}" readonly>
-        <div class="col-sm-2">
-            <input class="form-control" name="returnDt" id="returnDt" th:value="${#temporals.format(processResultVersion.returnDt, 'yyyy-MM-dd')}">
-        </div>
-        <label class="col-sm-1 col-form-label text-center">위탁시작일</label>
-        <div class="col-sm-2">
-            <input class="form-control" name="consignmentStartDt" id="consignmentStartDt" th:value="${#temporals.format(processResultVersion.consignmentStartDt, 'yyyy-MM-dd')}">
-        </div>
-        <label class="col-sm-1 col-form-label text-center">위탁종료일</label>
-        <div class="col-sm-2">
-            <input class="form-control" name="consignmentEndDt" id="consignmentEndDt" th:value="${#temporals.format(processResultVersion.consignmentEndDt, 'yyyy-MM-dd')}">
         </div>
     </div>
     <div class="mb-3 row">
-        <label class="col-sm-1 col-form-label text-center">몰수확정일</label>
+        <label class="col-sm-2 col-form-label col-form-label-sm text-center">위탁시작일</label>
-        <div class="col-sm-2">
+        <div class="col-4">
-            <input class="form-control" name="confiscationDt" id="confiscationDt" th:value="${#temporals.format(processResultVersion.confiscationDt, 'yyyy-MM-dd')}">
+            <input class="form-control form-control-sm" name="consignmentStartDt" id="consignmentStartDt" th:value="${#temporals.format(processResultVersion.consignmentStartDt, 'yyyy-MM-dd')}" readonly>
         </div>
-        <label class="col-sm-1 col-form-label text-center">폐선일</label>
+        <label class="col-sm-2 col-form-label col-form-label-sm text-center">위탁종료일</label>
-        <div class="col-sm-2">
+        <div class="col-4">
-            <input class="form-control" name="boatDisposalDt" id="boatDisposalDt" th:value="${#temporals.format(processResultVersion.boatDisposalDt, 'yyyy-MM-dd')}">
+            <input class="form-control form-control-sm" name="consignmentEndDt" id="consignmentEndDt" th:value="${#temporals.format(processResultVersion.consignmentEndDt, 'yyyy-MM-dd')}" readonly>
         </div>
-        <label class="col-sm-1 col-form-label text-center">최종수정일</label>
+    </div>
-        <div class="col-sm-2">
+    <div class="mb-3 row">
-            <input class="form-control" name="boatDisposalDt" id="boatDisposalDt" th:value="${#temporals.format(processResultVersion.boatDisposalDt, 'yyyy-MM-dd')}">
+        <label class="col-sm-2 col-form-label col-form-label-sm text-center">몰수확정일</label>
+        <div class="col-4">
+            <input class="form-control form-control-sm" name="confiscationDt" id="confiscationDt" th:value="${#temporals.format(processResultVersion.confiscationDt, 'yyyy-MM-dd')}" readonly>
+        </div>
+        <label class="col-sm-2 col-form-label col-form-label-sm text-center">폐선일</label>
+        <div class="col-4">
+            <input class="form-control form-control-sm" name="boatDisposalDt" id="boatDisposalDt" th:value="${#temporals.format(processResultVersion.boatDisposalDt, 'yyyy-MM-dd')}" readonly>
         </div>
     </div>
 </html>

src/main/resources/templates/faStatistics/processResult/processResultHistoryViewModal.html

@@ -30,8 +30,8 @@
         <input type="hidden" name="fbKey" th:value="${processResult.fbKey}">
         <th:block th:if="${!#lists.isEmpty(processReulstVersionList)}">
           <div class="row justify-content-start">
-            <div class="col-4">
+            <div class="col-3">
-              <table class="table table-striped table-bordered" style="max-width: none; width: auto;" id="processReulstVersionTable">
+              <table class="table table-striped table-bordered"  id="processReulstVersionTable">
                 <thead>
                 <tr>
                   <th></th>
@@ -52,58 +52,56 @@
                 </tbody>
               </table>
             </div>
-            <div class="col-8">
+            <div class="col-9">
               <div id="historyDetailDiv">
                 <div class="mb-3 row">
-                  <label class="col-sm-1 col-form-label text-center">사건번호</label>
+                  <label class="col-sm-2 col-form-label col-form-label-sm text-center">사건번호</label>
-                  <div class="col-sm-2">
+                  <div class="col-4">
-                    <input class="form-control" name="caseNum" id="caseNum" readonly>
+                    <input class="form-control form-control-sm" name="caseNum" id="caseNum" readonly>
                   </div>
-                  <label class="col-sm-1 col-form-label text-center">피의자(선박명)</label>
+                  <label class="col-sm-2 col-form-label col-form-label-sm text-center">피의자(선박명)</label>
-                  <div class="col-sm-2">
+                  <div class="col-4">
-                    <input class="form-control" name="boatNameKr" id="boatNameKr" readonly>
+                    <input class="form-control form-control-sm" name="boatNameKr" id="boatNameKr" readonly>
                   </div>
                 </div>
                 <div class="mb-3 row">
-                  <label class="col-sm-1 col-form-label text-center">선고법원</label>
+                  <label class="col-sm-2 col-form-label col-form-label-sm text-center">선고법원</label>
-                  <div class="col-sm-2">
+                  <div class="col-4">
-                    <input class="form-control" name="sentencingCourt" id="sentencingCourt" readonly>
+                    <input class="form-control form-control-sm" name="sentencingCourt" id="sentencingCourt" readonly>
                   </div>
-                  <label class="col-sm-1 col-form-label text-center">선고내용</label>
+                  <label class="col-sm-2 col-form-label col-form-label-sm text-center">선고내용</label>
-                  <div class="col-sm-2">
+                  <div class="col-4">
-                    <input class="form-control" name="sentencingDetail" id="sentencingDetail" readonly>
+                    <input class="form-control form-control-sm" name="sentencingDetail" id="sentencingDetail" readonly>
-                  </div>
-                  <label class="col-sm-1 col-form-label text-center">집행내용</label>
-                  <div class="col-sm-2">
-                    <input class="form-control" name="executionDetail" id="executionDetail" readonly>
                   </div>
                 </div>
                 <div class="mb-3 row">
-                  <label class="col-sm-1 col-form-label text-center">환부일</label>
+                  <label class="col-sm-2 col-form-label col-form-label-sm text-center">집행내용</label>
-                  <div class="col-sm-2">
+                  <div class="col-4">
-                    <input class="form-control" name="returnDt" id="returnDt" readonly>
+                    <input class="form-control form-control-sm" name="executionDetail" id="executionDetail" readonly>
                   </div>
-                  <label class="col-sm-1 col-form-label text-center">위탁시작일</label>
+                  <label class="col-sm-2 col-form-label col-form-label-sm text-center">환부일</label>
-                  <div class="col-sm-2">
+                  <div class="col-4">
-                    <input class="form-control" name="consignmentStartDt" id="consignmentStartDt" readonly>
+                    <input class="form-control form-control-sm" name="returnDt" id="returnDt" readonly>
-                  </div>
-                  <label class="col-sm-1 col-form-label text-center">위탁종료일</label>
-                  <div class="col-sm-2">
-                    <input class="form-control" name="consignmentEndDt" id="consignmentEndDt" readonly>
                   </div>
                 </div>
                 <div class="mb-3 row">
-                  <label class="col-sm-1 col-form-label text-center">몰수확정일</label>
+                  <label class="col-sm-2 col-form-label col-form-label-sm text-center">위탁시작일</label>
-                  <div class="col-sm-2">
+                  <div class="col-4">
-                    <input class="form-control" name="confiscationDt" id="confiscationDt" readonly>
+                    <input class="form-control form-control-sm" name="consignmentStartDt" id="consignmentStartDt" readonly>
                   </div>
-                  <label class="col-sm-1 col-form-label text-center">폐선일</label>
+                  <label class="col-sm-2 col-form-label col-form-label-sm text-center">위탁종료일</label>
-                  <div class="col-sm-2">
+                  <div class="col-4">
-                    <input class="form-control" name="boatDisposalDt" id="boatDisposalDt" readonly>
+                    <input class="form-control form-control-sm" name="consignmentEndDt" id="consignmentEndDt" readonly>
                   </div>
-                  <label class="col-sm-1 col-form-label text-center">최종수정일</label>
+                </div>
-                  <div class="col-sm-2">
+                <div class="mb-3 row">
-                    <input class="form-control" name="boatDisposalDt" id="boatDisposalDt" readonly>
+                  <label class="col-sm-2 col-form-label col-form-label-sm text-center">몰수확정일</label>
+                  <div class="col-4">
+                    <input class="form-control form-control-sm" name="confiscationDt" id="confiscationDt" readonly>
+                  </div>
+                  <label class="col-sm-2 col-form-label col-form-label-sm text-center">폐선일</label>
+                  <div class="col-4">
+                    <input class="form-control form-control-sm" name="boatDisposalDt" id="boatDisposalDt" readonly>
                   </div>
                 </div>
               </div>

src/main/resources/templates/faStatistics/processResult/processResultViewModal.html

@@ -33,13 +33,13 @@
         <input type="hidden" name="wrtDt" th:value="${#temporals.format(processResult.wrtDt, 'yyyy-MM-dd HH:mm')}">
         <input type="hidden" id="saveYn" name="saveYn">
         <div class="mb-3 row">
-          <label class="col-sm-1 col-form-label text-center">사건번호</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">사건번호</label>
           <div class="col-sm-2">
-            <input class="form-control" name="caseNum" id="caseNum" th:value="${processResult.crackdownStatus.caseNum}">
+            <input class="form-control form-control-sm" name="caseNum" id="caseNum" th:value="${processResult.crackdownStatus.caseNum}" readonly>
           </div>
-          <label class="col-sm-1 col-form-label text-center">사건담당경찰서</label>
+          <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">
+            <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}"
@@ -50,24 +50,25 @@
           </div>
         </div>
         <div class="mb-3 row">
-          <label class="col-sm-1 col-form-label text-center">피의자(선박명)</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">피의자<br>(선박명)</label>
           <div class="col-sm-2">
-            <input class="form-control" name="boatNameKr" id="boatNameKr" th:value="${processResult.boatNameKr}">
+            <input class="form-control form-control-sm" name="boatNameKr" id="boatNameKr" th:value="${processResult.boatNameKr}" readonly>
           </div>
-          <label class="col-sm-1 col-form-label text-center">위반장소</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">위반장소</label>
-          <div class="col-sm-2">
+          <div class="col-sm-6">
-            <input class="form-control" name="napoSeaPointLon" id="napoSeaPointLon" th:value="${processResult.crackdownStatus.napoSeaPointLon}">
+            <input class="form-control form-control-sm" name="napoSeaPointLon" id="napoSeaPointLon" th:value="${processResult.crackdownStatus.napoSeaPointLon}" readonly>
-            <input class="form-control" name="napoSeaPointLat" id="napoSeaPointLat" th:value="${processResult.crackdownStatus.napoSeaPointLat}">
+            <input class="form-control form-control-sm" name="napoSeaPointLat" id="napoSeaPointLat" th:value="${processResult.crackdownStatus.napoSeaPointLat}" readonly>
-            <input class="form-control" name="napoSeaPointDetail" id="napoSeaPointDetail" th:value="${processResult.crackdownStatus.napoSeaPointDetail}">
+            <input class="form-control form-control-sm" name="napoSeaPointDetail" id="napoSeaPointDetail" th:value="${processResult.crackdownStatus.napoSeaPointDetail}" readonly>
           </div>
+        </div>
+        <div class="mb-3 row">
           <div class="col-sm-1">
-            <label class="col-form-label text-center">위반내용</label>
+            <label class="col-form-label col-form-label-sm text-center">위반내용</label>
-            <button type="button" class="btn btn-primary col-auto" id="violationAddBtn">+</button>
           </div>
-          <div class="col-sm-2" id="violationDiv">
+          <div class="col-auto" id="violationDiv">
             <th:block th:if="${#lists.isEmpty(processResult.violationList)}">
               <div class="row">
-                <select class="form-select form-select-sm violation" name="violation">
+                <select class="form-select form-select-sm violation" name="violation" disabled>
                   <option value="">선택</option>
                   <th:block th:each="commonCode:${session.commonCode.get('VT')}">
                     <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"></option>
@@ -80,7 +81,7 @@
               <th:block th:each="violation : ${processResult.violationList}">
                 <div class="row">
                   <input type="hidden" name="violationKey" th:value="${violation.violationKey}">
-                  <select class="form-select form-select-sm violation" name="violation">
+                  <select class="form-select form-select-sm violation" name="violation" disabled>
                     <option value="">선택</option>
                     <th:block th:each="commonCode:${session.commonCode.get('VT')}">
                       <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
@@ -90,7 +91,7 @@
                   </select>
                   <th:block th:if="${violation.violation ne null and !#strings.contains(violation.violation, 'VT')}">
                     <div class="col-auto">
-                      <input type="text" class="form-control" name="violationEtc" th:value="${violation.violation}">
+                      <input type="text" class="form-control form-control-sm" name="violationEtc" th:value="${violation.violation}" readonly>
                     </div>
                   </th:block>
                 </div>
@@ -99,17 +100,17 @@
           </div>
         </div>
         <div class="mb-3 row">
-          <label class="col-sm-1 col-form-label text-center">선고법원</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">선고법원</label>
           <div class="col-sm-2">
-            <input class="form-control" name="sentencingCourt" id="sentencingCourt" th:value="${processResult.sentencingCourt}">
+            <input class="form-control form-control-sm" name="sentencingCourt" id="sentencingCourt" th:value="${processResult.sentencingCourt}" readonly>
           </div>
-          <label class="col-sm-1 col-form-label text-center">선고내용</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">선고내용</label>
           <div class="col-sm-2">
-            <input class="form-control" name="sentencingDetail" id="sentencingDetail" th:value="${processResult.sentencingDetail}">
+            <input class="form-control form-control-sm" name="sentencingDetail" id="sentencingDetail" th:value="${processResult.sentencingDetail}" readonly>
           </div>
-          <label class="col-sm-1 col-form-label text-center">집행내용</label>
+          <label 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" name="executionDetail" id="executionDetail">
+            <select class="form-select form-select-sm" name="executionDetail" id="executionDetail" disabled>
               <option value="">선택</option>
               <th:block th:each="commonCode:${session.commonCode.get('PR')}">
                 <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
@@ -119,37 +120,37 @@
             </select>
             <th:block th:if="${processResult.executionDetail ne '' && processResult.executionDetail ne null && !#strings.contains(processResult.executionDetail, 'PR')}">
               <div class="col-auto">
-                <input type="text" class="form-control" name="processStatusEtc" th:value="${processResult.executionDetail}">
+                <input type="text" class="form-control form-control-sm" name="processStatusEtc" th:value="${processResult.executionDetail}" readonly>
               </div>
             </th:block>
           </div>
         </div>
         <div class="mb-3 row">
-          <label class="col-sm-1 col-form-label text-center">환부일</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">환부일</label>
           <div class="col-sm-2">
-            <input class="form-control" name="returnDt" id="returnDt" th:value="${#temporals.format(processResult.returnDt, 'yyyy-MM-dd')}">
+            <input class="form-control form-control-sm" name="returnDt" id="returnDt" th:value="${#temporals.format(processResult.returnDt, 'yyyy-MM-dd')}" readonly>
           </div>
-          <label class="col-sm-1 col-form-label text-center">위탁시작일</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">위탁시작일</label>
           <div class="col-sm-2">
-            <input class="form-control" name="consignmentStartDt" id="consignmentStartDt" th:value="${#temporals.format(processResult.consignmentStartDt, 'yyyy-MM-dd')}">
+            <input class="form-control form-control-sm" name="consignmentStartDt" id="consignmentStartDt" th:value="${#temporals.format(processResult.consignmentStartDt, 'yyyy-MM-dd')}" readonly>
           </div>
-          <label class="col-sm-1 col-form-label text-center">위탁종료일</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">위탁종료일</label>
           <div class="col-sm-2">
-            <input class="form-control" name="consignmentEndDt" id="consignmentEndDt" th:value="${#temporals.format(processResult.consignmentEndDt, 'yyyy-MM-dd')}">
+            <input class="form-control form-control-sm" name="consignmentEndDt" id="consignmentEndDt" th:value="${#temporals.format(processResult.consignmentEndDt, 'yyyy-MM-dd')}" readonly>
           </div>
         </div>
         <div class="mb-3 row">
-          <label class="col-sm-1 col-form-label text-center">몰수확정일</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">몰수확정일</label>
           <div class="col-sm-2">
-            <input class="form-control" name="confiscationDt" id="confiscationDt" th:value="${#temporals.format(processResult.confiscationDt, 'yyyy-MM-dd')}">
+            <input class="form-control form-control-sm" name="confiscationDt" id="confiscationDt" th:value="${#temporals.format(processResult.confiscationDt, 'yyyy-MM-dd')}" readonly>
           </div>
-          <label class="col-sm-1 col-form-label text-center">폐선일</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">폐선일</label>
           <div class="col-sm-2">
-            <input class="form-control" name="boatDisposalDt" id="boatDisposalDt" th:value="${#temporals.format(processResult.boatDisposalDt, 'yyyy-MM-dd')}">
+            <input class="form-control form-control-sm" name="boatDisposalDt" id="boatDisposalDt" th:value="${#temporals.format(processResult.boatDisposalDt, 'yyyy-MM-dd')}" readonly>
           </div>
-          <label class="col-sm-1 col-form-label text-center">최종수정일</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">최종수정일</label>
           <div class="col-sm-2">
-            <input class="form-control" name="boatDisposalDt" id="boatDisposalDt" th:value="${#temporals.format(processResult.boatDisposalDt, 'yyyy-MM-dd')}">
+            <input class="form-control form-control-sm" name="boatDisposalDt" id="boatDisposalDt" th:value="${#temporals.format(processResult.boatDisposalDt, 'yyyy-MM-dd')}" readonly>
           </div>
         </div>
       </form>

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

@@ -120,15 +120,15 @@
                                         </select>
                                     </div>
                                 </div>
-                                <div class="col-auto">
+                            </div>
-                                    <input type="submit" class="btn btn-sm btn-primary col-auto" id="searchBtn" value="검색">
+                            <div class="col-auto">
-                                </div>
+                                <input type="submit" class="btn btn-sm btn-primary col-auto" id="searchBtn" value="검색">
                             </div>
                         </div>
                     </form>
                     <div class="row justify-content-start" style="overflow: hidden; overflow-x: scroll">
-                        <table class="table table-striped table-bordered" style="max-width: none; width: auto;" id="sailorTable">
+                        <table class="table table-hover table-bordered ws-nowrap" style="max-width: none; width: auto;" id="sailorTable">
-                            <thead>
+                            <thead class="align-middle text-center">
                             <tr>
                                 <th rowspan="2">연번</th>
                                 <th rowspan="2">선박명</th>
@@ -208,12 +208,12 @@
                                 <th>없음</th>
                             </tr>
                             </thead>
-                            <tbody class="table-group-divider">
+                            <tbody class="table-group-divider align-middle text-center">
                                 <th:block th:each="sailor:${sailorList}">
                                     <tr class="tr" th:data-key="${sailor.sailorKey}">
                                         <td th:text="${sailor.sailorKey}"></td>
                                         <td th:text="${sailor.fishingBoat.boatNameKr}"></td>
-                                        <td th:text="${sailor.crackdownStatus.napoDt}"></td>
+                                        <td th:text="${#temporals.format(sailor.crackdownStatus.napoDt, 'yyyy-MM-dd HH:mm')}"></td>
                                         <th:block th:each="commonCode:${session.commonCode.get('CPO')}">
                                             <td th:if="${sailor.crackdownStatus.crackdownPolice eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
                                         </th:block>
@@ -260,7 +260,7 @@
                                         <td th:text="${sailor.residence == 'RSC013' ? 1 : 0}"></td>
                                         <td th:text="${sailor.residence == 'RSC014' ? 1 : 0}"></td>
                                         <td th:text="${sailor.residence == 'RSC015' ? 1 : 0}"></td>
-                                        <td th:text="${sailor.residence ne null && !#strings.contains(sailor.residence, 'RSC') ? 1 : 0}"></td>
+                                        <td th:text="${sailor.residence ne '' && sailor.residence ne null && !#strings.contains(sailor.residence, 'RSC') ? 1 : 0}"></td>
                                         <td th:text="${sailor.residence == 'RSC016' ? 1 : 0}"></td>
                                         <td th:text="${sailor.education == 'SED001' ? 1 : 0}"></td>
                                         <td th:text="${sailor.education == 'SED002' ? 1 : 0}"></td>
@@ -281,32 +281,32 @@
                                         <td th:text="${sailor.career == 'BE003' ? 1 : 0}"></td>
                                         <td th:text="${sailor.career == 'BE004' ? 1 : 0}"></td>
                                         <td th:text="${sailor.career == 'BE005' ? 1 : 0}"></td>
+                                        <td th:text="${sailor.career == 'BE006' ? 1 : 0}"></td>
                                         <td th:text="${sailor.similarCriminalHistory == 1 ? 1 : 0}"></td>
                                         <td th:text="${sailor.similarCriminalHistory == 2 ? 1 : 0}"></td>
                                         <td th:text="${sailor.similarCriminalHistory == 3 ? 1 : 0}"></td>
                                         <td th:text="${sailor.similarCriminalHistory > 3 ? 1 : 0}"></td>
                                         <td th:text="${sailor.similarCriminalHistory == 0 ? 1 : 0}"></td>
-                                        <td th:text="${sailor.similarCriminalHistory == 1 ? 1 : 0}"></td>
+                                        <td th:text="${sailor.heterogeneousCriminalHistory == 1 ? 1 : 0}"></td>
-                                        <td th:text="${sailor.similarCriminalHistory == 2 ? 1 : 0}"></td>
+                                        <td th:text="${sailor.heterogeneousCriminalHistory == 2 ? 1 : 0}"></td>
-                                        <td th:text="${sailor.similarCriminalHistory == 3 ? 1 : 0}"></td>
+                                        <td th:text="${sailor.heterogeneousCriminalHistory == 3 ? 1 : 0}"></td>
-                                        <td th:text="${sailor.similarCriminalHistory > 3 ? 1 : 0}"></td>
+                                        <td th:text="${sailor.heterogeneousCriminalHistory > 3 ? 1 : 0}"></td>
-                                        <td th:text="${sailor.similarCriminalHistory == 0 ? 1 : 0}"></td>
+                                        <td th:text="${sailor.heterogeneousCriminalHistory == 0 ? 1 : 0}"></td>
-                                        <td th:text="${sailor.similarCriminalHistory == 1 ? 1 : 0}"></td>
+                                        <td th:text="${sailor.arrestHistory == 1 ? 1 : 0}"></td>
-                                        <td th:text="${sailor.similarCriminalHistory == 2 ? 1 : 0}"></td>
+                                        <td th:text="${sailor.arrestHistory == 2 ? 1 : 0}"></td>
-                                        <td th:text="${sailor.similarCriminalHistory == 3 ? 1 : 0}"></td>
+                                        <td th:text="${sailor.arrestHistory == 3 ? 1 : 0}"></td>
-                                        <td th:text="${sailor.similarCriminalHistory > 3 ? 1 : 0}"></td>
+                                        <td th:text="${sailor.arrestHistory > 3 ? 1 : 0}"></td>
-                                        <td th:text="${sailor.similarCriminalHistory == 0 ? 1 : 0}"></td>
+                                        <td th:text="${sailor.arrestHistory == 0 ? 1 : 0}"></td>
                                         <td th:text="${sailor.criminalHistoryDetail}"></td>
                                         <td th:text="${sailor.monthlyWages}"></td>
                                         <td th:text="${sailor.note}"></td>
-                                        <td th:text="${sailor.wrtDt}"></td>
+                                        <td th:text="${#temporals.format(sailor.updDt, 'yyyy-MM-dd HH:mm')}"></td>
                                     </tr>
                                 </th:block>
                             </tbody>
                         </table>
                     </div>
                     <div class="row justify-content">
-                        <button class="btn btn-sm btn-primary col-auto" id="">관리자마감</button>
                         <button class="btn btn-sm btn-primary col-auto" id="sailorDownExcel">엑셀 다운로드</button>
                         <button class="btn btn-sm btn-primary col-auto" id="sailorAddBtn">등록</button>
                     </div>

src/main/resources/templates/faStatistics/sailor/sailorAddModal.html

@@ -13,11 +13,13 @@
     <input type="hidden" name="fbKey">
     <input type="hidden" name="cdsKey">
     <input type="hidden" name="wrtOrgan" th:value="${sailor.wrtOrgan}">
+    <input type="hidden" name="wrtPart" th:value="${sailor.wrtPart}">
+    <input type="hidden" name="wrtUserGrd" th:value="${sailor.wrtUserGrd}">
     <input type="hidden" name="wrtUserNm" th:value="${sailor.wrtUserNm}">
     <input type="hidden" name="wrtDt" th:value="${#temporals.format(sailor.wrtDt, 'yyyy-MM-dd HH:mm')}">
     <input type="hidden" id="saveYn" name="saveYn">
     <div class="mb-3 row">
-      <label class="col-sm-1 col-form-label text-center">선박명</label>
+      <label 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" name="boatNameKr">
           <option value="">선택</option>
@@ -28,21 +30,21 @@
       </div>
     </div>
     <div class="mb-3 row">
-      <label class="col-sm-1 col-form-label text-center">선원명(한글)</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">선원명(한글)</label>
       <div class="col-sm-2">
-        <input class="form-control" name="sailorNameKr" id="sailorNameKr" th:value="${sailor.sailorNameKr}">
+        <input class="form-control form-control-sm" name="sailorNameKr" id="sailorNameKr" th:value="${sailor.sailorNameKr}">
       </div>
-      <label class="col-sm-1 col-form-label text-center">선원명(중문)</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">선원명(중문)</label>
       <div class="col-sm-2">
-        <input class="form-control" name="sailorNameCn" id="sailorNameCn" th:value="${sailor.sailorNameCn}">
+        <input class="form-control form-control-sm" name="sailorNameCn" id="sailorNameCn" th:value="${sailor.sailorNameCn}">
       </div>
-      <label class="col-sm-1 col-form-label text-center">생년월일</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">생년월일</label>
       <div class="col-sm-2">
-          <input class="form-control" name="birthdate" id="birthdate" th:value="${#temporals.format(sailor.birthdate, 'yyyy-MM-dd')}">
+          <input class="form-control form-control-sm" name="birthdate" id="birthdate" th:value="${#temporals.format(sailor.birthdate, 'yyyy-MM-dd')}">
       </div>
     </div>
     <div class="mb-3 row">
-      <label class="col-sm-1 col-form-label text-center">거주지</label>
+      <label 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" name="residence">
           <option value="">선택</option>
@@ -52,7 +54,7 @@
           </th:block>
         </select>
       </div>
-      <label class="col-sm-1 col-form-label text-center">학력</label>
+      <label 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" name="education">
           <option value="">선택</option>
@@ -62,7 +64,7 @@
           </th:block>
         </select>
       </div>
-      <label class="col-sm-1 col-form-label text-center">선박 내 직책</label>
+      <label 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" name="position">
           <option value="">선택</option>
@@ -74,7 +76,7 @@
       </div>
     </div>
     <div class="mb-3 row">
-      <label class="col-sm-1 col-form-label text-center">승선경력</label>
+      <label 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" name="career">
           <option value="">선택</option>
@@ -84,7 +86,7 @@
           </th:block>
         </select>
       </div>
-      <label class="col-sm-1 col-form-label text-center">동종 범죄경력</label>
+      <label 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" name="similarCriminalHistory">
           <option value="">선택</option>
@@ -95,7 +97,7 @@
           <option value="0" th:selected="${sailor.similarCriminalHistory == 0}">없음</option>
         </select>
       </div>
-      <label class="col-sm-1 col-form-label text-center">이종 범죄경력</label>
+      <label 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" name="heterogeneousCriminalHistory">
           <option value="">선택</option>
@@ -106,7 +108,7 @@
           <option value="0" th:selected="${sailor.heterogeneousCriminalHistory == 0}">없음</option>
         </select>
       </div>
-      <label class="col-sm-1 col-form-label text-center">검거이력<br>(나포이력, 선원 포함)</label>
+      <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="arrestHistory">
           <option value="">선택</option>
@@ -119,24 +121,24 @@
       </div>
     </div>
     <div class="mb-3 row">
-      <label class="col-sm-1 col-form-label text-center">범죄경력<br>세부내용</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">범죄경력<br>세부내용</label>
       <div class="col-sm-2">
-        <input class="form-control" name="criminalHistoryDetail" th:value="${sailor.criminalHistoryDetail}">
+        <input class="form-control form-control-sm" name="criminalHistoryDetail" th:value="${sailor.criminalHistoryDetail}">
       </div>
-      <label class="col-sm-1 col-form-label text-center">임금<br>(월급여)</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">임금<br>(월급여)</label>
       <div class="col-sm-2">
-        <input class="form-control" name="monthlyWages" th:value="${sailor.monthlyWages}">
+        <input class="form-control form-control-sm" name="monthlyWages" th:value="${sailor.monthlyWages}">
       </div>
-      <label class="col-sm-1 col-form-label text-center">비고</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">비고</label>
       <div class="col-sm-2">
-        <input class="form-control" name="note" th:value="${sailor.note}">
+        <input class="form-control form-control-sm" name="note" th:value="${sailor.note}">
       </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-warning" id="saveTempBtn">임시저장</button>-->
   <button type="button" class="btn btn-primary" id="saveSailorBtn">저장</button>
 </div>
 </html>

src/main/resources/templates/faStatistics/sailor/sailorEditModal.html

@@ -13,15 +13,17 @@
     <input type="hidden" name="fbKey" th:value="${sailor.fishingBoat.fbKey}">
     <input type="hidden" name="sailorKey" th:value="${sailor.sailorKey}">
     <input type="hidden" name="wrtOrgan" th:value="${sailor.wrtOrgan}">
+    <input type="hidden" name="wrtPart" th:value="${sailor.wrtPart}">
+    <input type="hidden" name="wrtUserGrd" th:value="${sailor.wrtUserGrd}">
     <input type="hidden" name="wrtUserNm" th:value="${sailor.wrtUserNm}">
     <input type="hidden" name="wrtDt" th:value="${#temporals.format(sailor.wrtDt, 'yyyy-MM-dd HH:mm')}">
     <input type="hidden" id="saveYn" name="saveYn">
     <div class="mb-3 row">
-      <label class="col-sm-1 col-form-label text-center">선박명</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">선박명</label>
       <div class="col-sm-2">
-        <input class="form-control" name="boatNameKr" id="boatNameKr" th:value="${sailor.fishingBoat.boatNameKr}">
+        <input class="form-control form-control-sm" name="boatNameKr" id="boatNameKr" th:value="${sailor.fishingBoat.boatNameKr}">
       </div>
-      <label class="col-sm-1 col-form-label text-center">단속경찰서</label>
+      <label 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" name="crackdownPolice" id="crackdownPolice">
           <option value="">선택</option>
@@ -32,33 +34,37 @@
           <option value="etc" th:selected="${sailor.crackdownStatus.crackdownPolice ne null && sailor.crackdownStatus.crackdownPolice ne '' && !#strings.contains(sailor.crackdownStatus.crackdownPolice, 'CPO')}">직접입력</option>
         </select>
       </div>
-      <label class="col-sm-1 col-form-label text-center">단속함정</label>
+      <label 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" name="crackdownBoat" id="crackdownBoat">
           <option value="">선택</option>
-          <th:block th:each="commonCode:${session.commonCode.get('CDB')}">
+          <th:block th:each="num : ${#numbers.sequence(1,#lists.size(session.commonCode.get('CPO')))}">
-            <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
+            <th:block th:if="${'CPO'+num == sailor.crackdownStatus.crackdownPolice}" th:each="commonCode:${session.commonCode.get('CPO'+num)}">
-                    th:selected="${commonCode.itemCd eq sailor.crackdownStatus.crackdownBoat}"></option>
+              <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
+                      th:selected="${commonCode.itemCd eq sailor.crackdownStatus.crackdownBoat}"></option>
+            </th:block>
           </th:block>
           <option value="etc" th:selected="${sailor.crackdownStatus.crackdownBoat ne null && sailor.crackdownStatus.crackdownBoat ne '' && !#strings.contains(sailor.crackdownStatus.crackdownBoat, 'CPO')}">직접입력</option>
         </select>
       </div>
     </div>
     <div class="mb-3 row">
-      <label class="col-sm-1 col-form-label text-center">위반장소</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">위반장소</label>
-      <div class="col-sm-2">
+      <div class="col-sm-6">
-        <input class="form-control" placeholder="위도" name="napoSeaPointLat" th:value="${sailor.crackdownStatus.napoSeaPointLat}">
+        <input class="form-control form-control-sm" placeholder="위도" name="napoSeaPointLat" th:value="${sailor.crackdownStatus.napoSeaPointLat}">
-        <input class="form-control" placeholder="경도" name="napoSeaPointLon" th:value="${sailor.crackdownStatus.napoSeaPointLon}">
+        <input class="form-control form-control-sm" placeholder="경도" name="napoSeaPointLon" th:value="${sailor.crackdownStatus.napoSeaPointLon}">
-        <input class="form-control" placeholder="상세내용" name="napoSeaPointDetail" th:value="${sailor.crackdownStatus.napoSeaPointDetail}">
+        <input class="form-control form-control-sm" placeholder="상세내용" name="napoSeaPointDetail" th:value="${sailor.crackdownStatus.napoSeaPointDetail}">
       </div>
+    </div>
+    <div class="mb-3 row">
       <div class="col-sm-1">
-        <label class="col-form-label text-center">위반내용</label>
+        <label class="col-form-label col-form-label-sm text-center">위반내용</label>
         <button type="button" class="btn btn-primary col-auto" id="violationAddBtn">+</button>
       </div>
-      <div class="col-sm-2" id="violationDiv">
+      <div class="col-auto" id="violationDiv">
-        <th:block th:if="${#lists.isEmpty(sailor.crackdownStatus.violationList)}">
+        <th:block th:if="${#lists.isEmpty(sailor.violationList)}">
           <div class="row">
-            <select class="form-select form-select-sm violation" name="violation">
+            <select class="form-select form-select-sm violation" name="violation" style="max-width: 90% !important;">
               <option value="">선택</option>
               <th:block th:each="commonCode:${session.commonCode.get('VT')}">
                 <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"></option>
@@ -67,21 +73,21 @@
             </select>
           </div>
         </th:block>
-        <th:block th:if="${!#lists.isEmpty(sailor.crackdownStatus.violationList)}">
+        <th:block th:if="${!#lists.isEmpty(sailor.violationList)}">
-          <th:block th:each="violation, i : ${sailor.crackdownStatus.violationList}">
+          <th:block th:each="violation, i : ${sailor.violationList}">
             <div class="row">
               <input type="hidden" name="violationKey" th:value="${violation.violationKey}">
-              <select class="form-select form-select-sm violation" name="violation">
+              <select class="form-select form-select-sm violation" name="violation" style="max-width: 90% !important;">
                 <option value="">선택</option>
                 <th:block th:each="commonCode:${session.commonCode.get('VT')}">
                   <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
-                          th:selected="${crackdownStatus.violationList != null and commonCode.itemCd eq violation.violation}"></option>
+                          th:selected="${sailor.violationList != null and commonCode.itemCd eq violation.violation}"></option>
                 </th:block>
                 <option th:selected="${violation.violation ne null && !#strings.contains(violation.violation, 'VT')}" value="etc">직접입력</option>
               </select>
               <th:block th:if="${violation.violation ne null and !#strings.contains(violation.violation, 'VT')}">
                 <div class="col-auto">
-                  <input type="text" class="form-control" name="violationEtc" th:value="${violation.violation}">
+                  <input type="text" class="form-control form-control-sm" name="violationEtc" th:value="${violation.violation}">
                 </div>
               </th:block>
               <th:block th:if="${i.index > 0}">
@@ -94,21 +100,21 @@
       </div>
     </div>
     <div class="mb-3 row">
-      <label class="col-sm-1 col-form-label text-center">선원명(한글)</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">선원명(한글)</label>
       <div class="col-sm-2">
-        <input class="form-control" name="sailorNameKr" id="sailorNameKr" th:value="${sailor.sailorNameKr}">
+        <input class="form-control form-control-sm" name="sailorNameKr" id="sailorNameKr" th:value="${sailor.sailorNameKr}">
       </div>
-      <label class="col-sm-1 col-form-label text-center">선원명(중문)</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">선원명(중문)</label>
       <div class="col-sm-2">
-        <input class="form-control" name="sailorNameCn" id="sailorNameCn" th:value="${sailor.sailorNameCn}">
+        <input class="form-control form-control-sm" name="sailorNameCn" id="sailorNameCn" th:value="${sailor.sailorNameCn}">
       </div>
-      <label class="col-sm-1 col-form-label text-center">생년월일</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">생년월일</label>
       <div class="col-sm-2">
-          <input class="form-control" name="birthdate" id="birthdate" th:value="${#temporals.format(sailor.birthdate, 'yyyy-MM-dd')}">
+          <input class="form-control form-control-sm" name="birthdate" id="birthdate" th:value="${#temporals.format(sailor.birthdate, 'yyyy-MM-dd')}">
       </div>
     </div>
     <div class="mb-3 row">
-      <label class="col-sm-1 col-form-label text-center">거주지</label>
+      <label 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" name="residence">
           <option value="">선택</option>
@@ -118,7 +124,7 @@
           </th:block>
         </select>
       </div>
-      <label class="col-sm-1 col-form-label text-center">학력</label>
+      <label 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" name="education">
           <option value="">선택</option>
@@ -128,7 +134,7 @@
           </th:block>
         </select>
       </div>
-      <label class="col-sm-1 col-form-label text-center">선박 내 직책</label>
+      <label 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" name="position">
           <option value="">선택</option>
@@ -140,7 +146,7 @@
       </div>
     </div>
     <div class="mb-3 row">
-      <label class="col-sm-1 col-form-label text-center">승선경력</label>
+      <label 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" name="career">
           <option value="">선택</option>
@@ -150,7 +156,7 @@
           </th:block>
         </select>
       </div>
-      <label class="col-sm-1 col-form-label text-center">동종 범죄경력</label>
+      <label 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" name="similarCriminalHistory">
           <option value="">선택</option>
@@ -161,7 +167,7 @@
           <option value="0" th:selected="${sailor.similarCriminalHistory == 0}">없음</option>
         </select>
       </div>
-      <label class="col-sm-1 col-form-label text-center">이종 범죄경력</label>
+      <label 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" name="heterogeneousCriminalHistory">
           <option value="">선택</option>
@@ -172,7 +178,7 @@
           <option value="0" th:selected="${sailor.heterogeneousCriminalHistory == 0}">없음</option>
         </select>
       </div>
-      <label class="col-sm-1 col-form-label text-center">검거이력<br>(나포이력, 선원 포함)</label>
+      <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="arrestHistory">
           <option value="">선택</option>
@@ -185,24 +191,24 @@
       </div>
     </div>
     <div class="mb-3 row">
-      <label class="col-sm-1 col-form-label text-center">범죄경력<br>세부내용</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">범죄경력<br>세부내용</label>
       <div class="col-sm-2">
-        <input class="form-control" name="criminalHistoryDetail" th:value="${sailor.criminalHistoryDetail}">
+        <input class="form-control form-control-sm" name="criminalHistoryDetail" th:value="${sailor.criminalHistoryDetail}">
       </div>
-      <label class="col-sm-1 col-form-label text-center">임금<br>(월급여)</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">임금<br>(월급여)</label>
       <div class="col-sm-2">
-        <input class="form-control" name="monthlyWages" th:value="${sailor.monthlyWages}">
+        <input class="form-control form-control-sm" name="monthlyWages" th:value="${sailor.monthlyWages}">
       </div>
-      <label class="col-sm-1 col-form-label text-center">비고</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">비고</label>
       <div class="col-sm-2">
-        <input class="form-control" name="note" th:value="${sailor.note}">
+        <input class="form-control form-control-sm" name="note" th:value="${sailor.note}">
       </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-warning" id="saveTempBtn">임시저장</button>-->
   <button type="button" class="btn btn-primary" id="saveSailorBtn">저장</button>
 </div>
 </html>

src/main/resources/templates/faStatistics/sailor/sailorHistoryDetail.html

@@ -1,29 +1,29 @@
 <!DOCTYPE html>
 <html lang="ko" xmlns:th="http://www.thymeleaf.org">
     <div class="mb-3 row">
-        <label class="col-sm-1 col-form-label text-center">선박명</label>
+        <label class="col-sm-2 col-form-label col-form-label-sm text-center">선박명</label>
-        <div class="col-sm-2">
+        <div class="col-4">
-            <input class="form-control" name="boatNameKr" th:value="${sailorVersion.fishingBoat.boatNameKr}">
+            <input class="form-control form-control-sm" name="boatNameKr" th:value="${sailorVersion.fishingBoat.boatNameKr}" readonly>
         </div>
     </div>
     <div class="mb-3 row">
-        <label class="col-sm-1 col-form-label text-center">선원명(한글)</label>
+        <label class="col-sm-2 col-form-label col-form-label-sm text-center">선원명(한글)</label>
-        <div class="col-sm-2">
+        <div class="col-4">
-            <input class="form-control" name="sailorNameKr" id="sailorNameKr" th:value="${sailorVersion.sailorNameKr}">
+            <input class="form-control form-control-sm" name="sailorNameKr" id="sailorNameKr" th:value="${sailorVersion.sailorNameKr}" readonly>
         </div>
-        <label class="col-sm-1 col-form-label text-center">선원명(중문)</label>
+        <label class="col-sm-2 col-form-label col-form-label-sm text-center">선원명(중문)</label>
-        <div class="col-sm-2">
+        <div class="col-4">
-            <input class="form-control" name="sailorNameCn" id="sailorNameCn" th:value="${sailorVersion.sailorNameCn}">
+            <input class="form-control form-control-sm" name="sailorNameCn" id="sailorNameCn" th:value="${sailorVersion.sailorNameCn}" readonly>
-        </div>
-        <label class="col-sm-1 col-form-label text-center">생년월일</label>
-        <div class="col-sm-2">
-            <input class="form-control" name="birthdate" id="birthdate" th:value="${#temporals.format(sailorVersion.birthdate, 'yyyy-MM-dd')}">
         </div>
     </div>
     <div class="mb-3 row">
-        <label class="col-sm-1 col-form-label text-center">거주지</label>
+        <label class="col-sm-2 col-form-label col-form-label-sm text-center">생년월일</label>
-        <div class="col-sm-2">
+        <div class="col-4">
-            <select class="form-select form-select-sm" name="residence">
+            <input class="form-control form-control-sm" name="birthdate" id="birthdate" th:value="${#temporals.format(sailorVersion.birthdate, 'yyyy-MM-dd')}" readonly>
+        </div>
+        <label class="col-sm-2 col-form-label col-form-label-sm text-center">거주지</label>
+        <div class="col-4">
+            <select class="form-select form-select-sm" name="residence" disabled>
                 <option value="">선택</option>
                 <th:block th:each="commonCode:${session.commonCode.get('RSC')}">
                     <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
@@ -31,9 +31,11 @@
                 </th:block>
             </select>
         </div>
-        <label class="col-sm-1 col-form-label text-center">학력</label>
+    </div>
-        <div class="col-sm-2">
+    <div class="mb-3 row">
-            <select class="form-select form-select-sm" name="education">
+        <label class="col-sm-2 col-form-label col-form-label-sm text-center">학력</label>
+        <div class="col-4">
+            <select class="form-select form-select-sm" name="education" disabled>
                 <option value="">선택</option>
                 <th:block th:each="commonCode:${session.commonCode.get('SED')}">
                     <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
@@ -41,9 +43,9 @@
                 </th:block>
             </select>
         </div>
-        <label class="col-sm-1 col-form-label text-center">선박 내 직책</label>
+        <label class="col-sm-2 col-form-label col-form-label-sm text-center">선박 내 직책</label>
-        <div class="col-sm-2">
+        <div class="col-4">
-            <select class="form-select form-select-sm" name="position">
+            <select class="form-select form-select-sm" name="position" disabled>
                 <option value="">선택</option>
                 <th:block th:each="commonCode:${session.commonCode.get('POS')}">
                     <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
@@ -53,9 +55,9 @@
         </div>
     </div>
     <div class="mb-3 row">
-        <label class="col-sm-1 col-form-label text-center">승선경력</label>
+        <label class="col-sm-2 col-form-label col-form-label-sm text-center">승선경력</label>
-        <div class="col-sm-2">
+        <div class="col-4">
-            <select class="form-select form-select-sm" name="career">
+            <select class="form-select form-select-sm" name="career" disabled>
                 <option value="">선택</option>
                 <th:block th:each="commonCode:${session.commonCode.get('BE')}">
                     <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
@@ -63,31 +65,9 @@
                 </th:block>
             </select>
         </div>
-        <label class="col-sm-1 col-form-label text-center">동종 범죄경력</label>
+        <label class="col-sm-2 col-form-label col-form-label-sm text-center">검거이력<br>(나포이력, 선원 포함)</label>
-        <div class="col-sm-2">
+        <div class="col-4">
-            <select class="form-select form-select-sm" name="similarCriminalHistory">
+            <select class="form-select form-select-sm" name="arrestHistory" disabled>
-                <option value="">선택</option>
-                <option value="1" th:selected="${sailorVersion.similarCriminalHistory == 1}">1건</option>
-                <option value="2" th:selected="${sailorVersion.similarCriminalHistory == 2}">2건</option>
-                <option value="3" th:selected="${sailorVersion.similarCriminalHistory == 3}">3건</option>
-                <option value="4" th:selected="${sailorVersion.similarCriminalHistory == 4}">4이상</option>
-                <option value="0" th:selected="${sailorVersion.similarCriminalHistory == 0}">없음</option>
-            </select>
-        </div>
-        <label class="col-sm-1 col-form-label text-center">이종 범죄경력</label>
-        <div class="col-sm-2">
-            <select class="form-select form-select-sm" name="heterogeneousCriminalHistory">
-                <option value="">선택</option>
-                <option value="1" th:selected="${sailorVersion.heterogeneousCriminalHistory == 1}">1건</option>
-                <option value="2" th:selected="${sailorVersion.heterogeneousCriminalHistory == 2}">2건</option>
-                <option value="3" th:selected="${sailorVersion.heterogeneousCriminalHistory == 3}">3건</option>
-                <option value="4" th:selected="${sailorVersion.heterogeneousCriminalHistory == 4}">4이상</option>
-                <option value="0" th:selected="${sailorVersion.heterogeneousCriminalHistory == 0}">없음</option>
-            </select>
-        </div>
-        <label class="col-sm-1 col-form-label text-center">검거이력<br>(나포이력, 선원 포함)</label>
-        <div class="col-sm-2">
-            <select class="form-select form-select-sm" name="arrestHistory">
                 <option value="">선택</option>
                 <option value="1" th:selected="${sailorVersion.arrestHistory == 1}">1건</option>
                 <option value="2" th:selected="${sailorVersion.arrestHistory == 2}">2건</option>
@@ -98,17 +78,43 @@
         </div>
     </div>
     <div class="mb-3 row">
-        <label class="col-sm-1 col-form-label text-center">범죄경력<br>세부내용</label>
+        <label class="col-sm-2 col-form-label col-form-label-sm text-center">동종 범죄경력</label>
-        <div class="col-sm-2">
+        <div class="col-4">
-            <input class="form-control" name="criminalHistoryDetail" th:value="${sailorVersion.criminalHistoryDetail}">
+            <select class="form-select form-select-sm" name="similarCriminalHistory" disabled>
+                <option value="">선택</option>
+                <option value="1" th:selected="${sailorVersion.similarCriminalHistory == 1}">1건</option>
+                <option value="2" th:selected="${sailorVersion.similarCriminalHistory == 2}">2건</option>
+                <option value="3" th:selected="${sailorVersion.similarCriminalHistory == 3}">3건</option>
+                <option value="4" th:selected="${sailorVersion.similarCriminalHistory == 4}">4이상</option>
+                <option value="0" th:selected="${sailorVersion.similarCriminalHistory == 0}">없음</option>
+            </select>
         </div>
-        <label class="col-sm-1 col-form-label text-center">임금<br>(월급여)</label>
+        <label class="col-sm-2 col-form-label col-form-label-sm text-center">이종 범죄경력</label>
-        <div class="col-sm-2">
+        <div class="col-4">
-            <input class="form-control" name="monthlyWages" th:value="${sailorVersion.monthlyWages}">
+            <select class="form-select form-select-sm" name="heterogeneousCriminalHistory" disabled>
+                <option value="">선택</option>
+                <option value="1" th:selected="${sailorVersion.heterogeneousCriminalHistory == 1}">1건</option>
+                <option value="2" th:selected="${sailorVersion.heterogeneousCriminalHistory == 2}">2건</option>
+                <option value="3" th:selected="${sailorVersion.heterogeneousCriminalHistory == 3}">3건</option>
+                <option value="4" th:selected="${sailorVersion.heterogeneousCriminalHistory == 4}">4이상</option>
+                <option value="0" th:selected="${sailorVersion.heterogeneousCriminalHistory == 0}">없음</option>
+            </select>
         </div>
-        <label class="col-sm-1 col-form-label text-center">비고</label>
+    </div>
-        <div class="col-sm-2">
+    <div class="mb-3 row">
-            <input class="form-control" name="note" th:value="${sailorVersion.note}">
+        <label class="col-sm-2 col-form-label col-form-label-sm text-center">범죄경력<br>세부내용</label>
+        <div class="col-4">
+            <input class="form-control form-control-sm" name="criminalHistoryDetail" th:value="${sailorVersion.criminalHistoryDetail}" readonly>
+        </div>
+    </div>
+    <div class="mb-3 row">
+        <label class="col-sm-2 col-form-label col-form-label-sm text-center">임금<br>(월급여)</label>
+        <div class="col-4">
+            <input class="form-control form-control-sm" name="monthlyWages" th:value="${sailorVersion.monthlyWages}" readonly>
+        </div>
+        <label class="col-sm-2 col-form-label col-form-label-sm text-center">비고</label>
+        <div class="col-4">
+            <input class="form-control form-control-sm" name="note" th:value="${sailorVersion.note}" readonly>
         </div>
     </div>
 </html>

src/main/resources/templates/faStatistics/sailor/sailorHistoryViewModal.html

@@ -36,8 +36,8 @@
         <input type="hidden" name="fbKey" th:value="${sailor.fbKey}">
         <th:block th:if="${!#lists.isEmpty(sailorVersionList)}">
           <div class="row justify-content-start">
-            <div class="col-4">
+            <div class="col-3">
-              <table class="table table-striped table-bordered" style="max-width: none; width: auto;" id="sailorTable">
+              <table class="table table-striped table-bordered"  id="sailorTable">
                 <thead>
                 <tr>
                   <th></th>
@@ -58,72 +58,78 @@
                 </tbody>
               </table>
             </div>
-            <div class="col-8">
+            <div class="col-9">
               <div id="historyDetailDiv">
                 <div class="mb-3 row">
-                  <label class="col-sm-1 col-form-label text-center">선박명</label>
+                  <label class="col-sm-2 col-form-label col-form-label-sm text-center">선박명</label>
-                  <div class="col-sm-2">
+                  <div class="col-4">
-                    <input class="form-control" name="boatNameKr" readonly>
+                    <input class="form-control form-control-sm" name="boatNameKr" readonly>
                   </div>
                 </div>
                 <div class="mb-3 row">
-                  <label class="col-sm-1 col-form-label text-center">선원명(한글)</label>
+                  <label class="col-sm-2 col-form-label col-form-label-sm text-center">선원명(한글)</label>
-                  <div class="col-sm-2">
+                  <div class="col-4">
-                    <input class="form-control" name="sailorNameKr" readonly>
+                    <input class="form-control form-control-sm" name="sailorNameKr" readonly>
                   </div>
-                  <label class="col-sm-1 col-form-label text-center">선원명(중문)</label>
+                  <label class="col-sm-2 col-form-label col-form-label-sm text-center">선원명(중문)</label>
-                  <div class="col-sm-2">
+                  <div class="col-4">
-                    <input class="form-control" name="sailorNameCn" readonly>
+                    <input class="form-control form-control-sm" name="sailorNameCn" readonly>
-                  </div>
-                  <label class="col-sm-1 col-form-label text-center">생년월일</label>
-                  <div class="col-sm-2">
-                    <input class="form-control" name="birthdate" readonly>
                   </div>
                 </div>
                 <div class="mb-3 row">
-                  <label class="col-sm-1 col-form-label text-center">거주지</label>
+                  <label class="col-sm-2 col-form-label col-form-label-sm text-center">생년월일</label>
-                  <div class="col-sm-2">
+                  <div class="col-4">
-                    <input class="form-control" name="residence" readonly>
+                    <input class="form-control form-control-sm" name="birthdate" readonly>
                   </div>
-                  <label class="col-sm-1 col-form-label text-center">학력</label>
+                  <label class="col-sm-2 col-form-label col-form-label-sm text-center">거주지</label>
-                  <div class="col-sm-2">
+                  <div class="col-4">
-                    <input class="form-control" name="education" readonly>
+                    <input class="form-control form-control-sm" name="residence" readonly>
-                  </div>
-                  <label class="col-sm-1 col-form-label text-center">선박 내 직책</label>
-                  <div class="col-sm-2">
-                    <input class="form-control" name="position" readonly>
                   </div>
                 </div>
                 <div class="mb-3 row">
-                  <label class="col-sm-1 col-form-label text-center">승선경력</label>
+                  <label class="col-sm-2 col-form-label col-form-label-sm text-center">학력</label>
-                  <div class="col-sm-2">
+                  <div class="col-4">
-                    <input class="form-control" name="career" readonly>
+                    <input class="form-control form-control-sm" name="education" readonly>
                   </div>
-                  <label class="col-sm-1 col-form-label text-center">동종 범죄경력</label>
+                  <label class="col-sm-2 col-form-label col-form-label-sm text-center">선박 내 직책</label>
-                  <div class="col-sm-2">
+                  <div class="col-4">
-                    <input class="form-control" name="similarCriminalHistory" readonly>
+                    <input class="form-control form-control-sm" name="position" readonly>
-                  </div>
-                  <label class="col-sm-1 col-form-label text-center">이종 범죄경력</label>
-                  <div class="col-sm-2">
-                    <input class="form-control" name="heterogeneousCriminalHistory" readonly>
-                  </div>
-                  <label class="col-sm-1 col-form-label text-center">검거이력<br>(나포이력, 선원 포함)</label>
-                  <div class="col-sm-2">
-                    <input class="form-control" name="arrestHistory" readonly>
                   </div>
                 </div>
                 <div class="mb-3 row">
-                  <label class="col-sm-1 col-form-label text-center">범죄경력<br>세부내용</label>
+                  <label class="col-sm-2 col-form-label col-form-label-sm text-center">승선경력</label>
-                  <div class="col-sm-2">
+                  <div class="col-4">
-                    <input class="form-control" name="criminalHistoryDetail" readonly>
+                    <input class="form-control form-control-sm" name="career" readonly>
                   </div>
-                  <label class="col-sm-1 col-form-label text-center">임금<br>(월급여)</label>
+                  <label class="col-sm-2 col-form-label col-form-label-sm text-center">검거이력<br>(나포이력, 선원 포함)</label>
-                  <div class="col-sm-2">
+                  <div class="col-4">
-                    <input class="form-control" name="monthlyWages" readonly>
+                    <input class="form-control form-control-sm" name="arrestHistory" readonly>
                   </div>
-                  <label class="col-sm-1 col-form-label text-center">비고</label>
+                </div>
-                  <div class="col-sm-2">
+                <div class="mb-3 row">
-                    <input class="form-control" name="note" readonly>
+                  <label class="col-sm-2 col-form-label col-form-label-sm text-center">동종 범죄경력</label>
+                  <div class="col-4">
+                    <input class="form-control form-control-sm" name="similarCriminalHistory" readonly>
+                  </div>
+                  <label class="col-sm-2 col-form-label col-form-label-sm text-center">이종 범죄경력</label>
+                  <div class="col-4">
+                    <input class="form-control form-control-sm" name="heterogeneousCriminalHistory" readonly>
+                  </div>
+                </div>
+                <div class="mb-3 row">
+                  <label class="col-sm-2 col-form-label col-form-label-sm text-center">범죄경력<br>세부내용</label>
+                  <div class="col-4">
+                    <input class="form-control form-control-sm" name="criminalHistoryDetail" readonly>
+                  </div>
+                </div>
+                <div class="mb-3 row">
+                  <label class="col-sm-2 col-form-label col-form-label-sm text-center">비고</label>
+                  <div class="col-4">
+                    <input class="form-control form-control-sm" name="note" readonly>
+                  </div>
+                  <label class="col-sm-2 col-form-label col-form-label-sm text-center">임금<br>(월급여)</label>
+                  <div class="col-4">
+                    <input class="form-control form-control-sm" name="monthlyWages" readonly>
                   </div>
                 </div>
               </div>

src/main/resources/templates/faStatistics/sailor/sailorViewModal.html

@@ -34,13 +34,13 @@
         <input type="hidden" name="wrtDt" th:value="${#temporals.format(sailor.wrtDt, 'yyyy-MM-dd HH:mm')}">
         <input type="hidden" id="saveYn" name="saveYn">
         <div class="mb-3 row">
-          <label class="col-sm-1 col-form-label text-center">선박명</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">선박명</label>
           <div class="col-sm-2">
-            <input class="form-control" name="boatNameKr" id="boatNameKr" th:value="${sailor.fishingBoat.boatNameKr}">
+            <input class="form-control form-control-sm" name="boatNameKr" id="boatNameKr" th:value="${sailor.fishingBoat.boatNameKr}" readonly>
           </div>
-          <label class="col-sm-1 col-form-label text-center">단속경찰서</label>
+          <label 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" name="crackdownPolice" id="crackdownPolice">
+            <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}"
@@ -49,33 +49,36 @@
               <option value="etc" th:selected="${sailor.crackdownStatus.crackdownPolice ne null && sailor.crackdownStatus.crackdownPolice ne '' && !#strings.contains(sailor.crackdownStatus.crackdownPolice, 'CPO')}">직접입력</option>
             </select>
           </div>
-          <label class="col-sm-1 col-form-label text-center">단속함정</label>
+          <label 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" name="crackdownBoat" id="crackdownBoat">
+            <select class="form-select form-select-sm" name="crackdownBoat" id="crackdownBoat" disabled>
               <option value="">선택</option>
-              <th:block th:each="commonCode:${session.commonCode.get('CDB')}">
+              <th:block th:each="num : ${#numbers.sequence(1,#lists.size(session.commonCode.get('CPO')))}">
-                <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
+                <th:block th:if="${'CPO'+num == sailor.crackdownStatus.crackdownPolice}" th:each="commonCode:${session.commonCode.get('CPO'+num)}">
-                        th:selected="${commonCode.itemCd eq sailor.crackdownStatus.crackdownBoat}"></option>
+                  <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
+                          th:selected="${commonCode.itemCd eq sailor.crackdownStatus.crackdownBoat}"></option>
+                </th:block>
               </th:block>
               <option value="etc" th:selected="${sailor.crackdownStatus.crackdownBoat ne null && sailor.crackdownStatus.crackdownBoat ne '' && !#strings.contains(sailor.crackdownStatus.crackdownBoat, 'CPO')}">직접입력</option>
             </select>
           </div>
         </div>
         <div class="mb-3 row">
-          <label class="col-sm-1 col-form-label text-center">위반장소</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">위반장소</label>
           <div class="col-sm-2">
-            <input class="form-control" placeholder="위도" name="napoSeaPointLat" th:value="${sailor.crackdownStatus.napoSeaPointLat}">
+            <input class="form-control form-control-sm" placeholder="위도" name="napoSeaPointLat" th:value="${sailor.crackdownStatus.napoSeaPointLat}" readonly>
-            <input class="form-control" placeholder="경도" name="napoSeaPointLon" th:value="${sailor.crackdownStatus.napoSeaPointLon}">
+            <input class="form-control form-control-sm" placeholder="경도" name="napoSeaPointLon" th:value="${sailor.crackdownStatus.napoSeaPointLon}" readonly>
-            <input class="form-control" placeholder="상세내용" name="napoSeaPointDetail" th:value="${sailor.crackdownStatus.napoSeaPointDetail}">
+            <input class="form-control form-control-sm" placeholder="상세내용" name="napoSeaPointDetail" th:value="${sailor.crackdownStatus.napoSeaPointDetail}" readonly>
           </div>
+        </div>
+        <div class="mb-3 row">
           <div class="col-sm-1">
-            <label class="col-form-label text-center">위반내용</label>
+            <label class="col-form-label col-form-label-sm text-center">위반내용</label>
-            <button type="button" class="btn btn-primary col-auto" id="violationAddBtn">+</button>
           </div>
           <div class="col-sm-2" id="violationDiv">
-            <th:block th:if="${#lists.isEmpty(sailor.crackdownStatus.violationList)}">
+            <th:block th:if="${#lists.isEmpty(sailor.violationList)}">
               <div class="row">
-                <select class="form-select form-select-sm violation" name="violation">
+                <select class="form-select form-select-sm violation" name="violation" disabled>
                   <option value="">선택</option>
                   <th:block th:each="commonCode:${session.commonCode.get('VT')}">
                     <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"></option>
@@ -84,50 +87,46 @@
                 </select>
               </div>
             </th:block>
-            <th:block th:if="${!#lists.isEmpty(sailor.crackdownStatus.violationList)}">
+            <th:block th:if="${!#lists.isEmpty(sailor.violationList)}">
-              <th:block th:each="violation, i : ${sailor.crackdownStatus.violationList}">
+              <th:block th:each="violation, i : ${sailor.violationList}">
                 <div class="row">
                   <input type="hidden" name="violationKey" th:value="${violation.violationKey}">
-                  <select class="form-select form-select-sm violation" name="violation">
+                  <select class="form-select form-select-sm violation" name="violation" disabled>
                     <option value="">선택</option>
                     <th:block th:each="commonCode:${session.commonCode.get('VT')}">
                       <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
-                              th:selected="${crackdownStatus.violationList != null and commonCode.itemCd eq violation.violation}"></option>
+                              th:selected="${sailor.violationList != null and commonCode.itemCd eq violation.violation}"></option>
                     </th:block>
                     <option th:selected="${violation.violation ne null && !#strings.contains(violation.violation, 'VT')}" value="etc">직접입력</option>
                   </select>
                   <th:block th:if="${violation.violation ne null and !#strings.contains(violation.violation, 'VT')}">
                     <div class="col-auto">
-                      <input type="text" class="form-control" name="violationEtc" th:value="${violation.violation}">
+                      <input type="text" class="form-control form-control-sm" name="violationEtc" th:value="${violation.violation}" readonly>
                     </div>
                   </th:block>
-                  <th:block th:if="${i.index > 0}">
-                    <button type="button" class="btn btn-primary col-auto" id="violationRemoveBtn">-</button>
-                    <input type="hidden" name="violationKey" th:value="${violation.violationKey}">
-                  </th:block>
                 </div>
               </th:block>
             </th:block>
           </div>
         </div>
         <div class="mb-3 row">
-          <label class="col-sm-1 col-form-label text-center">선원명(한글)</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">선원명(한글)</label>
           <div class="col-sm-2">
-            <input class="form-control" name="sailorNameKr" id="sailorNameKr" th:value="${sailor.sailorNameKr}">
+            <input class="form-control form-control-sm" name="sailorNameKr" id="sailorNameKr" th:value="${sailor.sailorNameKr}" readonly>
           </div>
-          <label class="col-sm-1 col-form-label text-center">선원명(중문)</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">선원명(중문)</label>
           <div class="col-sm-2">
-            <input class="form-control" name="sailorNameCn" id="sailorNameCn" th:value="${sailor.sailorNameCn}">
+            <input class="form-control form-control-sm" name="sailorNameCn" id="sailorNameCn" th:value="${sailor.sailorNameCn}" readonly>
           </div>
-          <label class="col-sm-1 col-form-label text-center">생년월일</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">생년월일</label>
           <div class="col-sm-2">
-            <input class="form-control" name="birthdate" id="birthdate" th:value="${#temporals.format(sailor.birthdate, 'yyyy-MM-dd')}">
+            <input class="form-control form-control-sm" name="birthdate" id="birthdate" th:value="${#temporals.format(sailor.birthdate, 'yyyy-MM-dd')}" readonly>
           </div>
         </div>
         <div class="mb-3 row">
-          <label class="col-sm-1 col-form-label text-center">거주지</label>
+          <label 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" name="residence">
+            <select class="form-select form-select-sm" name="residence" disabled>
               <option value="">선택</option>
               <th:block th:each="commonCode:${session.commonCode.get('RSC')}">
                 <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
@@ -135,9 +134,9 @@
               </th:block>
             </select>
           </div>
-          <label class="col-sm-1 col-form-label text-center">학력</label>
+          <label 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" name="residence">
+            <select class="form-select form-select-sm" name="residence" disabled>
               <option value="">선택</option>
               <th:block th:each="commonCode:${session.commonCode.get('SED')}">
                 <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
@@ -145,9 +144,9 @@
               </th:block>
             </select>
           </div>
-          <label class="col-sm-1 col-form-label text-center">선박 내 직책</label>
+          <label 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" name="residence">
+            <select class="form-select form-select-sm" name="residence" disabled>
               <option value="">선택</option>
               <th:block th:each="commonCode:${session.commonCode.get('POS')}">
                 <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
@@ -157,9 +156,9 @@
           </div>
         </div>
         <div class="mb-3 row">
-          <label class="col-sm-1 col-form-label text-center">승선경력</label>
+          <label 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" name="career">
+            <select class="form-select form-select-sm" name="career" disabled>
               <option value="">선택</option>
               <th:block th:each="commonCode:${session.commonCode.get('BE')}">
                 <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
@@ -167,9 +166,9 @@
               </th:block>
             </select>
           </div>
-          <label class="col-sm-1 col-form-label text-center">동종 범죄경력</label>
+          <label 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" name="similarCriminalHistory">
+            <select class="form-select form-select-sm" name="similarCriminalHistory" disabled>
               <option value="">선택</option>
               <option value="1" th:selected="${sailor.similarCriminalHistory == 1}">1건</option>
               <option value="2" th:selected="${sailor.similarCriminalHistory == 2}">2건</option>
@@ -178,9 +177,9 @@
               <option value="0" th:selected="${sailor.similarCriminalHistory == 0}">없음</option>
             </select>
           </div>
-          <label class="col-sm-1 col-form-label text-center">이종 범죄경력</label>
+          <label 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" name="heterogeneousCriminalHistory">
+            <select class="form-select form-select-sm" name="heterogeneousCriminalHistory" disabled>
               <option value="">선택</option>
               <option value="1" th:selected="${sailor.heterogeneousCriminalHistory == 1}">1건</option>
               <option value="2" th:selected="${sailor.heterogeneousCriminalHistory == 2}">2건</option>
@@ -189,9 +188,9 @@
               <option value="0" th:selected="${sailor.heterogeneousCriminalHistory == 0}">없음</option>
             </select>
           </div>
-          <label class="col-sm-1 col-form-label text-center">검거이력<br>(나포이력, 선원 포함)</label>
+          <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="arrestHistory">
+            <select class="form-select form-select-sm" name="arrestHistory" disabled>
               <option value="">선택</option>
               <option value="1" th:selected="${sailor.arrestHistory == 1}">1건</option>
               <option value="2" th:selected="${sailor.arrestHistory == 2}">2건</option>
@@ -202,17 +201,17 @@
           </div>
         </div>
         <div class="mb-3 row">
-          <label class="col-sm-1 col-form-label text-center">범죄경력<br>세부내용</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">범죄경력<br>세부내용</label>
           <div class="col-sm-2">
-            <input class="form-control" name="note" th:value="${sailor.criminalHistoryDetail}">
+            <input class="form-control form-control-sm" name="note" th:value="${sailor.criminalHistoryDetail}" readonly>
           </div>
-          <label class="col-sm-1 col-form-label text-center">임금<br>(월급여)</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">임금<br>(월급여)</label>
           <div class="col-sm-2">
-            <input class="form-control" name="note" th:value="${sailor.monthlyWages}">
+            <input class="form-control form-control-sm" name="note" th:value="${sailor.monthlyWages}" readonly>
           </div>
-          <label class="col-sm-1 col-form-label text-center">비고</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">비고</label>
           <div class="col-sm-2">
-            <input class="form-control" name="note" th:value="${sailor.note}">
+            <input class="form-control form-control-sm" name="note" th:value="${sailor.note}" readonly>
           </div>
         </div>
       </form>