From 562ddd1507b5584aeae1cc21e5cc2a4db58c4749 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: Fri, 17 Mar 2023 18:02:30 +0900
Subject: [PATCH] =?UTF-8?q?=EC=B2=AD=EC=82=B0=EB=B3=B4=EA=B3=A0=EC=84=9C?=
 =?UTF-8?q?=20=EC=9D=B8=EC=87=84=20=EC=9E=91=EC=97=85=EC=A4=91.=20?=
 =?UTF-8?q?=EC=99=B8=EC=82=AC=EC=A0=95=EB=B3=B4=EB=B3=B4=EA=B3=A0,=20sri?=
 =?UTF-8?q?=20=ED=83=AD=EB=B3=84=20=EB=93=B1=EB=A1=9D=EB=B2=84=ED=8A=BC=20?=
 =?UTF-8?q?=ED=99=9C=EC=84=B1=ED=99=94.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |  2 +-
 .../fpiMgt/affairResult/model/ResultInfo.java |  8 +++++
 .../igActivities/fpiMgt/result/resultMgt.js   | 32 ++++++++++++++++---
 .../resources/templates/faRpt/faRptBoard.html |  4 ++-
 .../fpiMgt/affairResult/resultEditModal.html  |  8 ++---
 .../fpiMgt/affairResult/resultInfoRow.html    |  2 +-
 .../fpiMgt/affairResult/resultMgt.html        |  7 ++++
 .../fpiMgt/affairResult/resultViewModal.html  |  3 ++
 .../resources/templates/layout/layout.html    |  2 +-
 .../resources/templates/sri/sriBoard.html     |  4 ++-
 10 files changed, 58 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 30d41490..79b3825c 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-#해양경찰청 외사종합포털
+#해양경찰청 외사포털
 
 java 11
 postgreSql 14.2
diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/model/ResultInfo.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/model/ResultInfo.java
index 6a2723ae..ed977208 100644
--- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/model/ResultInfo.java
+++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/model/ResultInfo.java
@@ -6,6 +6,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
 import java.io.Serializable;
+import java.time.LocalDate;
 
 @Getter
 @Setter
