From d1a8c4f289a20ec432e8dfe796de5e524234dd8d 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: Mon, 22 May 2023 13:11:48 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B5=AD=EC=A0=9C=EB=B2=94=EC=A3=84=EA=B2=80?=
 =?UTF-8?q?=EA=B1=B0=ED=98=84=ED=99=A9=20=EB=A7=88=EA=B0=90=EC=8B=9C=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=20=EA=B8=B0=EB=8A=A5=20=EB=B9=84=ED=99=9C?=
 =?UTF-8?q?=EC=84=B1=ED=99=94.=20=EA=B8=B0=ED=83=80=20=EC=A1=B0=EC=A0=95.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InternationalCrimeArrestController.java   |  3 ++-
 .../faStatistics/internationalCrimeArrest.js  |  2 +-
 .../internationalCrimeArrest.html             |  5 ++++-
 .../internationalCrimeArrestViewModal.html    | 21 +++++++++++++------
 4 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java
index bed8735e..64903ab6 100644
--- a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java
+++ b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java
@@ -82,7 +82,8 @@ public class InternationalCrimeArrestController {
     //메뉴권한 확인
     mav.addObject("accessAuth", authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/faStatistics/internationalCrimeArrest").get(0).getAccessAuth());
     mav.addObject("mgtOrganList", loginUser.getDownOrganCdList());
-
+    //마감여부
+    mav.addObject("deadlineState", menuMgtService.selectDeadlineChk("/faStatistics/internationalCrimeArrest"));
     return mav;
   }
 
diff --git a/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js b/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js
index 8cc5faf8..5053ac49 100644
--- a/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js
+++ b/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js
@@ -10,7 +10,7 @@ $(function(){
     autoclose: true
   });
 
-  getStatisticsModal();
+  // getStatisticsModal();
 });
 
 $(document).on('click', '#statisticsModalBtn', function (){
diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html
index a0a5e85e..051f707b 100644
--- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html
+++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html
@@ -243,7 +243,10 @@
               <!-- 페이징 -->
               <div class="row justify-content-between">
                 <div class="col-auto">
-                  <button class="btn btn-warning" id="deadlineBtn" data-menukey="41" th:data-deadlinechk="${deadlineState}" th:if="${userOrgan eq 'OG001' and accessAuth eq 'ACC003'}" th:text="${deadlineState eq 'F'?'마감':'등록허용'}"></button>
+                  <th:block th:if="${userOrgan eq 'OG001' and accessAuth eq 'ACC003'}">
+                    <button class="btn btn-warning" id="deadlineBtn" data-menukey="41"
+                            th:data-deadlinechk="${deadlineState}" th:text="${deadlineState eq 'F'?'마감':'등록허용'}"></button>
+                  </th:block>
                   <button class="btn btn-success" id="icaExcelDownBtn">엑셀 다운로드</button>
                 </div>
                 <div class="col-auto">
diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html
index 8d905684..988e7aa3 100644
--- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html
+++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html
@@ -23,7 +23,12 @@
     <label class="col-sm-1 col-form-label col-form-label-sm text-center">담당경찰관</label>
     <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${ica.caseOfficer}"></label>
     <label class="col-sm-1 col-form-label col-form-label-sm text-center">작성자</label>
-    <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${ica.caseOfficer}"></label>
+    <label class="col-sm-2 col-form-label col-form-label-sm text-start">
+      <th:block th:each="code:${session.commonCode.get('OG')}">
+        <th:block th:if="${code.itemCd eq ica.wrtOrgan}" th:text="${code.itemValue}"></th:block>
+      </th:block>
+      <th:block th:text="${ica.wrtUserNm}"></th:block>
+    </label>
   </div>
   <div class="row mb-1">
     <label class="col-sm-1 col-form-label col-form-label-sm text-center">범죄테마</label>
@@ -289,10 +294,14 @@
     </div>
   </div>
 </div>
-<div class="modal-footer bg-light">
-  <th:block th:if="${userSeq eq ica.wrtUserSeq or (#lists.contains(mgtOrganList, ica.wrtOrgan) and accessAuth eq 'ACC003')}"><!--작성자일 경우 수정 허용--><!--관리자일 경우 수정 허용-->
-    <button type="button" class="btn btn-danger" id="icaDeleteBtn">삭제</button>
-    <button type="button" class="btn btn-warning" id="icaEditBtn">수정</button>
+<th:block th:if="${deadlineState eq 'F'}">
+  <!--마감 상태가 아닐 때-->
+  <th:block th:if="${userSeq eq ica.wrtUserSeq or (#lists.contains(mgtOrganList, ica.wrtOrgan) and accessAuth eq 'ACC003')}">
+    <!--작성자일 경우 수정 허용--><!--관리자일 경우 수정 허용-->
+    <div class="modal-footer bg-light">
+      <button type="button" class="btn btn-danger" id="icaDeleteBtn">삭제</button>
+      <button type="button" class="btn btn-warning" id="icaEditBtn">수정</button>
+    </div>
   </th:block>
-</div>
+</th:block>
 </html>
\ No newline at end of file