From 47c2df9db98a0a33f24e7aa7b25b8a14ee36acc8 Mon Sep 17 00:00:00 2001 From: s-tajihi <2026_04_00508@it-college.co.jp> Date: Fri, 25 Sep 2026 10:56:37 +0900 Subject: [PATCH 1/8] =?UTF-8?q?[edit]=20=E3=83=A1=E3=82=BD=E3=83=83?= =?UTF-8?q?=E3=83=89=E5=90=8D=E3=81=AE=E5=A4=89=E6=9B=B4=E3=82=92=E3=81=97?= =?UTF-8?q?=E3=81=BE=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/demo/controller/BookLendController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/example/demo/controller/BookLendController.java b/src/main/java/com/example/demo/controller/BookLendController.java index 21f7693..5b535e8 100644 --- a/src/main/java/com/example/demo/controller/BookLendController.java +++ b/src/main/java/com/example/demo/controller/BookLendController.java @@ -5,7 +5,7 @@ import org.springframework.web.bind.annotation.PostMapping; @Controller public class BookLendController { @PostMapping("/bookLend") - public String welcome() { + public String bookLend() { return "bookLend"; } From 22b32a5ea249f9aa6e6fdb562eb0a7bf8bbe3467 Mon Sep 17 00:00:00 2001 From: h-seya <2026_04_00278@it-college.co.jp> Date: Fri, 25 Sep 2026 11:21:05 +0900 Subject: [PATCH 2/8] =?UTF-8?q?[ADD]:=E5=9B=B3=E6=9B=B8=E8=B2=B8=E5=87=BA?= =?UTF-8?q?=E5=87=A6=E7=90=86=E3=81=AB=E4=BD=BF=E7=94=A8=E4=BA=88=E5=AE=9A?= =?UTF-8?q?=E3=81=AE=E3=80=81=E3=82=AF=E3=83=A9=E3=82=B9=E5=8F=8A=E3=81=B3?= =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=82=BF=E3=83=BC=E3=83=95=E3=82=A7=E3=83=BC?= =?UTF-8?q?=E3=82=B9=E3=82=92=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/form/BookLendForm.java | 7 +++++++ .../com/example/demo/repository/BookLendRepository.java | 7 +++++++ .../java/com/example/demo/service/BookLendService.java | 7 +++++++ 3 files changed, 21 insertions(+) create mode 100644 src/main/java/com/example/demo/form/BookLendForm.java create mode 100644 src/main/java/com/example/demo/repository/BookLendRepository.java create mode 100644 src/main/java/com/example/demo/service/BookLendService.java diff --git a/src/main/java/com/example/demo/form/BookLendForm.java b/src/main/java/com/example/demo/form/BookLendForm.java new file mode 100644 index 0000000..ecf8f1f --- /dev/null +++ b/src/main/java/com/example/demo/form/BookLendForm.java @@ -0,0 +1,7 @@ +package com.example.demo.form; + +// 図書の貸出処理に使用予定 + +public class BookLendForm { + +} 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..cb4f1a8 --- /dev/null +++ b/src/main/java/com/example/demo/repository/BookLendRepository.java @@ -0,0 +1,7 @@ +package com.example.demo.repository; + +// 図書の貸出処理に使用予定 + +public interface BookLendRepository { + +} 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..6eb54f1 --- /dev/null +++ b/src/main/java/com/example/demo/service/BookLendService.java @@ -0,0 +1,7 @@ +package com.example.demo.service; + +// 図書の貸出処理に使用予定 + +public class BookLendService { + +} From 67a8576a59e9ce78efe19543b6673deed47bb568 Mon Sep 17 00:00:00 2001 From: s-tajihi <2026_04_00508@it-college.co.jp> Date: Fri, 25 Sep 2026 11:24:24 +0900 Subject: [PATCH 3/8] =?UTF-8?q?[delete]=20=E4=B8=8D=E8=A6=81=E3=81=AA?= =?UTF-8?q?=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=82=92=E5=89=8A=E9=99=A4?= =?UTF-8?q?=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/form/BookForm.java | 5 ----- .../java/com/example/demo/service/BookService.java | 11 ----------- 2 files changed, 16 deletions(-) delete mode 100644 src/main/java/com/example/demo/form/BookForm.java delete mode 100644 src/main/java/com/example/demo/service/BookService.java diff --git a/src/main/java/com/example/demo/form/BookForm.java b/src/main/java/com/example/demo/form/BookForm.java deleted file mode 100644 index bb2ecf0..0000000 --- a/src/main/java/com/example/demo/form/BookForm.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.example.demo.form; - -public class BookForm { - -} diff --git a/src/main/java/com/example/demo/service/BookService.java b/src/main/java/com/example/demo/service/BookService.java deleted file mode 100644 index 6d92083..0000000 --- a/src/main/java/com/example/demo/service/BookService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.example.demo.service; - -import java.util.List; - -import com.example.demo.entity.Book; - -public interface BookService { - String booklist(Book book); - - List findAll(); -} From 14e060588c23b395f2fa046df702c4b8f9e980d5 Mon Sep 17 00:00:00 2001 From: s-tajihi <2026_04_00508@it-college.co.jp> Date: Fri, 25 Sep 2026 12:43:41 +0900 Subject: [PATCH 4/8] =?UTF-8?q?[edit]=20=E3=80=8C=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E3=80=8D=E3=83=9C=E3=82=BF=E3=83=B3=E3=81=8B=E3=82=89=E3=81=AE?= =?UTF-8?q?=E9=81=B7=E7=A7=BB=E3=82=92=E8=BF=BD=E5=8A=A0=E3=81=97=E3=81=BE?= =?UTF-8?q?=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/templates/book.html | 58 +++++++++----------------- 1 file changed, 20 insertions(+), 38 deletions(-) diff --git a/src/main/resources/templates/book.html b/src/main/resources/templates/book.html index 4063ceb..6b3049c 100644 --- a/src/main/resources/templates/book.html +++ b/src/main/resources/templates/book.html @@ -37,7 +37,7 @@ - + @@ -51,48 +51,30 @@ - - - - + + + +
+ + +
+
+ + +
+
+ + +
+ + + - - - - - - -
- -
From ea262e10c5591c5ecc31069e0030fb2101e9c197 Mon Sep 17 00:00:00 2001 From: y-kumaki <2026_04_00501@it-college.co.jp> Date: Fri, 25 Sep 2026 13:30:55 +0900 Subject: [PATCH 5/8] no message --- .../demo/controller/LendListController.java | 20 +++++++++++++++++- .../com/example/demo/entity/BookLend.java | 7 ++++--- .../com/example/demo/entity/Employee.java | 3 +++ .../demo/repository/BookLendRepository.java | 11 ++++++++++ .../example/demo/service/BookLendService.java | 21 +++++++++++++++++++ src/main/resources/templates/lendList.html | 17 ++++++++++++++- 6 files changed, 74 insertions(+), 5 deletions(-) create mode 100644 src/main/java/com/example/demo/repository/BookLendRepository.java create mode 100644 src/main/java/com/example/demo/service/BookLendService.java 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/BookLend.java b/src/main/java/com/example/demo/entity/BookLend.java index 970526f..e59e915 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 employee_booklend; // 貸出日 @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..6ac1c02 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 = "employee_booklend") + private List employees_booklend = 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..c954e4e 100644 --- a/src/main/resources/templates/lendList.html +++ b/src/main/resources/templates/lendList.html @@ -4,16 +4,31 @@ 貸出中図書一覧 +

貸出中図書一覧

- +
+ + + + + + 社員ID + + + + + + +
+