no message

This commit is contained in:
y-kumaki
2026-09-25 15:30:31 +09:00
parent ea262e10c5
commit ed78956074
4 changed files with 27 additions and 11 deletions

View File

@@ -26,7 +26,7 @@ public class Book {
private int bookId; private int bookId;
// 図書管理ID(BK-1など) // 図書管理ID(BK-1など)
@Column(name = "book_manage_id", nullable = true) @Column(name = "book_manage_id", nullable = true, unique = true)
private String bookManageId; private String bookManageId;
// タイトル // タイトル
@@ -78,7 +78,7 @@ public class Book {
// 寄贈者社員ID?? // 寄贈者社員ID??
@ManyToOne @ManyToOne
@JoinColumn(name = "donor_id", nullable = false) @JoinColumn(name = "donor_id", nullable = true)
private Employee employee; private Employee employee;
//備考 //備考

View File

@@ -31,7 +31,7 @@ public class BookLend {
@ManyToOne @ManyToOne
@JoinColumn(name = "employee_id", nullable = false) @JoinColumn(name = "employee_id", nullable = false)
private Employee employee_booklend; private Employee employeeBooklend;
// 貸出日 // 貸出日
@Column(name = "book_lend_date", nullable = false) @Column(name = "book_lend_date", nullable = false)

View File

@@ -34,7 +34,7 @@ public class Employee {
@OneToMany(mappedBy = "employee") @OneToMany(mappedBy = "employee")
private List<Book> employees = new ArrayList<>(); private List<Book> employees = new ArrayList<>();
@OneToMany(mappedBy = "employee_booklend") @OneToMany(mappedBy = "employeeBooklend")
private List<BookLend> employees_booklend = new ArrayList<>(); private List<BookLend> employeesBooklend = new ArrayList<>();
} }

View File

@@ -1,5 +1,5 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html xmlns:th="http://www.thymeleaf.org">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
@@ -15,20 +15,36 @@
<input type="submit" value="返却" class="btn"> <input type="submit" value="返却" class="btn">
<table>
<thead> <thead>
<tr> <tr>
<th>社員ID</th> <th>社員ID</th>
<th>社員名</th>
<th>管理ID</th>
<th>タイトル</th>
<th>返却予定日</th>
<th>超過日数</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr th:each="${lendlist}"> <tr th:each="booklist : ${list}">
<td th:text="${lendlist.employeeid}"></td>
<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> </form>
<!-- 以下ポップアップ --> <!-- 以下ポップアップ -->
<div id="registerModal" class="modal-overlay"> <div id="registerModal" class="modal-overlay">