From 5cbce5d1c1fbfbde76588cc4760f2e06b1066322 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, 3 May 2023 17:38:29 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B2=AC=EB=AC=B8=20=EC=A1=B0=ED=9A=8C=20?=
 =?UTF-8?q?=EB=AA=A8=EB=8B=AC=20=EA=B2=B0=EC=A0=9C=20=EC=96=91=EC=8B=9D=20?=
 =?UTF-8?q?=EC=9C=84=EC=B9=98=20=EC=A1=B0=EC=A0=95=20=EA=B2=AC=EB=AC=B8=20?=
 =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=EB=AA=A8=EB=8B=AC=20=EA=B2=B0=EC=9E=AC?=
 =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=EB=85=B8=EC=B6=9C=20=EC=A1=B0=EA=B1=B4=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fpiMgt/affair/affairViewModal.html        | 155 +++++++++---------
 1 file changed, 77 insertions(+), 78 deletions(-)

diff --git a/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html b/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html
index 7023c747..f7780e44 100644
--- a/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html
+++ b/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html
@@ -123,84 +123,6 @@
       </table>
     </div>
     <div class="row" id="ratingViewDiv">
-      <div class="col-12" th:unless="${#lists.isEmpty(affair.rateList)}">
-        <div class="px-2">
-          <hr class="my-1">
-          <th:block th:each="rate:${affair.rateList}">
-            <div class="row border-secondary text-center">
-              <label class="col-sm-1 col-form-label col-form-label-sm text-center py-3">
-                <th:block th:each="code:${session.commonCode.get('OG')}">
-                  <th:block th:if="${code.itemCd eq rate.ratingOrgan}" th:text="${code.itemValue}"></th:block>
-                </th:block>
-              </label>
-              <div class="col-11">
-                <div class="row" th:if="${rate.sectionApprv eq null and rate.headApprv eq null}">
-                  <label class="col-sm-12 col-form-label col-form-label-sm text-center bg-white">결재정보가 없습니다.</label>
-                </div>
-                <div class="row  border-top-0 border-secondary" th:if="${rate.sectionApprv ne null}">
-                  <label class="col-sm-1 col-form-label col-form-label-sm text-center py-3">결재결과 </label>
-                  <label class="col-sm-1 col-form-label col-form-label-sm text-start py-3">
-                    <th:block th:each="code:${session.commonCode.get('DST')}">
-                      <th:block th:if="${code.itemCd eq rate.sectionApprv}" th:text="${code.itemValue}"></th:block>
-                    </th:block>
-                  </label>
-                  <label class="col-sm-1 col-form-label col-form-label-sm text-center py-3">결재자 </label>
-                  <label class="col-sm-2 col-form-label col-form-label-sm text-start py-3">
-                    <th:block th:each="code:${session.commonCode.get('JT')}">
-                      <th:block th:if="${rate.sectionTitle eq code.itemCd}" th:text="${code.itemValue}"></th:block>
-                    </th:block>
-                    <th:block th:text="${rate.sectionNm}"></th:block>
-                  </label>
-                  <div class="col-7">
-                    <div class="row">
-                      <label class="col-sm-2 col-form-label col-form-label-sm text-center ">결재일시 </label>
-                      <label class="col-sm-10 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(rate.sectionApprvDt, 'yyyy-MM-dd HH:mm:ss')}"></label>
-                      <label class="col-sm-2 col-form-label col-form-label-sm text-center ">기타의견 </label>
-                      <label class="col-sm-10 col-form-label col-form-label-sm text-start" th:text="${rate.sectionEtc}"></label>
-                    </div>
-                  </div>
-                </div>
-                <div class="row  border-top-0 border-secondary" th:if="${rate.headApprv ne null}">
-                  <div class="col-2">
-                    <div class="row">
-                      <label class="col-sm-6 col-form-label col-form-label-sm text-center" th:classappend="${rate.headApprv eq 'DST005'?'py-3':''}">결재결과 </label>
-                      <label class="col-sm-6 col-form-label col-form-label-sm text-start" th:classappend="${rate.headApprv eq 'DST005'?'py-3':''}">
-                        <th:block th:each="code:${session.commonCode.get('DST')}">
-                          <th:block th:if="${code.itemCd eq rate.headApprv}" th:text="${code.itemValue}"></th:block>
-                        </th:block>
-                      </label>
-                      <th:block th:if="${rate.headApprv eq 'DST006'}">
-                        <label class="col-sm-6 col-form-label col-form-label-sm text-center">견문평가 </label>
-                        <label class="col-sm-6 col-form-label col-form-label-sm text-start">
-                          <th:block th:each="code:${session.commonCode.get('AAR')}">
-                            <th:block th:if="${code.itemCd eq rate.affairRate}"
-                                      th:text="|${code.itemValue}${rate.organUp eq 'T'?'(상보)':''}|"></th:block>
-                          </th:block>
-                        </label>
-                      </th:block>
-                    </div>
-                  </div>
-                  <label class="col-sm-1 col-form-label col-form-label-sm text-center py-3">결재자 </label>
-                  <label class="col-sm-2 col-form-label col-form-label-sm text-start py-3">
-                    <th:block th:each="code:${session.commonCode.get('JT')}">
-                      <th:block th:if="${rate.headTitle eq code.itemCd}" th:text="${code.itemValue}"></th:block>
-                    </th:block>
-                    <th:block th:text="${rate.headNm}"></th:block>
-                  </label>
-                  <div class="col-7">
-                    <div class="row">
-                      <label class="col-sm-2 col-form-label col-form-label-sm text-center ">결재일시 </label>
-                      <label class="col-sm-10 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(rate.headApprvDt, 'yyyy-MM-dd HH:mm:ss')}"></label>
-                      <label class="col-sm-2 col-form-label col-form-label-sm text-center ">기타의견 </label>
-                      <label class="col-sm-10 col-form-label col-form-label-sm text-start" th:text="${rate.headEtc}"></label>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </th:block>
-        </div>
-      </div>
       <div class="col-12" th:if="${apprvAuth ne null}">
         <div class="px-2">
           <form action="#" method="post" id="apprvForm">
