diff --git a/src/main/java/com/example/demo/controller/LendListController.java b/src/main/java/com/example/demo/controller/LendListController.java index 7a2cdfe..981e7ac 100644 --- a/src/main/java/com/example/demo/controller/LendListController.java +++ b/src/main/java/com/example/demo/controller/LendListController.java @@ -1,12 +1,30 @@ package com.example.demo.controller; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; +import com.example.demo.entity.BookLend; +import com.example.demo.service.BookLendService; + + @Controller public class LendListController { + + @Autowired + private BookLendService lendlistService; + @GetMapping("/lendList") - public String lendList() { + public String list(Model model) { + + List aaa = lendlistService.findAll(); + + // findAllを使って、DBから一覧を取得 でバックで取得したのを確認 + model.addAttribute("list",lendlistService.findAll()); + return "lendList"; } diff --git a/src/main/java/com/example/demo/entity/Book.java b/src/main/java/com/example/demo/entity/Book.java index fab3a3b..9b03577 100644 --- a/src/main/java/com/example/demo/entity/Book.java +++ b/src/main/java/com/example/demo/entity/Book.java @@ -26,7 +26,7 @@ public class Book { private int bookId; // 図書管理ID(BK-1など) - @Column(name = "book_manage_id", nullable = true) + @Column(name = "book_manage_id", nullable = true, unique = true) private String bookManageId; // タイトル @@ -78,7 +78,7 @@ public class Book { // 寄贈者社員ID?? @ManyToOne - @JoinColumn(name = "donor_id", nullable = false) + @JoinColumn(name = "donor_id", nullable = true) private Employee employee; //備考 diff --git a/src/main/java/com/example/demo/entity/BookLend.java b/src/main/java/com/example/demo/entity/BookLend.java index 970526f..539659e 100644 --- a/src/main/java/com/example/demo/entity/BookLend.java +++ b/src/main/java/com/example/demo/entity/BookLend.java @@ -8,6 +8,7 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import jakarta.persistence.OneToOne; import jakarta.persistence.Table; @@ -28,9 +29,9 @@ public class BookLend { @JoinColumn(name = "book_manage_id", referencedColumnName = "book_manage_id",nullable = false) private Book book; - // 図書管理ID(BK-1など) - @Column(name = "employee_id", nullable = false) - private Integer employeeId; + @ManyToOne + @JoinColumn(name = "employee_id", nullable = false) + private Employee employeeBooklend; // 貸出日 @Column(name = "book_lend_date", nullable = false) diff --git a/src/main/java/com/example/demo/entity/Employee.java b/src/main/java/com/example/demo/entity/Employee.java index f5a3fda..5465caa 100644 --- a/src/main/java/com/example/demo/entity/Employee.java +++ b/src/main/java/com/example/demo/entity/Employee.java @@ -34,4 +34,7 @@ public class Employee { @OneToMany(mappedBy = "employee") private List employees = new ArrayList<>(); + @OneToMany(mappedBy = "employeeBooklend") + private List employeesBooklend = new ArrayList<>(); + } diff --git a/src/main/java/com/example/demo/repository/BookLendRepository.java b/src/main/java/com/example/demo/repository/BookLendRepository.java new file mode 100644 index 0000000..68d2681 --- /dev/null +++ b/src/main/java/com/example/demo/repository/BookLendRepository.java @@ -0,0 +1,11 @@ +package com.example.demo.repository; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import com.example.demo.entity.BookLend; + +@Repository +public interface BookLendRepository extends JpaRepository { + +} diff --git a/src/main/java/com/example/demo/service/BookLendService.java b/src/main/java/com/example/demo/service/BookLendService.java new file mode 100644 index 0000000..2296807 --- /dev/null +++ b/src/main/java/com/example/demo/service/BookLendService.java @@ -0,0 +1,21 @@ +package com.example.demo.service; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.example.demo.entity.BookLend; +import com.example.demo.repository.BookLendRepository; + +@Service +public class BookLendService { + + @Autowired + private BookLendRepository bookLendRepository; + + public List findAll() { + return bookLendRepository.findAll(); + } + +} \ No newline at end of file diff --git a/src/main/resources/templates/lendList.html b/src/main/resources/templates/lendList.html index 2f9065a..36b7f9d 100644 --- a/src/main/resources/templates/lendList.html +++ b/src/main/resources/templates/lendList.html @@ -1,17 +1,48 @@ - + 貸出中図書一覧 +

貸出中図書一覧

- +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
社員ID社員名管理IDタイトル返却予定日超過日数
+ +