no message
This commit is contained in:
@@ -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;
|
||||
|
||||
//備考
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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<>();
|
||||
|
||||
}
|
||||
|
||||
@@ -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">
|
||||
|
||||
|
||||
Reference in New Issue
Block a user