@@ -248,6 +170,83 @@
           </form>
         </div>
       </div>
+      <div class="col-12" th:unless="${#lists.isEmpty(affair.rateList)}">
+        <div class="px-2">
+          <hr class="my-1">
+          <th:block th:each="rate:${affair.rateList}">
+            <div class="row border-secondary text-center">
+              <label class="col-sm-1 col-form-label col-form-label-sm text-center py-3">
+                <th:block th:each="code:${session.commonCode.get('OG')}">
+                  <th:block th:if="${code.itemCd eq rate.ratingOrgan}" th:text="${code.itemValue}"></th:block>
+                </th:block>
+              </label>
+              <div class="col-11">
+                <div class="row" th:if="${#strings.isEmpty(rate.sectionApprv) and #strings.isEmpty(rate.headApprv)}">
+                  <label class="col-sm-12 col-form-label col-form-label-sm text-center bg-white">결재정보가 없습니다.</label>
+                </div>
+                <div class="row  border-top-0 border-secondary" th:if="${#strings.isEmpty(rate.sectionApprv) eq false}">
+                  <label class="col-sm-1 col-form-label col-form-label-sm text-center py-3">결재결과 </label>
+                  <label class="col-sm-1 col-form-label col-form-label-sm text-start py-3">
+                    <th:block th:each="code:${session.commonCode.get('DST')}">
+                      <th:block th:if="${code.itemCd eq rate.sectionApprv}" th:text="${code.itemValue}"></th:block>
+                    </th:block>
+                  </label>
+                  <label class="col-sm-1 col-form-label col-form-label-sm text-center py-3">결재자 </label>
+                  <label class="col-sm-2 col-form-label col-form-label-sm text-start py-3">
+                    <th:block th:each="code:${session.commonCode.get('JT')}">
+                      <th:block th:if="${rate.sectionTitle eq code.itemCd}" th:text="${code.itemValue}"></th:block>
+                    </th:block>
+                    <th:block th:text="${rate.sectionNm}"></th:block>
+                  </label>
+                  <div class="col-7">
+                    <div class="row">
+                      <label class="col-sm-2 col-form-label col-form-label-sm text-center ">결재일시 </label>
+                      <label class="col-sm-10 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(rate.sectionApprvDt, 'yyyy-MM-dd HH:mm:ss')}"></label>
+                      <label class="col-sm-2 col-form-label col-form-label-sm text-center ">기타의견 </label>
+                      <label class="col-sm-10 col-form-label col-form-label-sm text-start" th:text="${rate.sectionEtc}"></label>
+                    </div>
+                  </div>
+                </div>
+                <div class="row  border-top-0 border-secondary" th:if="${#strings.isEmpty(rate.headApprv) eq false}">
+                  <div class="col-2">
+                    <div class="row">
+                      <label class="col-sm-6 col-form-label col-form-label-sm text-center" th:classappend="${rate.headApprv eq 'DST005'?'py-3':''}">결재결과 </label>
+                      <label class="col-sm-6 col-form-label col-form-label-sm text-start" th:classappend="${rate.headApprv eq 'DST005'?'py-3':''}">
+                        <th:block th:each="code:${session.commonCode.get('DST')}">
+                          <th:block th:if="${code.itemCd eq rate.headApprv}" th:text="${code.itemValue}"></th:block>
+                        </th:block>
+                      </label>
+                      <th:block th:if="${rate.headApprv eq 'DST006'}">
+                        <label class="col-sm-6 col-form-label col-form-label-sm text-center">견문평가 </label>
+                        <label class="col-sm-6 col-form-label col-form-label-sm text-start">
+                          <th:block th:each="code:${session.commonCode.get('AAR')}">
+                            <th:block th:if="${code.itemCd eq rate.affairRate}" th:text="|${code.itemValue}${rate.organUp eq 'T'?'(상보)':''}|"></th:block>
+                          </th:block>
+                        </label>
+                      </th:block>
+                    </div>
+                  </div>
+                  <label class="col-sm-1 col-form-label col-form-label-sm text-center py-3">결재자 </label>
+                  <label class="col-sm-2 col-form-label col-form-label-sm text-start py-3">
+                    <th:block th:each="code:${session.commonCode.get('JT')}">
+                      <th:block th:if="${rate.headTitle eq code.itemCd}" th:text="${code.itemValue}"></th:block>
+                    </th:block>
+                    <th:block th:text="${rate.headNm}"></th:block>
+                  </label>
+                  <div class="col-7">
+                    <div class="row">
+                      <label class="col-sm-2 col-form-label col-form-label-sm text-center ">결재일시 </label>
+                      <label class="col-sm-10 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(rate.headApprvDt, 'yyyy-MM-dd HH:mm:ss')}"></label>
+                      <label class="col-sm-2 col-form-label col-form-label-sm text-center ">기타의견 </label>
+                      <label class="col-sm-10 col-form-label col-form-label-sm text-start" th:text="${rate.headEtc}"></label>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </th:block>
+        </div>
+      </div>
     </div>
     <th:block th:if="${userOrgan eq 'OG001' and accessAuth eq 'ACC003'}">
       <!--본청 관리자의 평가 수정 양식-->