From 6fc5e1f0531d0ce398570b1634760507157ab928 Mon Sep 17 00:00:00 2001
From: TaehunPark <qkrxogns21@gmail.com>
Date: Thu, 26 Jan 2023 18:30:54 +0900
Subject: [PATCH] =?UTF-8?q?fix=20:=20=EC=99=B8=EC=82=AC=EC=9E=A5=EB=B9=84?=
 =?UTF-8?q?=20=EC=A4=91=ED=8A=B9=EB=8B=A8,=EC=84=9C=ED=8A=B9=EB=8B=A8=20?=
 =?UTF-8?q?=EC=95=88=EB=82=98=EC=98=A4=EA=B2=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mybatisMapper/EquipMapper.xml   | 14 +-------------
 .../resources/templates/equip/equipEditModal.html  |  2 ++
 .../templates/equip/equipModifyModal.html          |  2 ++
 .../resources/templates/equip/equipStatus.html     |  8 ++------
 4 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/src/main/resources/mybatisMapper/EquipMapper.xml b/src/main/resources/mybatisMapper/EquipMapper.xml
index 02080c29..50881d1f 100644
--- a/src/main/resources/mybatisMapper/EquipMapper.xml
+++ b/src/main/resources/mybatisMapper/EquipMapper.xml
@@ -17,7 +17,6 @@
 					  cnt_pyeongtaek+
 					  cnt_taean+
 					  cnt_boryeong+
-					  cnt_seotd+
 					  cnt_west+
 					  cnt_mokpo+
 					  cnt_buan+
@@ -30,7 +29,6 @@
 					  cnt_changwon+
 					  cnt_tongyong+
 					  cnt_sacheon+
-					  cnt_jungtd+
 					  cnt_east+
 					  cnt_sokcho+
 					  cnt_donghe+
@@ -45,7 +43,6 @@
 			   sum(cnt_pyeongtaek) as cnt_pyeongtaek,
 			   sum(cnt_taean) as cnt_taean,
 			   sum(cnt_boryeong) as cnt_boryeong,
-			   sum(cnt_seotd) as cnt_seotd,
 			   sum(cnt_west) as cnt_west,
 			   sum(cnt_mokpo) as cnt_mokpo,
 			   sum(cnt_buan) as cnt_buan,
@@ -58,7 +55,6 @@
 			   sum(cnt_changwon) as cnt_changwon,
 			   sum(cnt_tongyong) as cnt_tongyong,
 			   sum(cnt_sacheon) as cnt_sacheon,
-			   sum(cnt_jungtd) as cnt_jungtd,
 			   sum(cnt_east) as cnt_east,
 			   sum(cnt_sokcho) as cnt_sokcho,
 			   sum(cnt_donghe) as cnt_donghe,
@@ -175,15 +171,7 @@
 									    case 
 									   	  when b.mgt_organ = 'OG026' then b.item_qty
 									   	  else 0
-									   end as cnt_seoguipo,
-									   case 
-									   	  when b.mgt_organ = 'OG027' then b.item_qty
-									   	  else 0
-									   end as cnt_seotd,
-									   case 
-									   	  when b.mgt_organ = 'OG028' then b.item_qty
-									   	  else 0
-									   end as cnt_jungtd
+									   end as cnt_seoguipo
 								from (select category_cd,
 											   item_cd,
 											   item_value
diff --git a/src/main/resources/templates/equip/equipEditModal.html b/src/main/resources/templates/equip/equipEditModal.html
index 178c4ad4..a94cf33c 100644
--- a/src/main/resources/templates/equip/equipEditModal.html
+++ b/src/main/resources/templates/equip/equipEditModal.html
@@ -14,9 +14,11 @@
         <select class="form-select form-select-sm" id="mgtOrgan" name="mgtOrgan" th:disabled="${accessAuth ne 'ACC003'}">
           <option value="">선택</option>
           <th:block th:each="commonCode:${session.commonCode.get('OG')}">
+          <th:block th:if="${!(commonCode.itemCd eq 'OG027' or commonCode.itemCd eq 'OG028')}">
             <th:block th:if="${#lists.contains(mgtOrganList, commonCode.itemCd)}">
               <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd eq userOrgan}"></option>
             </th:block>
+            </th:block>
           </th:block>
         </select>
       </div>
diff --git a/src/main/resources/templates/equip/equipModifyModal.html b/src/main/resources/templates/equip/equipModifyModal.html
index 1e1b874c..8dbf497a 100644
--- a/src/main/resources/templates/equip/equipModifyModal.html
+++ b/src/main/resources/templates/equip/equipModifyModal.html
@@ -16,8 +16,10 @@
         <select class="form-select form-select-sm" id="mMgtOrgan" name="mgtOrgan" th:disabled="${accessAuth ne 'ACC003'}">
           <option value="">선택</option>
           <th:block th:each="commonCode:${session.commonCode.get('OG')}">
+          <th:block th:if="${!(commonCode.itemCd eq 'OG027' or commonCode.itemCd eq 'OG028')}">
             <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd} == ${equInfo.mgtOrgan}"></option>
           </th:block>
+          </th:block>
         </select>
       </div>
     </div>
diff --git a/src/main/resources/templates/equip/equipStatus.html b/src/main/resources/templates/equip/equipStatus.html
index ea4e9860..0ec4f697 100644
--- a/src/main/resources/templates/equip/equipStatus.html
+++ b/src/main/resources/templates/equip/equipStatus.html
@@ -48,9 +48,9 @@
                     <th rowspan="2">세부분류</th>
                     <th rowspan="2">총계</th>
                     <th rowspan="2">본청</th>
-                    <th colspan="6">중부</th>
+                    <th colspan="5">중부</th>
                     <th colspan="6">서해</th>
-                    <th colspan="7">남해</th>
+                    <th colspan="6">남해</th>
                     <th colspan="5">동해</th>
                     <th colspan="3">제주</th>
                   </tr>
@@ -60,7 +60,6 @@
                     <th>평택서</th>
                     <th>태안서</th>
                     <th>보령서</th>
-                    <th>서특단</th>
                     <th>청</th>
                     <th>목포서</th>
                     <th>부안서</th>
@@ -73,7 +72,6 @@
                     <th>창원서</th>
                     <th>통영서</th>
                     <th>사천서</th>
-                    <th>중특단</th>
                     <th>청</th>
                     <th>속초서</th>
                     <th>동해서</th>
@@ -95,7 +93,6 @@
                     <td th:text="${equip.cnt_pyeongtaek}"></td>
                     <td th:text="${equip.cnt_taean}"></td>
                     <td th:text="${equip.cnt_boryeong}"></td>
-                    <td th:text="${equip.cnt_seotd}"></td>
                     <td th:text="${equip.cnt_west}"></td>
                     <td th:text="${equip.cnt_mokpo}"></td>
                     <td th:text="${equip.cnt_buan}"></td>
@@ -108,7 +105,6 @@
                     <td th:text="${equip.cnt_changwon}"></td>
                     <td th:text="${equip.cnt_tongyong}"></td>
                     <td th:text="${equip.cnt_sacheon}"></td>
-                    <td th:text="${equip.cnt_jungtd}"></td>
                     <td th:text="${equip.cnt_east}"></td>
                     <td th:text="${equip.cnt_sokcho}"></td>
                     <td th:text="${equip.cnt_donghe}"></td>