From 6a1aa0b7c9db17c982b3dad2001d5ebb52ce3726 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=B5=9C=EA=B0=95=EC=84=9D?= <cks0504_p@daum.net>
Date: Tue, 8 Aug 2023 14:46:39 +0900
Subject: [PATCH] =?UTF-8?q?Revert=20"=EB=B6=88=EB=B2=95=EC=A1=B0=EC=97=85?=
 =?UTF-8?q?=20=EC=99=B8=EA=B5=AD=EC=96=B4=EC=84=A0=20=ED=86=B5=EA=B3=84=20?=
 =?UTF-8?q?=EC=9E=91=EC=97=85=EC=A4=91."?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 98ae3b66c72df181241c85416d93120cd5e797a9.
---
 .../UnlawfulFishingController.java            |  3 +-
 .../model/sailor/SailorBaseEntity.java        |  3 --
 .../mybatisMapper/UnlawfulFishingMapper.xml   |  1 -
 .../unlawfulFishing/illegalShipSailor.js      |  1 -
 .../illegalShipInfo/isiEditModal.html         |  6 ++--
 .../illegalShipInfo/isiHistoryDiv.html        |  4 +--
 .../illegalShipInfo/isiViewModal.html         |  4 +--
 .../illegalShipSailorPage.html                |  5 ---
 .../illegalShipSailor/issAddModal.html        | 32 +++++--------------
 .../illegalShipSailor/issEditModal.html       | 16 +++-------
 .../illegalShipSailor/issHistoryDiv.html      | 17 ++++------
 .../illegalShipSailor/issViewModal.html       | 23 ++++++-------
 .../shipProcessInfo/spiViewModal.html         |  4 +--
 .../statistics/statistics.html                |  8 +++--
 14 files changed, 43 insertions(+), 84 deletions(-)

diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/UnlawfulFishingController.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/UnlawfulFishingController.java
index 72e72eed..4c06cd9a 100644
--- a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/UnlawfulFishingController.java
+++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/UnlawfulFishingController.java
@@ -398,10 +398,9 @@ public class UnlawfulFishingController {
       case "type1":
         break;
       case "type2":
-        mav.addObject("organConfigList", organConfigService.selectOrganListToUnlawfulFishingStatistics());
         break;
       case "type3":
-
+        mav.addObject("organConfigList", organConfigService.selectOrganListToUnlawfulFishingStatistics());
         break;
     }
 
diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/sailor/SailorBaseEntity.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/sailor/SailorBaseEntity.java
index 3ed6408c..6a926812 100644
--- a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/sailor/SailorBaseEntity.java
+++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/sailor/SailorBaseEntity.java
@@ -84,7 +84,4 @@ public class SailorBaseEntity extends BaseModel {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     private LocalDateTime wrtDt;
 
-    @Column(name="detention_yn")
-    private String detentionYn;
-
 }
diff --git a/src/main/resources/mybatisMapper/UnlawfulFishingMapper.xml b/src/main/resources/mybatisMapper/UnlawfulFishingMapper.xml
index 04710f68..9a7bb125 100644
--- a/src/main/resources/mybatisMapper/UnlawfulFishingMapper.xml
+++ b/src/main/resources/mybatisMapper/UnlawfulFishingMapper.xml
@@ -272,7 +272,6 @@
           ci.case_num ,
           iss.sailor_name_kr ,
           iss.birthdate ,
-          iss.detention_yn ,
           iss.position ,
           iss.career ,
           iss.similar_criminal_history ,
