diff --git a/src/main/java/com/dbnt/faisp/config/BaseController.java b/src/main/java/com/dbnt/faisp/config/BaseController.java index 428b7d88..cf57884f 100644 --- a/src/main/java/com/dbnt/faisp/config/BaseController.java +++ b/src/main/java/com/dbnt/faisp/config/BaseController.java @@ -1,9 +1,11 @@ package com.dbnt.faisp.config; +import com.dbnt.faisp.main.authMgt.service.AuthMgtService; import com.dbnt.faisp.main.codeMgt.model.CodeMgt; import com.dbnt.faisp.main.faRpt.model.FaRptBoard; import com.dbnt.faisp.main.faRpt.service.FaRptService; import com.dbnt.faisp.main.fpiMgt.affair.model.AffairBoard; +import com.dbnt.faisp.main.fpiMgt.affair.model.DashboardAffair; import com.dbnt.faisp.main.fpiMgt.affair.service.AffairService; import com.dbnt.faisp.main.menuMgt.service.MenuMgtService; import com.dbnt.faisp.main.organMgt.service.OrganConfigService; @@ -37,6 +39,7 @@ public class BaseController { private final FaRptService faRptService; private final AffairService affairService; private final UserAlarmService userAlarmService; + private final AuthMgtService authMgtService; @GetMapping("/") public ModelAndView loginCheck(@AuthenticationPrincipal UserInfo loginUser) { @@ -76,29 +79,39 @@ public class BaseController { PublicBoard noticeParams = new PublicBoard(); noticeParams.setPublicType("PLB001"); - noticeParams.setRowCnt(7); + noticeParams.setRowCnt(8); noticeParams.setDownOrganCdList(loginUser.getDownOrganCdList()); noticeParams.setUpOrganCdList(loginUser.getUpOrganCdList()); mav.addObject("noticeList", publicBoardService.selectContentList(noticeParams)); UserAlarm alarm = new UserAlarm(); alarm.setUserSeq(loginUser.getUserSeq()); alarm.setViewYn("N"); - alarm.setRowCnt(7); + alarm.setRowCnt(8); mav.addObject("dashboardAlarmList", userAlarmService.selectAlarmList(alarm)); FaRptBoard faRpt = new FaRptBoard(); faRpt.setActiveTab("receive"); - faRpt.setRowCnt(7); + faRpt.setRowCnt(8); faRpt.setStatus("DST007"); faRpt.setReceiveUserSeq(loginUser.getUserSeq()); mav.addObject("faRptList", faRptService.selectFaRptList(faRpt)); - AffairBoard affair = new AffairBoard(); + + DashboardAffair affair = new DashboardAffair(); + affair.setPlanApprv(authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/affairPlan/planMgt").get(0).getApprovalAuth()); + affair.setAffairApprv(authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/affair/affairMgt/myReport?affairCategory=CAT215").get(0).getApprovalAuth()); + affair.setResultApprv(authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/affairResult/resultMgt").get(0).getApprovalAuth()); + affair.setUserSeq(loginUser.getUserSeq()); + affair.setOgCd(loginUser.getOgCd()); + mav.addObject("affair1List", affairService.selectDashboardAffairList(affair)); + affair.setAffairApprv(authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/affair/affairMgt/myReport?affairCategory=CAT216").get(0).getApprovalAuth()); + mav.addObject("affair2List", affairService.selectDashboardIntelligenceNetworkList(affair)); + /*AffairBoard affair = new AffairBoard(); affair.setAffairCategory("CAT215"); affair.setRatingOrgan(loginUser.getOgCd()); - affair.setRowCnt(7); + affair.setRowCnt(8); mav.addObject("affair1List", affairService.selectAffairBoardList(affair)); affair.setAffairCategory("CAT216"); - mav.addObject("affair2List", affairService.selectAffairBoardList(affair)); + mav.addObject("affair2List", affairService.selectAffairBoardList(affair));*/ return mav; } diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/mapper/AffairMapper.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/mapper/AffairMapper.java index c1f1e1bc..10678942 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/mapper/AffairMapper.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/mapper/AffairMapper.java @@ -1,6 +1,7 @@ package com.dbnt.faisp.main.fpiMgt.affair.mapper; import com.dbnt.faisp.main.fpiMgt.affair.model.AffairBoard; +import com.dbnt.faisp.main.fpiMgt.affair.model.DashboardAffair; import com.dbnt.faisp.main.fpiMgt.affair.model.TypeStatistics; import org.apache.ibatis.annotations.Mapper; @@ -35,4 +36,8 @@ public interface AffairMapper { List selectArrCntList(TypeStatistics typeStatistics); String selectDocNo(Map params); + + List selectDashboardAffairList(DashboardAffair affair); + + List selectDashboardIntelligenceNetworkList(DashboardAffair affair); } diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/model/DashboardAffair.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/model/DashboardAffair.java new file mode 100644 index 00000000..bb27511a --- /dev/null +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/model/DashboardAffair.java @@ -0,0 +1,23 @@ +package com.dbnt.faisp.main.fpiMgt.affair.model; + +import com.dbnt.faisp.config.BaseModel; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +public class DashboardAffair extends BaseModel { + private String board; + private Integer key; + private String title; + private String wrtUserNm; + private String wrtUserGrd; + + private String planApprv; + private String affairApprv; + private String resultApprv; + private Integer userSeq; + private String ogCd; +} 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 e76dd305..ebb2d673 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 @@ -36,6 +36,14 @@ public class AffairService extends BaseService { // 견문보고 private final HashTagLinkRepository hashTagLinkRepository; private final AffairMapper affairMapper; + public List selectDashboardAffairList(DashboardAffair affair){ + return affairMapper.selectDashboardAffairList(affair); + } + + public List selectDashboardIntelligenceNetworkList(DashboardAffair affair) { + return affairMapper.selectDashboardIntelligenceNetworkList(affair); + } + public List selectAffairBoardList(AffairBoard affair){ return affairMapper.selectAffairBoardList(affair); } @@ -319,5 +327,4 @@ public class AffairService extends BaseService { // 견문보고 public List selectArrCntList(TypeStatistics typeStatistics) { return affairMapper.selectArrCntList(typeStatistics); } - } diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/PlanController.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/PlanController.java index 3d4753ce..3725c8d3 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/PlanController.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/PlanController.java @@ -162,6 +162,7 @@ public class PlanController { // 첩보수집활동 > 외사경찰 견문관리 planBoard.setWrtOrgan(loginUser.getOgCd()); planBoard.setWrtPart(loginUser.getOfcCd()); planBoard.setWrtUserSeq(loginUser.getUserSeq()); + planBoard.setWrtUserGrd(loginUser.getTitleCd()); planBoard.setWrtUserNm(loginUser.getUserNm()); planBoard.setWrtDt(LocalDateTime.now()); } @@ -196,6 +197,7 @@ public class PlanController { // 첩보수집활동 > 외사경찰 견문관리 public Integer planStateChange(@AuthenticationPrincipal UserInfo loginUser, PlanApprv apprv){ apprv.setUserSeq(loginUser.getUserSeq()); apprv.setUserNm(loginUser.getUserNm()); + apprv.setUserGrd(loginUser.getTitleCd()); apprv.setSaveDt(LocalDateTime.now()); return planService.planStateChange(apprv); } diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/model/PlanApprv.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/model/PlanApprv.java index cc20fb81..c7fa4bf0 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/model/PlanApprv.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/model/PlanApprv.java @@ -29,6 +29,8 @@ public class PlanApprv { private Integer userSeq; @Column(name = "user_nm") private String userNm; + @Column(name = "user_grd") + private String userGrd; @Column(name = "etc") private String etc; @Column(name = "save_dt") diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/model/PlanBoard.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/model/PlanBoard.java index 2e1b4dd6..c03b37f8 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/model/PlanBoard.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/model/PlanBoard.java @@ -44,6 +44,8 @@ public class PlanBoard extends BaseModel { private String planState; @Column(name = "wrt_user_seq") private Integer wrtUserSeq; + @Column(name = "wrt_user_grd") + private String wrtUserGrd; @Transient private String userType; diff --git a/src/main/resources/mybatisMapper/AffairMapper.xml b/src/main/resources/mybatisMapper/AffairMapper.xml index 2a54b27a..e1533c9a 100644 --- a/src/main/resources/mybatisMapper/AffairMapper.xml +++ b/src/main/resources/mybatisMapper/AffairMapper.xml @@ -656,4 +656,109 @@ on c.wrt_organ = a.item_cd and c.affair_rate = b.item_cd order by wrt_organ,affairType asc + + + \ No newline at end of file diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planEditModal.html b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planEditModal.html index dd8d3a67..904d8a8d 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planEditModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planEditModal.html @@ -12,6 +12,7 @@ +
diff --git a/src/main/resources/templates/login/dashboard.html b/src/main/resources/templates/login/dashboard.html index 380e41c1..7339f3e2 100644 --- a/src/main/resources/templates/login/dashboard.html +++ b/src/main/resources/templates/login/dashboard.html @@ -130,21 +130,28 @@ + - - + - + + - - - - +
게시판 제목작성일시상태작성자
+ 계획수립 + 견문관리 + 청산보고서 + + + + + +
@@ -163,21 +170,29 @@ + - - + - - + - - - - +
게시판 제목작성일시상태작성자
+ + + 운영계획 + 견문관리 + 운영실적 + 해고/연장보고 + + + + + +