diff --git a/team1/pom.xml b/team1/pom.xml index 8b03b4f..0d4f3c7 100644 --- a/team1/pom.xml +++ b/team1/pom.xml @@ -74,16 +74,6 @@ spring-boot-starter-webmvc-test test - - com.example - HelloSpring - 0.0.1-SNAPSHOT - - - com.example.rhizome - EM-Spring - 0.0.1-SNAPSHOT - diff --git a/team1/src/main/java/com/example/demo/controller/LendingListController.java b/team1/src/main/java/com/example/demo/controller/LendingListController.java index 3f9c2bc..e72e06b 100644 --- a/team1/src/main/java/com/example/demo/controller/LendingListController.java +++ b/team1/src/main/java/com/example/demo/controller/LendingListController.java @@ -1,35 +1,58 @@ package com.example.demo.controller; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; + +import com.example.demo.service.LendingListService; @Controller public class LendingListController { + + @Autowired + LendingListService lendingListService; + + public LendingListController(LendingListService lendingListService) { + this.lendingListService = lendingListService; + } + + //貸出中書籍一覧を表示 + @RequestMapping(value = "/lendingList", method = RequestMethod.GET) + //lendingListにアクセスしたときに実行されるメソッド + public String index(Model model) { + //サービスと連携する処理 + //サービスから一覧を取得し、borrowListという名前でHTMLに渡す + model.addAttribute("borrowList", lendingListService.getBorrowList()); + //表示するHTML + return "lendingList"; + } + + //メニューに戻る + @RequestMapping(value = "/menu", method = RequestMethod.GET) + public String menu() { + return "menu"; + } + + //書籍返却ページに遷移 + @RequestMapping(value = "/returnConfirm", method = RequestMethod.GET) + //返却確認ページにアクセスしたときに実行されるメソッド + public String returnConfirm( + //URLから送られた申請IDを受け取る + @RequestParam("idRequest") Integer idRequest, Model model) { + //受け取った申請IDをidRequestという名前でHTMLに渡す + model.addAttribute("idRequest", idRequest); + //上記で渡すHTMLのURL + return "returnConfirm"; + } -// @GetMapping("/lendingList") -// public String show(Model model) { -// List x = xservice.getX(); -// model.addAttribute("Y", x); -// return "Y"; -// } - - -// HttpSession session; -// -// @Autowired -// public SelectListController(HttpSession session) { -// this.session=session; -// } - -// @RequestMapping("/lendingList") -// public String lendList() { -// return "lendingList"; -// } - -// @RequestMapping(value = lendingList, method = RequestMethod.POST) -// public String select( , Model model) { -// model.addAttribute( -// ); -// return lendingList; -// -// } + //@GetMapping("/lendingList")//登録されているデータを取得する役割を果たす + // public String show(Model model) { + // List x = xservice.getX(); + // model.addAttribute("Y", x); + // return LendingListService.select; + // } + // } diff --git a/team1/src/main/java/com/example/demo/controller/MenuController.java b/team1/src/main/java/com/example/demo/controller/MenuController.java new file mode 100644 index 0000000..d78d3c6 --- /dev/null +++ b/team1/src/main/java/com/example/demo/controller/MenuController.java @@ -0,0 +1,15 @@ +package com.example.demo.controller; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; + + +@Controller +public class MenuController { + + @RequestMapping(value = "/menu", method = RequestMethod.GET) + public String showmenu() { + return "menu"; + } +} diff --git a/team1/src/main/java/com/example/demo/model/LeadingListModel.java b/team1/src/main/java/com/example/demo/model/LeadingListModel.java new file mode 100644 index 0000000..3d18b2c --- /dev/null +++ b/team1/src/main/java/com/example/demo/model/LeadingListModel.java @@ -0,0 +1,21 @@ +package com.example.demo.model; + +import java.util.Date; + +import lombok.AllArgsConstructor; +import lombok.Data; + +@Data +@AllArgsConstructor +public class LeadingListModel { + + //データの保持 + private final Integer idRequest; + private final String nmBook; + private final String nmEmployee; + private final Date dateRequest; + private final Date dateBorrow; + private final Date dateScheduledReturn; + + +} diff --git a/team1/src/main/java/com/example/demo/service/LendingListService.java b/team1/src/main/java/com/example/demo/service/LendingListService.java index 7251871..bc3dde6 100644 --- a/team1/src/main/java/com/example/demo/service/LendingListService.java +++ b/team1/src/main/java/com/example/demo/service/LendingListService.java @@ -1,12 +1,13 @@ package com.example.demo.service; -import javax.transaction.Transactional; +import java.util.List; + +import jakarta.transaction.Transactional; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.example.demo.entity.EmployeeEntity; -import com.example.demo.repository.Book_CollectionRepository; +import com.example.demo.model.LeadingListModel; import com.example.demo.repository.Borrow_BooksRepository; @Service @@ -14,14 +15,20 @@ import com.example.demo.repository.Borrow_BooksRepository; public class LendingListService { @Autowired - private Book_CollectionRepository collection; - @Autowired - private Borrow_BooksRepository borrow; - @Autowired - private EmployeeEntity employee; - - public List getcollectionWithborrow(){ - return collection; + Borrow_BooksRepository borrowrepo; + + public LendingListService(Borrow_BooksRepository borrowrepo) { + this.borrowrepo = borrowrepo; } + //貸出中書籍の一覧を取得したい + public ListgetBorrowList(){ + //リポジトリに取得を託す。取得したらコントローラーに返す + return borrowrepo.findLendingList(); + } + +// public List getBorrowList(){ +// List borrowentity = Borrow_BooksRepository.findAll(); +// leadinglistdto.status(equals("2")); +// } } diff --git a/team1/src/main/resources/templates/lendingList.html b/team1/src/main/resources/templates/lendingList.html index b4515b6..80ca9cb 100644 --- a/team1/src/main/resources/templates/lendingList.html +++ b/team1/src/main/resources/templates/lendingList.html @@ -1,9 +1,9 @@ - + - -貸出中書籍一覧 + + 貸出中書籍一覧 @@ -11,34 +11,44 @@
- メニューに戻る -

検索結果

- - - - - - - - - - - - - - - - - - - - - + メニューに戻る +

検索結果

+
申請ID申請者名書籍名申請日貸出日返却予定日操作
-
- - -
-
+ + + + + + + + + + + + + + + + + + + + + + +
申請ID申請者名書籍名申請日貸出日返却予定日操作
+ +
+ + + +
+
+
+ + 貸出中の書籍はありません + + \ No newline at end of file diff --git a/team1/src/main/resources/templates/menu.html b/team1/src/main/resources/templates/menu.html new file mode 100644 index 0000000..7f433c8 --- /dev/null +++ b/team1/src/main/resources/templates/menu.html @@ -0,0 +1,34 @@ + + + + + + メニュー + + + +

+ メインメニュー +
+ ログイン者名： + +
+

+ + + + + + + + +
+ 書籍検索 +
+ 書籍貸出申請一覧 +
+ + + + + \ No newline at end of file