diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affair/AffairController.java b/src/main/java/com/dbnt/faisp/fpiMgt/affair/AffairController.java index 4b1b0a35..870ea282 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affair/AffairController.java +++ b/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; } diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affair/model/AffairBoard.java b/src/main/java/com/dbnt/faisp/fpiMgt/affair/model/AffairBoard.java index a0105b6d..85a6d6c5 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affair/model/AffairBoard.java +++ b/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 diff --git a/src/main/resources/mybatisMapper/AffairMapper.xml b/src/main/resources/mybatisMapper/AffairMapper.xml index 73834d31..d2e6d885 100644 --- a/src/main/resources/mybatisMapper/AffairMapper.xml +++ b/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 diff --git a/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html b/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html index 23d54559..9114f1f1 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html @@ -89,6 +89,12 @@ 작성일시 첨부파일 상태 + + 평가 + + 상보 + + @@ -111,12 +117,46 @@ 계장결재 부장반려 부장결재 + + + + + + + + + + + + + + + + + + + + + + + + + + +
-
+
+ +
- +