diff --git a/src/main/resources/static/js/faStatistics/unlawfulFishing/illegalShipSailor.js b/src/main/resources/static/js/faStatistics/unlawfulFishing/illegalShipSailor.js
index 7336db74..d01a288d 100644
--- a/src/main/resources/static/js/faStatistics/unlawfulFishing/illegalShipSailor.js
+++ b/src/main/resources/static/js/faStatistics/unlawfulFishing/illegalShipSailor.js
@@ -82,7 +82,6 @@ $(document).on('click', '.saveAllInfoBtn', function (){
         sailorNameKr: sailorDiv.find(".sailorNameKr").val(),
         sailorNameCn: sailorDiv.find(".sailorNameCn").val(),
         birthdate: sailorDiv.find(".birthdate").val(),
-        detentionYn: sailorDiv.find(".detentionYn").val(),
         residence: sailorDiv.find(".residence").val(),
         education: sailorDiv.find(".education").val(),
         position: sailorDiv.find(".position").val(),
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiEditModal.html b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiEditModal.html
index f0b01be0..530c1d89 100644
--- a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiEditModal.html
+++ b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiEditModal.html
@@ -112,17 +112,17 @@
       </div>
       <label for="offenseAmount" class="col-sm-1 col-form-label col-form-label-sm text-center fs-11">범칙물 위판금액</label>
       <div class="col-sm-2">
-        <input type="text" class="form-control form-control-sm offenseInput" id="offenseAmount" name="offenseAmount" placeholder="단위: 만원" th:value="${shipInfo.offenseAmount>0?shipInfo.offenseAmount:''}" th:disabled="${shipInfo.offenseType eq null}">
+        <input type="text" class="form-control form-control-sm offenseInput" id="offenseAmount" name="offenseAmount" placeholder="단위: 원" th:value="${shipInfo.offenseAmount>0?shipInfo.offenseAmount:''}" th:disabled="${shipInfo.offenseType eq null}">
       </div>
     </div>
     <div class="row mb-1">
       <label for="depositUnpaid" class="col-sm-1 col-form-label col-form-label-sm text-center">담보금 미납액</label>
       <div class="col-sm-2">
-        <input type="text" class="form-control form-control-sm " id="depositUnpaid" name="depositUnpaid" placeholder="단위: 만원" th:value="${shipInfo.depositUnpaid>0?shipInfo.depositUnpaid:''}">
+        <input type="text" class="form-control form-control-sm " id="depositUnpaid" name="depositUnpaid" placeholder="단위: 원" th:value="${shipInfo.depositUnpaid>0?shipInfo.depositUnpaid:''}">
       </div>
       <label for="depositPayment" class="col-sm-1 col-form-label col-form-label-sm text-center">담보금 납부액</label>
       <div class="col-sm-2">
-        <input type="text" class="form-control form-control-sm " id="depositPayment" name="depositPayment" placeholder="단위: 만원" th:value="${shipInfo.depositPayment>0?shipInfo.depositPayment:''}">
+        <input type="text" class="form-control form-control-sm " id="depositPayment" name="depositPayment" placeholder="단위: 원" th:value="${shipInfo.depositPayment>0?shipInfo.depositPayment:''}">
       </div>
       <label for="depositPaymentDt" class="col-sm-1 col-form-label col-form-label-sm text-center">담보금 납부일</label>
       <div class="col-sm-2">
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiHistoryDiv.html b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiHistoryDiv.html
index be06e14a..5af38995 100644
--- a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiHistoryDiv.html
+++ b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiHistoryDiv.html
@@ -70,11 +70,11 @@
 <div class="row border border-secondary border-top-0">
   <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">담보금 미납액</label>
   <label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
-    <th:block th:if="${shipInfo.depositUnpaid>0}" th:text="|${#numbers.formatInteger(shipInfo.depositUnpaid,1,'COMMA')}만원|"></th:block>
+    <th:block th:if="${shipInfo.depositUnpaid>0}" th:text="|${#numbers.formatInteger(shipInfo.depositUnpaid,1,'COMMA')}원|"></th:block>
   </label>
   <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">담보금 납부액</label>
   <label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
-    <th:block th:if="${shipInfo.depositPayment>0}" th:text="|${#numbers.formatInteger(shipInfo.depositPayment,1,'COMMA')}만원|"></th:block>
+    <th:block th:if="${shipInfo.depositPayment>0}" th:text="|${#numbers.formatInteger(shipInfo.depositPayment,1,'COMMA')}원|"></th:block>
   </label>
   <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center fs-11">담보금 납부일</label>
   <div class="col-sm-2">
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiViewModal.html b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiViewModal.html
index b8b87ea6..f67e78c4 100644
--- a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiViewModal.html
+++ b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiViewModal.html
@@ -101,11 +101,11 @@
       <div class="row border border-secondary border-top-0">
         <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">담보금 미납액</label>
         <label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
-          <th:block th:if="${shipInfo.depositUnpaid>0}" th:text="|${#numbers.formatInteger(shipInfo.depositUnpaid,1,'COMMA')}만원|"></th:block>
+          <th:block th:if="${shipInfo.depositUnpaid>0}" th:text="|${#numbers.formatInteger(shipInfo.depositUnpaid,1,'COMMA')}원|"></th:block>
         </label>
         <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">담보금 납부액</label>
         <label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
-          <th:block th:if="${shipInfo.depositPayment>0}" th:text="|${#numbers.formatInteger(shipInfo.depositPayment,1,'COMMA')}만원|"></th:block>
+          <th:block th:if="${shipInfo.depositPayment>0}" th:text="|${#numbers.formatInteger(shipInfo.depositPayment,1,'COMMA')}원|"></th:block>
         </label>
         <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">담보금 납부일</label>
         <div class="col-sm-2">
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/illegalShipSailorPage.html b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/illegalShipSailorPage.html
index f25916b2..ab801b7f 100644
--- a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/illegalShipSailorPage.html
+++ b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/illegalShipSailorPage.html
@@ -123,7 +123,6 @@
                       <th>사건번호</th>
                       <th>어선명</th>
                       <th>선원명</th>
-                      <th>구속여부</th>
                       <th>생년월일</th>
                       <th>선박직책</th>
                       <th>승선경력</th>
@@ -141,10 +140,6 @@
                         <td th:text="${sailor.caseNum}"></td>
                         <td th:text="${sailor.boatNameKr}"></td>
                         <td th:text="${sailor.sailorNameKr}"></td>
-                        <td>
-                          <th:block th:text="${sailor.detentionYn eq 'Y'?'구속':''}"></th:block>
-                          <th:block th:text="${sailor.detentionYn eq 'N'?'불구속':''}"></th:block>
-                        </td>
                         <td th:text="${sailor.birthdate}"></td>
                         <td>
                           <th:block th:each="code:${session.commonCode.get('POS')}">
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issAddModal.html b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issAddModal.html
index 13dafe2b..c53ab499 100644
--- a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issAddModal.html
+++ b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issAddModal.html
@@ -45,14 +45,6 @@
           </div>
         </div>
         <div class="row mb-1">
-          <label class="col-sm-2 col-form-label col-form-label-sm text-center">구속여부</label>
-          <div class="col-sm-2">
-            <select class="form-select form-select-sm detentionYn">
-              <option value="">선택</option>
-              <option value="Y">구속</option>
-              <option value="N">불구속</option>
-            </select>
-          </div>
           <label class="col-sm-2 col-form-label col-form-label-sm text-center">거주지</label>
           <div class="col-sm-2">
             <select class="form-select form-select-sm residence">
@@ -71,8 +63,6 @@
               </th:block>
             </select>
           </div>
-        </div>
-        <div class="row mb-1">
           <label class="col-sm-2 col-form-label col-form-label-sm text-center">선박 내 직책</label>
           <div class="col-sm-2">
             <select class="form-select form-select-sm position">
@@ -82,6 +72,8 @@
               </th:block>
             </select>
           </div>
+        </div>
+        <div class="row mb-1">
           <label class="col-sm-2 col-form-label col-form-label-sm text-center">승선경력</label>
           <div class="col-sm-2">
             <select class="form-select form-select-sm career">
@@ -102,8 +94,6 @@
               <option value="0">없음</option>
             </select>
           </div>
-        </div>
-        <div class="row mb-1">
           <label class="col-sm-2 col-form-label col-form-label-sm text-center">이종 범죄경력</label>
           <div class="col-sm-2">
             <select class="form-select form-select-sm heterogeneousCriminalHistory">
@@ -115,6 +105,8 @@
               <option value="0">없음</option>
             </select>
           </div>
+        </div>
+        <div class="row mb-1">
           <label class="col-sm-2 col-form-label col-form-label-sm text-center">임금</label>
           <div class="col-sm-2">
             <input class="form-control form-control-sm monthlyWages" placeholder="(0.000위안/월)">
@@ -177,14 +169,6 @@
       </div>
     </div>
     <div class="row mb-1">
-      <label class="col-sm-2 col-form-label col-form-label-sm text-center">구속여부</label>
-      <div class="col-sm-2">
-        <select class="form-select form-select-sm detentionYn">
-          <option value="">선택</option>
-          <option value="Y">구속</option>
-          <option value="N">불구속</option>
-        </select>
-      </div>
       <label class="col-sm-2 col-form-label col-form-label-sm text-center">거주지</label>
       <div class="col-sm-2">
         <select class="form-select form-select-sm residence">
@@ -203,8 +187,6 @@
           </th:block>
         </select>
       </div>
-    </div>
-    <div class="row mb-1">
       <label class="col-sm-2 col-form-label col-form-label-sm text-center">선박 내 직책</label>
       <div class="col-sm-2">
         <select class="form-select form-select-sm position">
@@ -214,6 +196,8 @@
           </th:block>
         </select>
       </div>
+    </div>
+    <div class="row mb-1">
       <label class="col-sm-2 col-form-label col-form-label-sm text-center">승선경력</label>
       <div class="col-sm-2">
         <select class="form-select form-select-sm career">
@@ -234,8 +218,6 @@
           <option value="0">없음</option>
         </select>
       </div>
-    </div>
-    <div class="row mb-1">
       <label class="col-sm-2 col-form-label col-form-label-sm text-center">이종 범죄경력</label>
       <div class="col-sm-2">
         <select class="form-select form-select-sm heterogeneousCriminalHistory">
@@ -247,6 +229,8 @@
           <option value="0">없음</option>
         </select>
       </div>
+    </div>
+    <div class="row mb-1">
       <label class="col-sm-2 col-form-label col-form-label-sm text-center">임금</label>
       <div class="col-sm-2">
         <input class="form-control form-control-sm monthlyWages" placeholder="(0.000위안/월)">
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issEditModal.html b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issEditModal.html
index 23ec3e4d..b3b5e708 100644
--- a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issEditModal.html
+++ b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issEditModal.html
@@ -40,14 +40,6 @@
         </div>
       </div>
       <div class="row mb-1">
-        <label class="col-sm-2 col-form-label col-form-label-sm text-center">구속여부</label>
-        <div class="col-sm-2">
-          <select class="form-select form-select-sm detentionYn">
-            <option value="">선택</option>
-            <option value="Y" th:selected="${illegalShipSailor.detentionYn eq 'Y'}">구속</option>
-            <option value="N" th:selected="${illegalShipSailor.detentionYn eq 'N'}">불구속</option>
-          </select>
-        </div>
         <label class="col-sm-2 col-form-label col-form-label-sm text-center">거주지</label>
         <div class="col-sm-2">
           <select class="form-select form-select-sm" name="residence">
@@ -68,8 +60,6 @@
             </th:block>
           </select>
         </div>
-      </div>
-      <div class="row mb-1">
         <label class="col-sm-2 col-form-label col-form-label-sm text-center">선박 내 직책</label>
         <div class="col-sm-2">
           <select class="form-select form-select-sm" name="position">
@@ -80,6 +70,8 @@
             </th:block>
           </select>
         </div>
+      </div>
+      <div class="row mb-1">
         <label class="col-sm-2 col-form-label col-form-label-sm text-center">승선경력</label>
         <div class="col-sm-2">
           <select class="form-select form-select-sm" name="career">
@@ -101,8 +93,6 @@
             <option value="0" th:selected="${illegalShipSailor.similarCriminalHistory == 0}">없음</option>
           </select>
         </div>
-      </div>
-      <div class="row mb-1">
         <label class="col-sm-2 col-form-label col-form-label-sm text-center">이종 범죄경력</label>
         <div class="col-sm-2">
           <select class="form-select form-select-sm" name="heterogeneousCriminalHistory">
@@ -114,6 +104,8 @@
             <option value="0" th:selected="${illegalShipSailor.heterogeneousCriminalHistory == 0}">없음</option>
           </select>
         </div>
+      </div>
+      <div class="row mb-1">
         <label class="col-sm-2 col-form-label col-form-label-sm text-center">임금</label>
         <div class="col-sm-2">
           <input class="form-control form-control-sm" name="monthlyWages" placeholder="(0.000위안/월)" th:value="${illegalShipSailor.monthlyWages}">
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issHistoryDiv.html b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issHistoryDiv.html
index 212c6583..49e21044 100644
--- a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issHistoryDiv.html
+++ b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issHistoryDiv.html
@@ -10,19 +10,14 @@
   <label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start" th:text="${illegalShipSailor.sailorNameCn}"></label>
   <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">생년월일</label>
   <label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start" th:text="${illegalShipSailor.birthdate}"></label>
-  <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">구속여부</label>
-  <label class="col-sm-2 col-form-label col-form-label py-2 text-start">
-    <th:block th:text="${illegalShipSailor.detentionYn eq 'Y'?'구속':''}"></th:block>
-    <th:block th:text="${illegalShipSailor.detentionYn eq 'N'?'불구속':''}"></th:block>
-  </label>
-</div>
-<div class="row border border-secondary border-top-0">
   <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">거주지</label>
-  <label class="col-sm-2 col-form-label col-form-label border-end border-secondary py-2 text-start">
+  <label class="col-sm-2 col-form-label col-form-label py-2 text-start">
     <th:block th:each="code:${session.commonCode.get('RSC')}">
       <th:block th:if="${code.itemCd eq illegalShipSailor.residence}" th:text="${code.itemValue}"></th:block>
     </th:block>
   </label>
+</div>
+<div class="row border border-secondary border-top-0">
   <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">학력</label>
   <label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
     <th:block th:each="code:${session.commonCode.get('SED')}">
@@ -41,15 +36,15 @@
       <th:block th:if="${code.itemCd eq illegalShipSailor.career}" th:text="${code.itemValue}"></th:block>
     </th:block>
   </label>
-</div>
-<div class="row border border-secondary border-top-0">
   <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center fs-12">동종 범죄경력</label>
   <label class="col-sm-2 col-form-label col-form-label py-2 text-start" th:text="|${illegalShipSailor.similarCriminalHistory}건|"></label>
+</div>
+<div class="row border border-secondary border-top-0">
   <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center fs-12">이종 범죄경력</label>
   <label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start" th:text="|${illegalShipSailor.heterogeneousCriminalHistory}건|"></label>
   <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">임금</label>
   <label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start" th:text="|${illegalShipSailor.monthlyWages}건|"></label>
-  <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">검거이력<br/>(나포이력, 선원 포함)</label>
+  <label class="col-sm-2 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">검거이력<br/>(나포이력, 선원 포함)</label>
   <label class="col-sm-2 col-form-label col-form-label py-2 border-secondary text-start" th:text="|${illegalShipSailor.arrestHistory}건|"></label>
 </div>
 <div class="row border border-secondary border-top-0">
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issViewModal.html b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issViewModal.html
index 7d414726..e9c127f3 100644
--- a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issViewModal.html
+++ b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issViewModal.html
@@ -42,19 +42,14 @@
         <label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start" th:text="${illegalShipSailor.sailorNameCn}"></label>
         <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">생년월일</label>
         <label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start" th:text="${illegalShipSailor.birthdate}"></label>
-        <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 text-center">구속여부</label>
-        <label class="col-sm-2 col-form-label col-form-label py-2 text-start">
-          <th:block th:text="${illegalShipSailor.detentionYn eq 'Y'?'구속':''}"></th:block>
-          <th:block th:text="${illegalShipSailor.detentionYn eq 'N'?'불구속':''}"></th:block>
-        </label>
-      </div>
-      <div class="row border border-secondary border-top-0">
         <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">거주지</label>
-        <label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
+        <label class="col-sm-2 col-form-label col-form-label py-2 text-start">
           <th:block th:each="code:${session.commonCode.get('RSC')}">
             <th:block th:if="${code.itemCd eq illegalShipSailor.residence}" th:text="${code.itemValue}"></th:block>
           </th:block>
         </label>
+      </div>
+      <div class="row border border-secondary border-top-0">
         <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">학력</label>
         <label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
           <th:block th:each="code:${session.commonCode.get('SED')}">
@@ -68,20 +63,20 @@
           </th:block>
         </label>
         <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">승선경력</label>
-        <label class="col-sm-2 col-form-label col-form-label py-2 border-secondary text-start">
+        <label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
           <th:block th:each="code:${session.commonCode.get('BE')}">
             <th:block th:if="${code.itemCd eq illegalShipSailor.career}" th:text="${code.itemValue}"></th:block>
           </th:block>
         </label>
+        <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center fs-12">동종 범죄경력</label>
+        <label class="col-sm-2 col-form-label col-form-label py-2 text-start" th:text="|${illegalShipSailor.similarCriminalHistory}건|"></label>
       </div>
       <div class="row border border-secondary border-top-0">
-        <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center fs-12">동종 범죄경력</label>
-        <label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start" th:text="|${illegalShipSailor.similarCriminalHistory}건|"></label>
         <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center fs-12">이종 범죄경력</label>
         <label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start" th:text="|${illegalShipSailor.heterogeneousCriminalHistory}건|"></label>
         <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">임금</label>
         <label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start" th:text="|${illegalShipSailor.monthlyWages}건|"></label>
-        <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">검거이력<br/>(나포이력, 선원 포함)</label>
+        <label class="col-sm-2 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">검거이력<br/>(나포이력, 선원 포함)</label>
         <label class="col-sm-2 col-form-label col-form-label py-2 border-secondary text-start" th:text="|${illegalShipSailor.arrestHistory}건|"></label>
       </div>
       <div class="row border border-secondary border-top-0">
@@ -161,11 +156,11 @@
       <div class="row border border-secondary border-top-0">
         <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">담보금 미납액</label>
         <label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
-          <th:block th:if="${shipInfo.depositUnpaid>0}" th:text="|${#numbers.formatInteger(shipInfo.depositUnpaid,1,'COMMA')}만원|"></th:block>
+          <th:block th:if="${shipInfo.depositUnpaid>0}" th:text="|${#numbers.formatInteger(shipInfo.depositUnpaid,1,'COMMA')}원|"></th:block>
         </label>
         <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">담보금 납부액</label>
         <label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
-          <th:block th:if="${shipInfo.depositPayment>0}" th:text="|${#numbers.formatInteger(shipInfo.depositPayment,1,'COMMA')}만원|"></th:block>
+          <th:block th:if="${shipInfo.depositPayment>0}" th:text="|${#numbers.formatInteger(shipInfo.depositPayment,1,'COMMA')}원|"></th:block>
         </label>
         <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center fs-11">담보금 납부일</label>
         <div class="col-sm-2">
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/spiViewModal.html b/src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/spiViewModal.html
index 68ad7028..4724877d 100644
--- a/src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/spiViewModal.html
+++ b/src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/spiViewModal.html
@@ -199,11 +199,11 @@
       <div class="row border border-secondary border-top-0">
         <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">담보금 미납액</label>
         <label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
-          <th:block th:if="${shipInfo.depositUnpaid>0}" th:text="|${#numbers.formatInteger(shipInfo.depositUnpaid,1,'COMMA')}만원|"></th:block>
+          <th:block th:if="${shipInfo.depositUnpaid>0}" th:text="|${#numbers.formatInteger(shipInfo.depositUnpaid,1,'COMMA')}원|"></th:block>
         </label>
         <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">담보금 납부액</label>
         <label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
-          <th:block th:if="${shipInfo.depositPayment>0}" th:text="|${#numbers.formatInteger(shipInfo.depositPayment,1,'COMMA')}만원|"></th:block>
+          <th:block th:if="${shipInfo.depositPayment>0}" th:text="|${#numbers.formatInteger(shipInfo.depositPayment,1,'COMMA')}원|"></th:block>
         </label>
         <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center fs-11">담보금 납부일</label>
         <div class="col-sm-2">
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/statistics/statistics.html b/src/main/resources/templates/faStatistics/unlawfulFishing/statistics/statistics.html
index 28bca62f..e55bd6b3 100644
--- a/src/main/resources/templates/faStatistics/unlawfulFishing/statistics/statistics.html
+++ b/src/main/resources/templates/faStatistics/unlawfulFishing/statistics/statistics.html
@@ -7,7 +7,11 @@
 </th:block>
 <th:block layout:fragment="css">
   <style>
-
+    .backslash {
+      background: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg"><line x1="0" y1="0" x2="100%" y2="100%" stroke="gray" /></svg>');
+    }
+    .backslash { text-align: left; }
+    .backslash div { text-align: right; }
   </style>
 </th:block>
 <div layout:fragment="content">
@@ -84,7 +88,7 @@
                     </colgroup>
                     <thead class="align-middle text-center">
                     <tr class="table-secondary">
-                      <th rowspan="2">구분</th>
+                      <th class="backslash" rowspan="2"><div>경찰서</div>연도</th>
                       <th:block th:each="parent:${organConfigList}">
                         <th th:colspan="${#lists.size(parent.childList)}" th:text="${parent.organNm}"></th>
                       </th:block>