일괄결제 작업중.

src/main/java/com/dbnt/faisp/fpiMgt/affair/AffairController.java

@@ -36,6 +36,7 @@ public class AffairController { // 첩보수집활동 > 외사경찰 견문관
     switch (accessAuth){
       case "ACC001": // 조회
       case "ACC002": // 작성
+        affairBoard.setWrtUserSeq(loginUser.getUserSeq());
         break;
       case "ACC003": // 관리 // 자신 외 하위 기관에서 작성한 문서 열람가능
         affairBoard.setDownOrganCdList(loginUser.getDownOrganCdList());
@@ -45,6 +46,7 @@ public class AffairController { // 첩보수집활동 > 외사경찰 견문관
     //결재권한 확인
     String apprvAuth = authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/affair/affairMgt").get(0).getApprovalAuth();
     affairBoard.setRatingOrgan(loginUser.getOgCd());
+
     mav.addObject("accessAuth", accessAuth);
     mav.addObject("apprvAuth", apprvAuth);
     affairBoard.setQueryInfo();
@@ -101,6 +103,7 @@ public class AffairController { // 첩보수집활동 > 외사경찰 견문관
     affairBoard.setContentCnt(affairService.selectAffairBoardListCnt(affairBoard));
     affairBoard.setPaginationInfo();
     mav.addObject("searchParams", affairBoard);
+    mav.addObject("ratingCodeList", codeMgtService.selectCodeMgtList("AAR"));
     return mav;
   }
 

src/main/java/com/dbnt/faisp/fpiMgt/affair/model/AffairBoard.java

@@ -60,6 +60,10 @@ public class AffairBoard extends BaseModel {
   @Column(name = "view_status")
   private String viewStatus;
 
+  @Transient
+  private String organUp;
+  @Transient
+  private String affairRate;
   @Transient
   private String affairStatus;
   @Transient

src/main/resources/mybatisMapper/AffairMapper.xml

@@ -67,7 +67,9 @@
            a.wrt_user_seq,
            a.wrt_dt,
            b.fileCnt,
-           c.affair_status
+           c.affair_status,
+           c.affair_rate,
+           c.organ_up
     from affair_board a
         left outer join (select affair_key,
                                    count(file_seq) as fileCnt

src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html

@@ -89,6 +89,12 @@
                           <th>작성일시</th>
                           <th>첨부파일</th>
                           <th>상태</th>
+                          <th:block th:if="${page ne 'main'}">
+                            <th>평가</th>
+                            <th:block th:if="${page eq 'commit'}">
+                              <th>상보</th>
+                            </th:block>
+                          </th:block>
                         </tr>
                         </thead>
                         <tbody>
@@ -111,12 +117,46 @@
                           <td th:if="${affair.affairStatus eq 'DST004'}">계장결재</td>
                           <td th:if="${affair.affairStatus eq 'DST005'}">부장반려</td>
                           <td th:if="${affair.affairStatus eq 'DST006'}">부장결재</td>
+                          <th:block th:if="${page eq 'stay'}">
+                            <th:block th:if="${apprvAuth eq 'APC004' or apprvAuth eq 'APC003'}">
+                              <td>
+                                <input type="radio" th:id="|apprvChkbox${affair.affairKey}DST004|" th:name="|apprvChkbox${affair.affairKey}|" value="DST004">
+                                <label th:for="|apprvChkbox${affair.affairKey}DST004|">결재</label>
+                                <input type="radio" th:id="|apprvChkbox${affair.affairKey}DST003|" th:name="|apprvChkbox${affair.affairKey}|" value="DST003">
+                                <label th:for="|apprvChkbox${affair.affairKey}DST003|">반려</label>
+                              </td>
+                            </th:block>
+                            <th:block th:if="${apprvAuth eq 'APC002' or apprvAuth eq 'APC001'}">
+                              <td>
+                                <select class="form-select form-select-sm">
+                                  <option>선택</option>
+                                  <th:block th:each="ratingCode:${ratingCodeList}">
+                                    <option th:value="${ratingCode.itemCd}" th:text="${ratingCode.itemValue}"></option>
+                                  </th:block>
+                                </select>
+                              </td>
+                            </th:block>
+                          </th:block>
+                          <th:block th:if="${page eq 'commit'}">
+                            <th:block th:if="${affair.affairStatus eq 'DST006'}">
+                              <th:block th:each="ratingCode:${session.commonCode.get('AAR')}">
+                                <td th:if="${ratingCode.itemCd eq affair.affairRate}" th:text="${ratingCode.itemValue}"></td>
+                              </th:block>
+                              <td th:text="${affair.organUp eq 'T'?'O':'X'}"></td>
+                            </th:block>
+                            <th:block th:unless="${affair.affairStatus eq 'DST006'}">
+                              <td></td>
+                              <td></td>
+                            </th:block>
+                          </th:block>
                         </tr>
                         </tbody>
                       </table>
                     </div>
                     <div class="row justify-content-between">
-                      <div class="col-auto"></div>
+                      <div class="col-auto">
+                        <input type="button" class="btn btn-success" value="등록" id="addAffairBtn" th:unless="${accessAuth eq 'ACC001'}">
+                      </div>
                       <div class="col-auto">
                         <nav aria-label="Page navigation">
                           <ul class="pagination">
@@ -143,7 +183,7 @@
                         </nav>
                       </div>
                       <div class="col-auto">
-                        <input type="button" class="btn btn-success" value="등록" id="addAffairBtn" th:unless="${accessAuth eq 'ACC001'}">
+                        <input type="button" class="btn btn-warning" value="결재" id="addAffairBtn" th:if="${page eq 'stay' and apprvAuth ne null}">
                       </div>
                     </div>
                   </div>