From ed78956074115bae4d5a6b4875a374a9f4b7d3f6 Mon Sep 17 00:00:00 2001
From: y-kumaki <2026_04_00501@it-college.co.jp>
Date: Fri, 25 Sep 2026 15:30:31 +0900
Subject: [PATCH] no message

---
 .../java/com/example/demo/entity/Book.java    |  4 +--
 .../com/example/demo/entity/BookLend.java     |  2 +-
 .../com/example/demo/entity/Employee.java     |  4 +--
 src/main/resources/templates/lendList.html    | 28 +++++++++++++++----
 4 files changed, 27 insertions(+), 11 deletions(-)

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 e59e915..539659e 100644
--- a/src/main/java/com/example/demo/entity/BookLend.java
+++ b/src/main/java/com/example/demo/entity/BookLend.java
@@ -31,7 +31,7 @@ public class BookLend {
 
 	@ManyToOne
 	@JoinColumn(name = "employee_id", nullable = false)
-	private Employee employee_booklend;
+	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 6ac1c02..5465caa 100644
--- a/src/main/java/com/example/demo/entity/Employee.java
+++ b/src/main/java/com/example/demo/entity/Employee.java
@@ -34,7 +34,7 @@ public class Employee {
 	@OneToMany(mappedBy = "employee")
 	private List<Book> employees = new ArrayList<>();
 	
-	@OneToMany(mappedBy = "employee_booklend")
-	private List<BookLend> employees_booklend = new ArrayList<>();
+	@OneToMany(mappedBy = "employeeBooklend")
+	private List<BookLend> employeesBooklend = new ArrayList<>();
 	
 }
diff --git a/src/main/resources/templates/lendList.html b/src/main/resources/templates/lendList.html
index c954e4e..36b7f9d 100644
--- a/src/main/resources/templates/lendList.html
+++ b/src/main/resources/templates/lendList.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html xmlns:th="http://www.thymeleaf.org">
 
 <head>
 	<meta charset="UTF-8">
@@ -15,20 +15,36 @@
 		<input type="submit" value="返却" class="btn">
 
 
-
+		<table>
+			
 		<thead>
 			<tr>
 				<th>社員ID</th>
-
+				<th>社員名</th>
+				<th>管理ID</th>
+				<th>タイトル</th>
+				<th>返却予定日</th>
+				<th>超過日数</th>
 			</tr>
 		</thead>
+
+
 		<tbody>
-			<tr th:each="${lendlist}">
-				<td th:text="${lendlist.employeeid}"></td>
+			<tr th:each="booklist : ${list}">
 
+				<td th:text="*{booklist.employeeBooklend.employeeId}"></td>
+				<td th:text="*{booklist.employeeBooklend.employeeName}"></td>
+				<td th:text="*{booklist.book.bookManageId}"></td>
+				<td th:text="*{booklist.book.title}"></td>
+				<td th:text="*{booklist.bookReturnDate}"></td>
+<!--				<td th:text="*{booklist.}"></td>-->
+			</tr>
+		</tbody>
+		</table>
+		
+		
 	</form>
 
-
 	<!-- 以下ポップアップ -->
 	<div id="registerModal" class="modal-overlay">