@@ -27,6 +28,13 @@ public class ResultInfo {
   @Column(name = "contact_info")
   private String contactInfo;
 
+  @Transient
+  private LocalDate wrtDt;
+  @Transient
+  private String title;
+  @Transient
+  private String affairRate;
+
   @Embeddable
   @Data
   @NoArgsConstructor
diff --git a/src/main/resources/static/js/igActivities/fpiMgt/result/resultMgt.js b/src/main/resources/static/js/igActivities/fpiMgt/result/resultMgt.js
index eb401f9c..e8d5878b 100644
--- a/src/main/resources/static/js/igActivities/fpiMgt/result/resultMgt.js
+++ b/src/main/resources/static/js/igActivities/fpiMgt/result/resultMgt.js
@@ -132,7 +132,7 @@ $(document).on('click', '#resultInfoAddBtn', function (){
     dataType:"html",
     success: function(html){
       infoRow.append(html);
-      $("#contactInfo"+infoSeq).summernote({
+      /*$("#contactInfo"+infoSeq).summernote({
         lang:'ko-KR',
         height: 60,
         disableDragAndDrop: true,
@@ -143,7 +143,7 @@ $(document).on('click', '#resultInfoAddBtn', function (){
           ['para', ['ul', 'ol', 'paragraph']],
           ['table', ['table']]
         ]
-      });
+      });*/
     },
     error:function(e){
       ajaxErrorAction(e);
@@ -195,6 +195,30 @@ $(document).on('click', '.apprvBtn', function (){
   }
 })
 
+$(document).on('click', '#printBtn', function (){
+  $.ajax({
+    url: '/affairResult/resultBoardJson',
+    type: 'GET',
+    data: {resultKey: $(this).attr('data-resultkey')},
+    dataType:"json",
+    success: function(data){
+      var url = $("#printUrl").attr("data-printurl")+"/resultBoard.jsp";
+      var title = "청산 보고서 인쇄";
+      var status = "width=900px,height=800px,scrollbars=yes";
+      window.open("", title, status);
+      const form = $("#printForm")[0];
+      form.target = title;
+      form.action = url;
+      form.result.value = JSON.stringify(data);
+      form.method = "post";
+      form.submit();
+    },
+    error:function(e){
+      ajaxErrorAction(e);
+    }
+  });
+})
+
 function getResultViewModal(resultKey){
   $.ajax({
     url: '/affairResult/resultViewModal',
@@ -225,7 +249,7 @@ function getResultEditModal(resultKey){
         language: "ko",
         autoclose: true
       });
-      $(".contactInfo").summernote({
+      /*$(".contactInfo").summernote({
         lang:'ko-KR',
         height: 60,
         disableDragAndDrop: true,
@@ -236,7 +260,7 @@ function getResultEditModal(resultKey){
           ['para', ['ul', 'ol', 'paragraph']],
           ['table', ['table']]
         ]
-      });
+      });*/
       setUploadDiv();
     },
     error:function(e){
diff --git a/src/main/resources/templates/faRpt/faRptBoard.html b/src/main/resources/templates/faRpt/faRptBoard.html
index 014ec450..93e97a47 100644
--- a/src/main/resources/templates/faRpt/faRptBoard.html
+++ b/src/main/resources/templates/faRpt/faRptBoard.html
@@ -164,7 +164,9 @@
                 </nav>
               </div>
               <div class="col-auto">
-                <input type="button" class="btn btn-success" value="등록" id="addFaRptBtn" th:unless="${accessAuth eq 'ACC001'}">
+                <th:block th:if="${accessAuth eq 'ACC001' and searchParams.activeTab eq 'send'}">
+                  <input type="button" class="btn btn-success" value="등록" id="addFaRptBtn">
+                </th:block>
               </div>
             </div>
           </div>
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultEditModal.html b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultEditModal.html
index 73e0d9a7..833c860b 100644
--- a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultEditModal.html
+++ b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultEditModal.html
@@ -198,12 +198,10 @@
                     <input type="hidden" class="infoSeq resultInfoSeq" th:name="${#strings.concat('resultInfoList[', info.infoSeq,'].infoSeq')}" th:value="${info.infoSeq}">
                     <div class="col-1 infoSeq" th:text="${info.infoSeq+1}"></div>
                     <div class="col-3">
-                      <input type="text" class="form-control form-control-sm" th:name="${#strings.concat('resultInfoList[', info.infoSeq,'].contactTarget')}"
-                             th:value="${info.contactTarget}">
+                      <input type="text" class="form-control form-control-sm" th:name="${#strings.concat('resultInfoList[', info.infoSeq,'].contactTarget')}" th:value="${info.contactTarget}">
                     </div>
                     <div class="col-7">
-                      <textarea class="contactInfo" th:id="|contactInfo${info.infoSeq}|" th:name="${#strings.concat('resultInfoList[', info.infoSeq,'].contactInfo')}"
-                                th:utext="${info.contactInfo}"></textarea>
+                      <textarea class="form-control contactInfo" th:id="|contactInfo${info.infoSeq}|" th:name="${#strings.concat('resultInfoList[', info.infoSeq,'].contactInfo')}" th:utext="${info.contactInfo}"></textarea>
                     </div>
                     <div class="col-1">
                       <button type="button" class="btn btn-sm btn-outline-danger rowDeleteBtn"><i class="bi bi-x"></i></button>
@@ -301,7 +299,7 @@
   </form>
 </div>
 <div class="modal-footer bg-light">
-<!--  <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>-->
+  <!--  <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>-->
   <button type="button" class="btn btn-warning" id="saveTempBtn">임시저장</button>
   <button type="button" class="btn btn-primary" id="saveResultBtn">저장</button>
 </div>
\ No newline at end of file
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultInfoRow.html b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultInfoRow.html
index 953c6831..9e329e9f 100644
--- a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultInfoRow.html
+++ b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultInfoRow.html
@@ -7,7 +7,7 @@
     <input type="text" class="form-control form-control-sm" th:name="${#strings.concat('resultInfoList[', info.infoSeq,'].contactTarget')}">
   </div>
   <div class="col-7">
-    <textarea th:id="|contactInfo${info.infoSeq}|" th:name="${#strings.concat('resultInfoList[', info.infoSeq,'].contactInfo')}"></textarea>
+    <textarea class="form-control" th:id="|contactInfo${info.infoSeq}|" th:name="${#strings.concat('resultInfoList[', info.infoSeq,'].contactInfo')}"></textarea>
   </div>
   <div class="col-1">
     <button type="button" class="btn btn-sm btn-outline-danger rowDeleteBtn"><i class="bi bi-x"></i></button>
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultMgt.html b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultMgt.html
index d8ae216a..8b796e47 100644
--- a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultMgt.html
+++ b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultMgt.html
@@ -198,5 +198,12 @@
       </div>
     </div>
   </div>
+  <div class="d-none">
+    <form id="printForm">
+      <input type="hidden" name="planList">
+      <input type="hidden" name="affairList">
+      <input type="hidden" name="result">
+    </form>
+  </div>
 </div>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultViewModal.html b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultViewModal.html
index 778f56fe..297b52c4 100644
--- a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultViewModal.html
+++ b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultViewModal.html
@@ -259,6 +259,9 @@
   </div>
 </div>
 <div class="modal-footer bg-light">
+  <th:block th:if="${result.resultState eq 'DST006'}">
+    <button type="button" class="btn btn-secondary" id="printBtn" th:data-affairkey="${result.resultKey}">인쇄</button>
+  </th:block>
   <th:block th:unless="${result.resultState eq 'DST004' or result.resultState eq 'DST006'}"><!--승인 상태일때는 수정 불가-->
     <th:block th:if="${userSeq eq result.wrtUserSeq or accessAuth eq 'ACC003'}"><!--작성자일 경우 수정 허용--><!--관리자일 경우 수정 허용-->
       <button type="button" class="btn btn-warning" id="editResultBtn">수정</button>
diff --git a/src/main/resources/templates/layout/layout.html b/src/main/resources/templates/layout/layout.html
index d5843012..4f994c1b 100644
--- a/src/main/resources/templates/layout/layout.html
+++ b/src/main/resources/templates/layout/layout.html
@@ -6,7 +6,7 @@
 <head>
   <meta charset="UTF-8"/>
   <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-  <title>해양경찰청 외사종합포털</title>
+  <title>해양경찰청 외사포털</title>
 
   <!--bootstrap-->
   <link rel="stylesheet" th:href="@{/vendor/bootstrap-5.2.0-dist/css/bootstrap.min.css}">
diff --git a/src/main/resources/templates/sri/sriBoard.html b/src/main/resources/templates/sri/sriBoard.html
index 40019070..fe5448ff 100644
--- a/src/main/resources/templates/sri/sriBoard.html
+++ b/src/main/resources/templates/sri/sriBoard.html
@@ -162,7 +162,9 @@
                 </nav>
               </div>
               <div class="col-auto">
-                <input type="button" class="btn btn-success" value="등록" id="addSriBtn" th:unless="${accessAuth eq 'ACC001' and searchParams.activeTab eq 'send'}">
+                <th:block th:if="${accessAuth eq 'ACC001' and searchParams.activeTab eq 'send'}">
+                  <input type="button" class="btn btn-success" value="등록" id="addSriBtn">
+                </th:block>
               </div>
             </div>
           </div>