From d952956bce13080abc3f3b088be0cd7370fc0fa8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= <cks0504_p@daum.net>
Date: Wed, 11 Jan 2023 12:15:54 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9A=94=EA=B5=AC=EC=82=AC=ED=95=AD=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

---
 .../fipTarget/mapper/FipTargetMapper.java     |  2 +-
 .../faisp/main/fipTarget/model/ShipInfo.java  |  4 ++--
 .../fipTarget/service/FipTargetService.java   |  2 +-
 .../resources/mybatisMapper/FipTarget.xml     |  6 ++---
 .../templates/equip/pvreUseList.html          |  4 ++--
 .../templates/fipTarget/ipShipEditModal.html  |  4 ++--
 .../templates/fipTarget/ipShipList.html       | 22 ++++++++-----------
 .../fipTarget/partInfoEditModal.html          |  4 ++--
 .../templates/fipTarget/partInfoList.html     | 20 ++++++++++-------
 .../templates/fipTarget/vulnEditModal.html    |  5 ++++-
 10 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/src/main/java/com/dbnt/faisp/main/fipTarget/mapper/FipTargetMapper.java b/src/main/java/com/dbnt/faisp/main/fipTarget/mapper/FipTargetMapper.java
index 6a93869d..d17784a6 100644
--- a/src/main/java/com/dbnt/faisp/main/fipTarget/mapper/FipTargetMapper.java
+++ b/src/main/java/com/dbnt/faisp/main/fipTarget/mapper/FipTargetMapper.java
@@ -29,7 +29,7 @@ public interface FipTargetMapper {
 
 	List<PartInfo> selectPartInfoSeq(PartInfo partInfo);
 
-	String selectPartInfoFirstId(Integer piSeq);
+	Integer selectPartInfoFirstId(Integer piSeq);
 
 	List<ParamMap> selectTerminalName(PartWork partWork);
 
diff --git a/src/main/java/com/dbnt/faisp/main/fipTarget/model/ShipInfo.java b/src/main/java/com/dbnt/faisp/main/fipTarget/model/ShipInfo.java
index f8e44eaf..25dba98a 100644
--- a/src/main/java/com/dbnt/faisp/main/fipTarget/model/ShipInfo.java
+++ b/src/main/java/com/dbnt/faisp/main/fipTarget/model/ShipInfo.java
@@ -40,9 +40,9 @@ public class ShipInfo extends BaseModel implements Serializable{
   @Column(name = "end_point")
   private String endPoint;
   @Column(name = "distance_nm")
-  private String distanceNm;
+  private Double distanceNm;
   @Column(name = "distance_km")
-  private String distanceKm;
+  private Double distanceKm;
   @Column(name = "owner_nm")
   private String ownerNm;
   @Column(name = "ship_nm")
diff --git a/src/main/java/com/dbnt/faisp/main/fipTarget/service/FipTargetService.java b/src/main/java/com/dbnt/faisp/main/fipTarget/service/FipTargetService.java
index ebd2a078..bc8b384f 100644
--- a/src/main/java/com/dbnt/faisp/main/fipTarget/service/FipTargetService.java
+++ b/src/main/java/com/dbnt/faisp/main/fipTarget/service/FipTargetService.java
@@ -219,7 +219,7 @@ public class FipTargetService extends BaseService {
 		return partInfoFileRepository.findById(new PartInfoFileId(fileSeq, piSeq,versionNo)).orElse(null);
 	}
 
-	public String selectPartInfoFirstId(PartInfo partInfo) {
+	public Integer selectPartInfoFirstId(PartInfo partInfo) {
 		return fipTargetMapper.selectPartInfoFirstId(partInfo.getPiSeq());
 	}
 
diff --git a/src/main/resources/mybatisMapper/FipTarget.xml b/src/main/resources/mybatisMapper/FipTarget.xml
index 1c82ff38..71f604f7 100644
--- a/src/main/resources/mybatisMapper/FipTarget.xml
+++ b/src/main/resources/mybatisMapper/FipTarget.xml
@@ -255,8 +255,8 @@
 		order by version_no desc
   </select>
   
-  <select id="selectPartInfoFirstId" resultType="String" parameterType="int">
-	    select wrt_user_seq
+  <select id="selectPartInfoFirstId" resultType="int" parameterType="int">
+	  select wrt_user_seq
 		from part_info 
 		where pi_seq = #{piSeq}
 		order by version_no asc
@@ -390,7 +390,7 @@
           <foreach collection="downOrganCdList" item="item" index="index" separator="," open="(" close=")">
               #{item}
           </foreach>
-      order by item_cd asc
+      order by cm.order_num, cm.item_cd asc
   </select>
   
   <select id="selectVulnerableList" resultType="com.dbnt.faisp.util.ParamMap" parameterType="Vulnerable">
diff --git a/src/main/resources/templates/equip/pvreUseList.html b/src/main/resources/templates/equip/pvreUseList.html
index 2816a224..344b7b79 100644
--- a/src/main/resources/templates/equip/pvreUseList.html
+++ b/src/main/resources/templates/equip/pvreUseList.html
@@ -10,8 +10,8 @@
     <input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
     <input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
     <div class="row justify-content-between">
-      <div class="col-auto"><h4>휴대용 녹화장비 사용대장</h4></div>
-      <div class="col-auto"><p class="mb-0 mt-2">외사장비 > 휴대용 녹화장비 사용대장</p></div>
+      <div class="col-auto"><h4>휴대용 영상녹화장비 사용대장</h4></div>
+      <div class="col-auto"><p class="mb-0 mt-2">외사장비 > 휴대용 영상녹화장비 사용대장</p></div>
     </div>
     <div class="row mx-0">
       <div class="col-12 card bg-light text-center">
diff --git a/src/main/resources/templates/fipTarget/ipShipEditModal.html b/src/main/resources/templates/fipTarget/ipShipEditModal.html
index 8c739e0a..03af3543 100644
--- a/src/main/resources/templates/fipTarget/ipShipEditModal.html
+++ b/src/main/resources/templates/fipTarget/ipShipEditModal.html
@@ -63,11 +63,11 @@
         <div class="row my-1">
           <label for="distanceNm" class="col-sm-2 col-form-label col-form-label-sm text-center">거리(해리)</label>
           <div class="col-sm-4">
-            <input type="text" class= "form-control form-control-sm" id="distanceNm" name="distanceNm" placeholder="ex:OOO해리">
+            <input type="number" min="0" class= "form-control form-control-sm" id="distanceNm" name="distanceNm" placeholder="ex:OOO해리">
           </div>
           <label for="distanceKm" class="col-sm-2 col-form-label col-form-label-sm text-center">거리(KM)</label>
           <div class="col-sm-4">
-            <input type="text" class= "form-control form-control-sm" id="distanceKm" name="distanceKm" placeholder="ex:OOOKm">
+            <input type="number" min="0" class= "form-control form-control-sm" id="distanceKm" name="distanceKm" placeholder="ex:OOOKm">
           </div>
         </div>
       </div>
diff --git a/src/main/resources/templates/fipTarget/ipShipList.html b/src/main/resources/templates/fipTarget/ipShipList.html
index 6cc3f625..f1d562bf 100644
--- a/src/main/resources/templates/fipTarget/ipShipList.html
+++ b/src/main/resources/templates/fipTarget/ipShipList.html
@@ -98,23 +98,19 @@
                   </thead>
                   <tbody class="table-group-divider">
                   <tr class="shipInfoTr" th:each="si:${shipInfoList}">
-                    <th:block>
-                      <input type="hidden" class="siSeq" th:value="${si.siSeq}">
-                      <input type="hidden" class="siType" th:value="${si.siType}">
-                      <input type="hidden" class="verNo" th:value="${si.versionNo}">
-                    </th:block>
-                    <td th:inline="text">
-                      [[${si.startPoint}]]/[[${si.endPoint}]]
-                      <br/>
-                      ([[${si.distanceNm}]],[[${si.distanceKm}]])
+                    <input type="hidden" class="siSeq" th:value="${si.siSeq}">
+                    <input type="hidden" class="siType" th:value="${si.siType}">
+                    <input type="hidden" class="verNo" th:value="${si.versionNo}">
+                    <td>
+                      <div th:text="|${si.startPoint}/${si.endPoint}|"></div>
+                      <div th:text="|(${si.distanceNm}해리,${si.distanceKm}km)|"></div>
                     </td>
                     <td th:text="${si.ownerNm}"></td>
                     <td th:text="${si.shipNm}"></td>
                     <td th:text="${si.weightStr}"></td>
-                    <td th:inline="text">
-                      여객:[[${si.passengerCnt}]]명
-                      <br/>
-                      화물:[[${si.freightCnt}]]TEU
+                    <td>
+                      <div th:text="|여객: ${si.passengerCnt}명|"></div>
+                      <div th:text="|화물: ${si.freightCnt}TEU|"></div>
                     </td>
                     <td th:text="${si.operationCnt}"></td>
                     <td th:text="${si.closeYn}"></td>
diff --git a/src/main/resources/templates/fipTarget/partInfoEditModal.html b/src/main/resources/templates/fipTarget/partInfoEditModal.html
index 4800c83e..499ec097 100644
--- a/src/main/resources/templates/fipTarget/partInfoEditModal.html
+++ b/src/main/resources/templates/fipTarget/partInfoEditModal.html
@@ -28,7 +28,7 @@
             </select>
           </div>
           <div class="col-sm-2">
-            <input type="number" class="form-control form-control-sm" id="rentPrice" name="rentPrice" placeholder="단위: 만">
+            <input type="number" class="form-control form-control-sm" id="rentPrice" name="rentPrice" placeholder="단위: 만/年">
           </div>
           <label for="utilityType" class="col-sm-2 col-form-label col-form-label-sm text-center">공공요금</label>
           <div class="col-sm-2">
@@ -39,7 +39,7 @@
             </select>
           </div>
           <div class="col-sm-2">
-            <input type="number" class="form-control form-control-sm" id="utilityPrice" name="utilityPrice" placeholder="단위: 만">
+            <input type="number" class="form-control form-control-sm" id="utilityPrice" name="utilityPrice" placeholder="단위: 만/年">
           </div>
         </div>
       </div>
diff --git a/src/main/resources/templates/fipTarget/partInfoList.html b/src/main/resources/templates/fipTarget/partInfoList.html
index 4fda77d5..b3d45fea 100644
--- a/src/main/resources/templates/fipTarget/partInfoList.html
+++ b/src/main/resources/templates/fipTarget/partInfoList.html
@@ -8,8 +8,8 @@
 <div layout:fragment="content">
   <main>
     <div class="row justify-content-between">
-      <div class="col-auto"><h4>외사 분실 현황</h4></div>
-      <div class="col-auto"><p class="mb-0 mt-2">외사대상목표 > 외사분실 > 외사분실운영현황</p></div>
+      <div class="col-auto"><h4>외사분실 운영현황</h4></div>
+      <div class="col-auto"><p class="mb-0 mt-2">외사대상목표 > 외사분실 > 외사분실 운영현황</p></div>
     </div>
     <input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
     <input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
@@ -137,9 +137,9 @@
                       <td th:text="|${pi.plPeopleCnt eq null?0:pi.plPeopleCnt}명|"></td>
                       <td th:text="${pi.plDescription}"></td>
                       <td th:text="${pi.piManagerName}"></td>
-                      <td th:text="|${pi.rentPrice}만|" th:if="${pi.rentType eq 'Y'}"></td>
+                      <td th:if="${pi.rentType eq 'Y'}" th:text="|${pi.rentPrice}만/年|"></td>
                       <td th:unless="${pi.rentType eq 'Y'}">무상</td>
-                      <td th:text="|${pi.utilityPrice}만|" th:if="${pi.utilityType eq 'Y'}"></td>
+                      <td th:if="${pi.utilityType eq 'Y'}" th:text="|${pi.utilityPrice}만/年|"></td>
                       <td th:unless="${pi.utilityType eq 'Y'}">무상</td>
                       <td th:text="${#temporals.format(pi.wrtDt, 'yyyy-MM-dd')}"></td>
                     </tr>
@@ -152,18 +152,22 @@
                       <th:block th:if="${not #strings.isEmpty(total)}">
                         <th th:text="|상주 ${total.mp_sangju}개소 ${total.mp_sangju_total}명|"></th>
                         <th th:text="|비상주 ${total.mp_bsangju}개소 ${total.mp_bsangju_total}명|"></th>
-                        <th th:text="|폐쇄 ${total.mp_closure}개소 ${total.mp_closure_total}명|"></th>
+                        <!--<th th:text="|폐쇄 ${total.mp_closure}개소 ${total.mp_closure_total}명|"></th>-->
+                        <th></th>
                         <th th:text="|상주 ${total.pl_sangju}개소 ${total.pl_sangju_total}명|"></th>
                         <th th:text="|비상주 ${total.pl_bsangju}개소 ${total.pl_bsangju_total}명|"></th>
-                        <th th:text="|폐쇄 ${total.pl_closure}개소 ${total.pl_closure_total}명|"></th>
+                        <!--<th th:text="|폐쇄 ${total.pl_closure}개소 ${total.pl_closure_total}명|"></th>-->
+                        <th></th>
                       </th:block>
                       <th:block th:unless="${not #strings.isEmpty(total)}">
                         <th>상주 0개소 0명</th>
                         <th>비상주 0개소 0명</th>
-                        <th>폐쇄 0개소 0명</th>
+                        <!--<th>폐쇄 0개소 0명</th>-->
+                        <th></th>
                         <th>상주 0개소 0명</th>
                         <th>비상주 0개소 0명</th>
-                        <th>폐쇄 0개소 0명</th>
+                        <!--<th>폐쇄 0개소 0명</th>-->
+                        <th></th>
                       </th:block>
                       <th></th>
                       <th></th>
diff --git a/src/main/resources/templates/fipTarget/vulnEditModal.html b/src/main/resources/templates/fipTarget/vulnEditModal.html
index 4fdc5220..39142a8d 100644
--- a/src/main/resources/templates/fipTarget/vulnEditModal.html
+++ b/src/main/resources/templates/fipTarget/vulnEditModal.html
@@ -32,7 +32,10 @@
             </th:block>
           </th:block>-->
           <th:block th:each="organ:${organList}">
-            <option th:value="${organ.itemCd}" th:text="${organ.itemValue}" th:selected="${organ.itemCd eq info.mgtOrgan}"></option>
+            <th:block th:if="${!(organ.itemCd eq 'OG027' or organ.itemCd eq 'OG028')}">
+              <!--서특단, 중특단 노출제외-->
+              <option th:value="${organ.itemCd}" th:text="${organ.itemValue}" th:selected="${organ.itemCd eq info.mgtOrgan}"></option>
+            </th:block>
           </th:block>
         </select>
       </div>