From de8a0e42ea29353300a9ed5ebb4f2ff98636c3b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Thu, 31 Aug 2023 18:19:21 +0900 Subject: [PATCH] =?UTF-8?q?2,3=EC=88=9C=EC=9C=84=20=EB=A7=88=EC=9D=B4?= =?UTF-8?q?=EA=B7=B8=EB=A0=88=EC=9D=B4=EC=85=98.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../publicBoard/PublicBoardController.java | 26 +++- .../mybatisMapper/PublicBoardMapper.xml | 2 +- .../resources/templates/fragments/header.html | 13 ++ .../templates/publicBoard/faics/board.html | 132 ++++++++++++++++++ .../publicBoard/faics/viewModal.html | 73 ++++++++++ 5 files changed, 244 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/templates/publicBoard/faics/board.html create mode 100644 src/main/resources/templates/publicBoard/faics/viewModal.html diff --git a/src/main/java/com/dbnt/faisp/main/publicBoard/PublicBoardController.java b/src/main/java/com/dbnt/faisp/main/publicBoard/PublicBoardController.java index 75a47cdc..a952cb79 100644 --- a/src/main/java/com/dbnt/faisp/main/publicBoard/PublicBoardController.java +++ b/src/main/java/com/dbnt/faisp/main/publicBoard/PublicBoardController.java @@ -18,7 +18,7 @@ import java.util.List; @RestController @RequiredArgsConstructor -@RequestMapping("/publicBoard") +@RequestMapping({"/publicBoard","/faics"}) public class PublicBoardController { private final PublicBoardService publicBoardService; private final CodeMgtService codeMgtService; @@ -105,6 +105,28 @@ public class PublicBoardController { return mav; } + @GetMapping("/{board}") + public ModelAndView faicsPage(@PathVariable String board, @AuthenticationPrincipal UserInfo loginUser, PublicBoard publicBoard) { + ModelAndView mav = new ModelAndView("publicBoard/faics/board"); + switch (board){ + case "fa_info_rpt": + publicBoard.setPublicType("외사정보보고"); + break; + case "susa": + publicBoard.setPublicType("외사수사업무공유"); + break; + case "fa_arrest_rpt": + publicBoard.setPublicType("기존사건자료"); + break; + } + publicBoard.setQueryInfo(); + mav.addObject("boardList", publicBoardService.selectContentList(publicBoard)); + publicBoard.setContentCnt(publicBoardService.selectContentListCnt(publicBoard)); + publicBoard.setPaginationInfo(); + mav.addObject("searchParams", publicBoard); + mav.addObject("board", board); + return mav; + } @GetMapping("/editModal") public ModelAndView editModal(@AuthenticationPrincipal UserInfo loginUser, PublicBoard publicBoard) { @@ -154,6 +176,8 @@ public class PublicBoardController { case "PLB004": // Q&A mav = new ModelAndView("publicBoard/qna/qnaViewModal"); break; + default: + mav = new ModelAndView("publicBoard/faics/viewModal"); } mav.addObject("modalType", publicBoard.getModalType()); mav.addObject("userSeq", loginUser.getUserSeq()); diff --git a/src/main/resources/mybatisMapper/PublicBoardMapper.xml b/src/main/resources/mybatisMapper/PublicBoardMapper.xml index c3a29d32..a626e6c2 100644 --- a/src/main/resources/mybatisMapper/PublicBoardMapper.xml +++ b/src/main/resources/mybatisMapper/PublicBoardMapper.xml @@ -75,7 +75,7 @@ group by public_key) c on a.public_key = c.public_key - order by public_key desc + order by wrt_dt desc limit #{rowCnt} offset #{firstIndex} + +
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+
+ + +
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
순번제목첨부파일관서부서계급작성자작성일시
+
+
+
+
+
+ +
+
+ +
+
+
+
+
+
+
+
+
+ + + + \ No newline at end of file diff --git a/src/main/resources/templates/publicBoard/faics/viewModal.html b/src/main/resources/templates/publicBoard/faics/viewModal.html new file mode 100644 index 00000000..582072c1 --- /dev/null +++ b/src/main/resources/templates/publicBoard/faics/viewModal.html @@ -0,0 +1,73 @@ + + + + \ No newline at end of file