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 employees = new ArrayList<>(); - @OneToMany(mappedBy = "employee_booklend") - private List employees_booklend = new ArrayList<>(); + @OneToMany(mappedBy = "employeeBooklend") + private List 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 @@ - + @@ -15,20 +15,36 @@ - + + - + + + + + + + - - + + + + + + + + + +
社員ID社員名管理IDタイトル返却予定日超過日数
+ + -