From e6b03b4f5078f8864bffb2aae2a7513dada58008 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: Tue, 14 Feb 2023 14:53:24 +0900
Subject: [PATCH] =?UTF-8?q?=EB=AC=B8=EC=84=9C=EB=B2=88=ED=98=B8=20?=
 =?UTF-8?q?=EC=A1=B0=EA=B1=B4=20=EC=B6=94=EA=B0=80.=20=EA=B2=B0=EC=A0=9C?=
 =?UTF-8?q?=EC=8B=9C=20=EA=B2=B0=EC=A0=9C=EC=9E=90=20=EA=B3=84=EA=B8=89=20?=
 =?UTF-8?q?=EC=A0=80=EC=9E=A5=EB=90=98=EC=A7=80=20=EC=95=8A=EB=8D=98=20?=
 =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/fpiMgt/affair/service/AffairService.java  | 10 ++++++----
 src/main/resources/mybatisMapper/AffairMapper.xml  |  1 +
 .../fpiMgt/affair/affairViewModal.html             | 14 ++++++++++++--
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/service/AffairService.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/service/AffairService.java
index 7f16d85e..e76dd305 100644
--- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/service/AffairService.java
+++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/service/AffairService.java
@@ -123,8 +123,8 @@ public class AffairService extends BaseService { // 견문보고
     }
   }
 
-  private String makeDocNo(String wrtOrgan){
-    String docNo = ((Integer)LocalDate.now().getYear()).toString();
+  private String makeDocNo(String wrtOrgan, Integer year){
+    String docNo = year.toString();
     Map<String, Object> params = new HashMap<>();
     params.put("wrtOrgan", wrtOrgan);
     params.put("year", docNo);
@@ -138,6 +138,7 @@ public class AffairService extends BaseService { // 견문보고
       AffairRating savedRating = affairRatingRepository.findById(new AffairRating.AffairRatingId(rating.getAffairKey(), loginUser.getOgCd())).orElse(null);
       if(savedRating != null){
         if(rating.getHeadApprv() == null){
+          savedRating.setSectionTitle(loginUser.getTitleCd());
           savedRating.setSectionNm(loginUser.getUserNm());
           savedRating.setSectionApprvDt(LocalDateTime.now());
           savedRating.setSectionApprv(rating.getSectionApprv());
@@ -156,6 +157,7 @@ public class AffairService extends BaseService { // 견문보고
               break;
           }
         }else{
+          savedRating.setHeadTitle(loginUser.getTitleCd());
           savedRating.setHeadNm(loginUser.getUserNm());
           savedRating.setHeadApprvDt(LocalDateTime.now());
           savedRating.setHeadApprv(rating.getHeadApprv());
@@ -167,7 +169,7 @@ public class AffairService extends BaseService { // 견문보고
             AffairBoard affairBoard = affairBoardRepository.findById(savedRating.getAffairKey()).orElse(null);
             if(affairBoard.getDocNo() == null
                 && affairBoard.getWrtOrgan().equals(savedRating.getRatingOrgan())){
-              affairBoard.setDocNo(makeDocNo(affairBoard.getWrtOrgan()));
+              affairBoard.setDocNo(makeDocNo(affairBoard.getWrtOrgan(), affairBoard.getReportDt().getYear()));
             }
           }
           if(savedRating.getOrganUp().equals("T")){
@@ -261,7 +263,7 @@ public class AffairService extends BaseService { // 견문보고
             AffairBoard affairBoard = affairBoardRepository.findById(rating.getAffairKey()).orElse(null);
             if(affairBoard.getDocNo() == null
                 && affairBoard.getWrtOrgan().equals(rating.getRatingOrgan())){
-              affairBoard.setDocNo(makeDocNo(affairBoard.getWrtOrgan()));
+              affairBoard.setDocNo(makeDocNo(affairBoard.getWrtOrgan(), affairBoard.getReportDt().getYear()));
             }
           }
         }else if(!Utils.isEmpty(rating.getSectionApprv())) {
diff --git a/src/main/resources/mybatisMapper/AffairMapper.xml b/src/main/resources/mybatisMapper/AffairMapper.xml
index 9fa634e5..05cde30b 100644
--- a/src/main/resources/mybatisMapper/AffairMapper.xml
+++ b/src/main/resources/mybatisMapper/AffairMapper.xml
@@ -144,6 +144,7 @@
            inner join affair_rating b
                       on a.affair_key = b.affair_key and a.wrt_organ = b.rating_organ and b.affair_status = 'DST006'
     where wrt_organ = #{wrtOrgan}
+      and a.doc_no is not null
       and EXTRACT(YEAR FROM report_dt) = #{year}::numeric
   </select>
 
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html b/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html
index 8eae8509..22bae91e 100644
--- a/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html
+++ b/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html
@@ -145,7 +145,12 @@
                     </th:block>
                   </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="${rate.sectionNm}"></label>
+                  <label class="col-sm-2 col-form-label col-form-label-sm text-start">
+                    <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>
                   <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="${#temporals.format(rate.sectionApprvDt, 'yyyy-MM-dd HH:mm:ss')}"></label>
                 </div>
@@ -172,7 +177,12 @@
                     </label>
                   </th:block>
                   <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="${rate.headNm}"></label>
+                  <label class="col-sm-2 col-form-label col-form-label-sm text-start">
+                    <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>
                   <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="${#temporals.format(rate.headApprvDt, 'yyyy-MM-dd HH:mm:ss')}"></label>
                 </div>