From 44d9f74ca89c6d371ade0abe59644dfcc24c11c1 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: Sat, 28 Jan 2023 11:16:15 +0900
Subject: [PATCH] =?UTF-8?q?=EC=99=B8=EC=82=AC=EC=9E=A5=EB=B9=84=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=EC=9D=B4=EB=A0=A5=20=EC=97=B4=EB=9E=8C=20?=
 =?UTF-8?q?=EB=B0=A9=EC=8B=9D=20=EB=B3=80=EA=B2=BD.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../faisp/main/equip/EquipController.java     |   4 +-
 src/main/resources/static/js/equip/equip.js   |   7 +-
 .../templates/equip/equipHistory.html         | 101 ++++++++++++++----
 .../resources/templates/equip/equipList.html  |   4 +-
 4 files changed, 94 insertions(+), 22 deletions(-)

diff --git a/src/main/java/com/dbnt/faisp/main/equip/EquipController.java b/src/main/java/com/dbnt/faisp/main/equip/EquipController.java
index 92d4bdc1..1d7005a4 100644
--- a/src/main/java/com/dbnt/faisp/main/equip/EquipController.java
+++ b/src/main/java/com/dbnt/faisp/main/equip/EquipController.java
@@ -127,7 +127,9 @@ public class EquipController {
   @GetMapping("/historyView")
   public ModelAndView historyView(Equip equip) {
     ModelAndView mav = new ModelAndView("equip/equipHistory");
-    mav.addObject("equList", equipService.selectHistoryList(equip));
+    List<Equip> equipHistoryList = equipService.selectHistoryList(equip);
+    mav.addObject("historyList", equipHistoryList.subList(1, equipHistoryList.size()));
+    mav.addObject("lastVersion", equipService.selectHistoryDetail(equipHistoryList.get(0)));
     return mav;
   }
 
diff --git a/src/main/resources/static/js/equip/equip.js b/src/main/resources/static/js/equip/equip.js
index 0d9e738f..e4460e35 100644
--- a/src/main/resources/static/js/equip/equip.js
+++ b/src/main/resources/static/js/equip/equip.js
@@ -298,4 +298,9 @@ $(document).on('click', '.modalCloseBtn', function (){
   location.reload();
 })
 
-
+$(document).on('click', '.equipTr', function (event){
+  if(event.target.className !== "equInfoCheckBox"){
+    const chkBox = $(this).find(".equInfoCheckBox")[0];
+    chkBox.checked = !chkBox.checked;
+  }
+})
diff --git a/src/main/resources/templates/equip/equipHistory.html b/src/main/resources/templates/equip/equipHistory.html
index 1f90ed14..f31f86c4 100644
--- a/src/main/resources/templates/equip/equipHistory.html
+++ b/src/main/resources/templates/equip/equipHistory.html
@@ -10,7 +10,7 @@
   <div class="card">
     <div class="card-body">
       <div class="row justify-content-start">
-        <div class="col-4">
+        <div class="col-3">
           <table class="table table-sm table-hover table-bordered" id="categoryTable">
             <thead>
             <tr class="table-secondary">
@@ -20,67 +20,132 @@
             </tr>
             </thead>
             <tbody class="table-group-divider overflow-scroll">
-            <tr class="historyInfoTr" th:each="equInfo:${equList}">
-              <td><input type="checkbox" class="hisChk">
-                <input type="hidden" class="equKey" th:value="${equInfo.equKey}">
-                <input type="hidden" class="verNo" th:value="${equInfo.versionNo}" >
-              </td>
-              <td th:text="|${equInfo.wrtTitle} ${equInfo.wrtNm}|"></td>
-              <td th:text="${#temporals.format(equInfo.wrtDt, 'yyyy-MM-dd')}"></td>
-            </tr>
+            <th:block th:if="${#lists.size(historyList)>0}">
+              <tr class="historyInfoTr" th:each="equInfo:${historyList}">
+                <td><input type="checkbox" class="hisChk">
+                  <input type="hidden" class="equKey" th:value="${equInfo.equKey}">
+                  <input type="hidden" class="verNo" th:value="${equInfo.versionNo}" >
+                </td>
+                <td th:text="|${equInfo.wrtTitle} ${equInfo.wrtNm}|"></td>
+                <td th:text="${#temporals.format(equInfo.wrtDt, 'yyyy-MM-dd')}"></td>
+              </tr>
+            </th:block>
+            <th:block th:unless="${#lists.size(historyList)>0}">
+              <tr>
+                <td colspan="3">수정 이력이 없습니다.</td>
+              </tr>
+            </th:block>
             </tbody>
           </table>
         </div>
-        <div class="col-8" id="valueDiv">
-          <div class="row mb-3">
+        <div class="col-1"></div>
+        <div class="col-4" id="valueDiv">
+          <div class="row mb-1">
+            <div class="col-auto">수정이력</div>
+          </div>
+          <div class="row mb-1">
             <label for="vSosok" class="col-sm-4 col-form-label col-form-label-sm text-center">관리처</label>
             <div class="col-sm-6">
               <input type="text" class="form-control form-control-sm" id="vSosok" readonly>
             </div>
           </div>
-          <div class="row mb-3">
+          <div class="row mb-1">
             <label for="vEquType" class="col-sm-4 col-form-label col-form-label-sm text-center">분류</label>
             <div class="col-sm-6">
               <input type="text" class="form-control form-control-sm" id="vEquType" readonly>
             </div>
           </div>
-          <div class="row mb-3">
+          <div class="row mb-1">
             <label for="vDetailType" class="col-sm-4 col-form-label col-form-label-sm text-center">세부분류</label>
             <div class="col-sm-6">
               <input type="text" class="form-control form-control-sm" id="vDetailType" readonly>
             </div>
           </div>
-          <div class="row mb-3">
+          <div class="row mb-1">
             <label for="vStoredYear" class="col-sm-4 col-form-label col-form-label-sm text-center">취득연도</label>
             <div class="col-sm-6">
               <input type="text" class="form-control form-control-sm" id="vStoredYear" readonly>
             </div>
           </div>
-          <div class="row mb-3">
+          <div class="row mb-1">
             <label for="vItemQty" class="col-sm-4 col-form-label col-form-label-sm text-center">보유량</label>
             <div class="col-sm-6">
               <input type="text" class="form-control form-control-sm" id="vItemQty" readonly>
             </div>
           </div>
-          <div class="row mb-3">
+          <div class="row mb-1">
             <label for="vItemCondition" class="col-sm-4 col-form-label col-form-label-sm text-center">상태</label>
             <div class="col-sm-6">
               <input type="text" class="form-control form-control-sm" id="vItemCondition" readonly>
             </div>
           </div>
-          <div class="row mb-3">
+          <div class="row mb-1">
             <label for="vNote" class="col-sm-4 col-form-label col-form-label-sm text-center">비고</label>
             <div class="col-sm-6">
               <input type="text" class="form-control form-control-sm" id="vNote" readonly>
             </div>
           </div>
-          <div class="row mb-3">
+          <div class="row mb-1">
             <label for="vImgName" class="col-sm-4 col-form-label col-form-label-sm text-center">장비사진</label>
             <div class="col-sm-6">
               <img id="vImgName" src="" alt="첨부이미지" style="width: 100%; height: 100%; display: none;" />
             </div>
           </div>
         </div>
+        <div class="col-4" id="lastVersionDiv">
+          <div class="row mb-1">
+            <div class="col-auto">최신데이터</div>
+          </div>
+          <div class="row mb-1">
+            <label for="vSosok" class="col-sm-4 col-form-label col-form-label-sm text-center">관리처</label>
+            <div class="col-sm-6">
+              <input type="text" class="form-control form-control-sm" th:value="${lastVersion.sosok}" readonly>
+            </div>
+          </div>
+          <div class="row mb-1">
+            <label for="vEquType" class="col-sm-4 col-form-label col-form-label-sm text-center">분류</label>
+            <div class="col-sm-6">
+              <input type="text" class="form-control form-control-sm" th:value="${lastVersion.equType}" readonly>
+            </div>
+          </div>
+          <div class="row mb-1">
+            <label for="vDetailType" class="col-sm-4 col-form-label col-form-label-sm text-center">세부분류</label>
+            <div class="col-sm-6">
+              <input type="text" class="form-control form-control-sm" th:value="${lastVersion.detailType}" readonly>
+            </div>
+          </div>
+          <div class="row mb-1">
+            <label for="vStoredYear" class="col-sm-4 col-form-label col-form-label-sm text-center">취득연도</label>
+            <div class="col-sm-6">
+              <input type="text" class="form-control form-control-sm" th:value="${lastVersion.storedYear}" readonly>
+            </div>
+          </div>
+          <div class="row mb-1">
+            <label for="vItemQty" class="col-sm-4 col-form-label col-form-label-sm text-center">보유량</label>
+            <div class="col-sm-6">
+              <input type="text" class="form-control form-control-sm" th:value="${lastVersion.itemQty}" readonly>
+            </div>
+          </div>
+          <div class="row mb-1">
+            <label for="vItemCondition" class="col-sm-4 col-form-label col-form-label-sm text-center">상태</label>
+            <div class="col-sm-6">
+              <input type="text" class="form-control form-control-sm" th:value="${lastVersion.itemCondition}" readonly>
+            </div>
+          </div>
+          <div class="row mb-1">
+            <label for="vNote" class="col-sm-4 col-form-label col-form-label-sm text-center">비고</label>
+            <div class="col-sm-6">
+              <input type="text" class="form-control form-control-sm" th:value="${lastVersion.note}" readonly>
+            </div>
+          </div>
+          <div class="row mb-1">
+            <label for="vImgName" class="col-sm-4 col-form-label col-form-label-sm text-center">장비사진</label>
+            <div class="col-sm-6">
+              <img th:src="|/equip/getEquipImg?equKey=${lastVersion.equKey}&versionNo=${lastVersion.versionNo}|" alt="첨부이미지" style="width: 100%; height: 100%;" />
+            </div>
+          </div>
+
+        </div>
       </div>
     </div>
   </div>
diff --git a/src/main/resources/templates/equip/equipList.html b/src/main/resources/templates/equip/equipList.html
index 582d594c..9e035f7e 100644
--- a/src/main/resources/templates/equip/equipList.html
+++ b/src/main/resources/templates/equip/equipList.html
@@ -57,7 +57,7 @@
                       </tr>
                       </thead>
                       <tbody class="table-group-divider">
-                      <tr th:each="equ:${equipList}">
+                      <tr class="equipTr" th:each="equ:${equipList}">
                       	<td>
                       		<input type="checkbox" name="equChk" class="equInfoCheckBox">
                       		<input type="hidden" class="equKey" th:value="${equ.equKey}">
@@ -127,7 +127,7 @@
     </div>
   </div>
   <div class="modal fade" id="equipHistoryModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="equipHistoryModalLabel" aria-hidden="true">
-    <div class="modal-dialog modal-lg modal-dialog-scrollable">
+    <div class="modal-dialog modal-xl modal-dialog-scrollable">
       <div class="modal-content" id="equipHistoryModalContent">
       </div>
     </div>