diff --git a/src/main/java/com/dbnt/faisp/controller/FpiMgtController.java b/src/main/java/com/dbnt/faisp/controller/FpiMgtController.java index 34ee3bc4..e3dffd27 100644 --- a/src/main/java/com/dbnt/faisp/controller/FpiMgtController.java +++ b/src/main/java/com/dbnt/faisp/controller/FpiMgtController.java @@ -22,9 +22,10 @@ public class FpiMgtController { // 외사경찰견문관리 public ModelAndView monthPlanPage(@AuthenticationPrincipal UserInfo loginUser, BoardPlan boardPlan){ ModelAndView mav = new ModelAndView("igActivities/fpiMgt/monthPlan/monthPlan"); mav.addObject("loginUser", loginUser); + boardPlan.setWrtNm(loginUser.getUserNm()); boardPlan.setQueryInfo(); - mav.addObject("monthPlanList", null); - boardPlan.setContentCnt(0); + mav.addObject("planList", monthPlanService.selectBoardPlanList(boardPlan)); + boardPlan.setContentCnt(monthPlanService.selectBoardPlanListCnt(boardPlan)); boardPlan.setPaginationInfo(); mav.addObject("searchParams", boardPlan); return mav; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/MonthPlanService.java b/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/MonthPlanService.java index 498bf5cc..15dce4c0 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/MonthPlanService.java +++ b/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/MonthPlanService.java @@ -1,6 +1,7 @@ package com.dbnt.faisp.fpiMgt.monthPlan; +import com.dbnt.faisp.fpiMgt.monthPlan.mapper.MonthPlanMapper; import com.dbnt.faisp.fpiMgt.monthPlan.model.BoardPlan; import com.dbnt.faisp.fpiMgt.monthPlan.model.PlanFile; import com.dbnt.faisp.fpiMgt.monthPlan.model.PlanMainInfo; @@ -20,6 +21,7 @@ public class MonthPlanService { private final BoardPlanRepository boardPlanRepository; private final PlanFileRepository planFileRepository; private final PlanMainInfoRepository planMainInfoRepository; + private final MonthPlanMapper monthPlanMapper; public BoardPlan selectBoardPlan(Integer planKey) { BoardPlan savedPlan = boardPlanRepository.findById(planKey).orElse(null); @@ -47,4 +49,12 @@ public class MonthPlanService { } return planSeq; } + + public List selectBoardPlanList(BoardPlan boardPlan) { + return monthPlanMapper.selectBoardPlanList(boardPlan); + } + + public Integer selectBoardPlanListCnt(BoardPlan boardPlan) { + return monthPlanMapper.selectBoardPlanListCnt(boardPlan); + } } diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/mapper/MonthPlanMapper.java b/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/mapper/MonthPlanMapper.java new file mode 100644 index 00000000..c47763fd --- /dev/null +++ b/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/mapper/MonthPlanMapper.java @@ -0,0 +1,14 @@ +package com.dbnt.faisp.fpiMgt.monthPlan.mapper; + +import com.dbnt.faisp.fpiMgt.monthPlan.model.BoardPlan; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface MonthPlanMapper { + + List selectBoardPlanList(BoardPlan boardPlan); + + Integer selectBoardPlanListCnt(BoardPlan boardPlan); +} diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/mapper/fpiMgtMapper.java b/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/mapper/fpiMgtMapper.java deleted file mode 100644 index c21994c4..00000000 --- a/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/mapper/fpiMgtMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.dbnt.faisp.fpiMgt.monthPlan.mapper; - -import com.dbnt.faisp.menuMgt.model.MenuMgt; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -@Mapper -public interface fpiMgtMapper { - - List selectMenuMgtList(MenuMgt menuMgt); - - Integer selectMenuMgtListCnt(MenuMgt menuMgt); - - List selectAccessMenuListWhereUserSeq(Integer userSeq); -} diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/model/BoardPlan.java b/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/model/BoardPlan.java index 1a58a5ea..83fc72e2 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/model/BoardPlan.java +++ b/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/model/BoardPlan.java @@ -49,7 +49,7 @@ public class BoardPlan extends BaseModel { @Column(name = "wrt_nm") private String wrtNm; @Column(name = "wrt_dt") - @DateTimeFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") private LocalDateTime wrtDt; @Transient diff --git a/src/main/resources/mybatisMapper/MonthPlanMapper.xml b/src/main/resources/mybatisMapper/MonthPlanMapper.xml new file mode 100644 index 00000000..b114d3ed --- /dev/null +++ b/src/main/resources/mybatisMapper/MonthPlanMapper.xml @@ -0,0 +1,41 @@ + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/templates/igActivities/fpiMgt/monthPlan/monthPlan.html b/src/main/resources/templates/igActivities/fpiMgt/monthPlan/monthPlan.html index 5cb905b7..4891206e 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/monthPlan/monthPlan.html +++ b/src/main/resources/templates/igActivities/fpiMgt/monthPlan/monthPlan.html @@ -13,70 +13,103 @@
-
- -
-
- -
-
-
-
- + +
+ + +
+
+ +
+
+
+
+ +
+
-
-
- -
-
-
-
-
- - - - - - - - -
-
-
-
-
- + +
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
제목시행일자작성자작성일시첨부파일상태
계장결재계장반려부장결재부장반려임시저장결재대기
-
- +
+
+
+ +
+
+ +
diff --git a/src/main/resources/templates/igActivities/fpiMgt/monthPlan/planEditModal.html b/src/main/resources/templates/igActivities/fpiMgt/monthPlan/planEditModal.html index e7e024cd..abb37ef3 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/monthPlan/planEditModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/monthPlan/planEditModal.html @@ -4,15 +4,16 @@ +
- +
- +