[ADD] 貸出中図書一覧の返却処理を追加しました。

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";
 		}
 	

src/main/java/com/example/demo/controller/LendListController.java

@@ -1,13 +1,36 @@
 package com.example.demo.controller;
 
+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 org.springframework.web.bind.annotation.RequestParam;
+
+import com.example.demo.service.BookLendService;
+
 
 @Controller
 public class LendListController {
+	
+	@Autowired
+	private BookLendService lendlistService;
+	
 	@GetMapping("/lendList")
-	public String lendList() {
+	public String list(Model model) {
+		
+ 		// findAllを使って、DBから一覧を取得　でバックで取得したのを確認
+		model.addAttribute("list",lendlistService.findAll());
+		
 		return "lendList";
 		
 	}
+	
+	@GetMapping("/return-book")
+	public String retun(@RequestParam(name="lendId") int returnBook){
+		
+		lendlistService.regist(returnBook);
+	
+	
+	return  "bookLendResult";
+}
 }

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;
 
 	//備考

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など）
+	@ManyToOne
-	@Column(name = "employee_id", nullable = false)
+	@JoinColumn(name = "employee_id", nullable = false)
-	private Integer employeeId;
+	private Employee employeeBooklend;
 
 	// 貸出日
 	@Column(name = "book_lend_date", nullable = false)

src/main/java/com/example/demo/entity/Employee.java

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

src/main/java/com/example/demo/repository/BookLendRepository.java

@@ -0,0 +1,15 @@
+package com.example.demo.repository;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import com.example.demo.entity.BookLend;
+
+@Repository
+public interface BookLendRepository extends JpaRepository<BookLend, Integer> {
+
+	List<BookLend> findBybookStatus(Integer bookStatus);
+	
+}

src/main/java/com/example/demo/service/BookLendService.java

@@ -0,0 +1,34 @@
+package com.example.demo.service;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.example.demo.entity.BookLend;
+import com.example.demo.repository.BookLendRepository;
+
+@Service
+public class BookLendService {
+
+	@Autowired
+	private BookLendRepository bookLendRepository;
+
+	public List<BookLend> findAll() {
+		return bookLendRepository.findBybookStatus(1);
+		
+		
+	}
+	
+	@Transactional
+	public void regist(Integer lendId) {
+	
+		BookLend booklend = bookLendRepository.findById(lendId).orElse(null);
+		
+		booklend.setBookStatus(0); 
+
+		bookLendRepository.save(booklend);
+	}
+
+}

src/main/resources/templates/book.html

@@ -19,43 +19,42 @@
 					<tr>
 						<th>図書ID</th>
 						<th>ISBN</th>
-						<th>書籍名</th>
+						<th>タイトル</th>
 						<th>著者名</th>
 						<th>出版社</th>
 						<th>出版日</th>
 						<th>カテゴリー名</th>
 						<th>サブカテゴリー名</th>
 						<th>保管場所</th>
-						<th>貸出状態</th>
 						<th>本の状態</th>
-						<th>備考</th>
 						<th>登録日時</th>
 						<th>更新日時</th>
 						<th>寄贈者</th>
-						<th>??</th>
+						<th>貸出状態??</th>
-						<th>操作</th>
+						<th>操作??</th>
 					</tr>
 				</thead>
 
 				<tbody>
-					<tr th:each="b : ${book}">
+					<tr th:each="book : ${book}">
-						<td th:text="*{b.bookId}"></td>
+						
-						<td th:text="*{b.bookManageId}"></td>
+						<td th:text="*{book.bookManageId}"></td>
-						<td th:text="*{b.title}"></td>
+						<td th:text="*{book.isbn}"></td>
-						<td th:text="*{b.isbn}"></td>
+						<td th:text="*{book.title}"></td>
-						<td th:text="*{b.author}"></td>
+						<td th:text="*{book.author}"></td>
-						<td th:text="*{b.publisher}"></td>
+						<td th:text="*{book.publisher}"></td>
-						<td th:text="*{b.publicationDate}"></td>
+						<td th:text="*{book.publicationDate}"></td>
-						<td th:text="*{b.bookSubcategory.bookSubcategoryName}"></td>
+						<td th:text="*{book.bookSubcategory.bookCategory.bookCategoryName}"></td>
-						<td th:text="*{b.bookSubcategory.bookCategory.bookCategoryName}"></td>
+						<td th:text="*{book.bookSubcategory.bookSubcategoryName}"></td>
-						<td th:text="*{b.storageLocation.locationName}"></td>
+						<td th:text="*{book.storageLocation.locationName}"></td>
-						<td th:text="*{b.condition}"></td>
+						<td th:text="*{book.condition}"></td>
-						<td th:text="*{b.createdAt}"></td>
+						<td th:text="*{book.createdAt}"></td>
-						<td th:text="*{b.updatedAt}"></td>
+						<td th:text="*{book.updatedAt}"></td>
-						<td th:text="*{b.isDeleted}"></td>
+						<td th:text="*{book.employee != null ? book.employee.employeeId : '-'}"></td>
-						<td th:text="${b.donorId != null ? b.donorId : '-'}"></td>
+						<td th:text="*{book.bookLends != null ? book.bookLends.bookStatus : '-'}"></td>
-						<td th:text="*{b.description}"></td>
+						
-						<td th:text="*{b.bookApproval}"></td>
+						
+						
 					</tr>
 				</tbody>
 			</table>
@@ -72,6 +71,30 @@
 			</button>
 		</form>
 
+		<button type="submit" class="btn-login">
+			<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round"
+				stroke-linejoin="round">
+				<path d="M15 3h4a2 2 0 0 1 2 2v14a2 2 0 0 1-2 2h-4" />
+				<polyline points="10 17 15 12 10 7" />
+				<line x1="15" y1="12" x2="3" y2="12" />
+			</svg>
+			貸出
+		</button>
+		</form>
+
+		<form method="post" action="update">
+			<button type="submit" class="btn-login">
+				<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round"
+					stroke-linejoin="round">
+					<path d="M15 3h4a2 2 0 0 1 2 2v14a2 2 0 0 1-2 2h-4" />
+					<polyline points="10 17 15 12 10 7" />
+					<line x1="15" y1="12" x2="3" y2="12" />
+				</svg>
+				更新
+			</button>
+		</form>
+
+
 </body>
 
 </html>

src/main/resources/templates/bookLendResult.html

@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+
+<head>
+	<meta charset="UTF-8">
+	<title>貸出中図書、返却処理結果画面</title>
+	<link rel="stylesheet" th:href="@{/css/style.css}">
+</head>
+
+<body>
+	<h1>返却処理が完了しました。</h1>
+
+	<td>
+		<form th:action="@{/lendList}" method="get">
+			<button type="submit" th:value="貸出">貸出中図書一覧に戻る</button>
+	</td>
+	
+</body>
+
+</html>

src/main/resources/templates/lendList.html

@@ -1,47 +1,62 @@
 <!DOCTYPE html>
-<html>
+<html xmlns:th="http://www.thymeleaf.org">
 
 <head>
 	<meta charset="UTF-8">
 	<title>貸出中図書一覧</title>
+	<link rel="stylesheet" th:href="@{/css/style.css}">
 </head>
 
 <body>
 	<h1>貸出中図書一覧</h1>
 
-	<!-- action先要修正 -->
-	<form action="/lendList" method="GET">
-		<input type="submit" value="返却" class="btn">
-	</form>
 	
-	<!-- 以下ポップアップ -->
+		<table>
-	<div id="registerModal" class="modal-overlay">
 
-		<div class="modal">
+			<thead>
+				<tr>
+					<th>社員ID</th>
+					<th>社員名</th>
+					<th>管理ID</th>
+					<th>タイトル</th>
+					<th>返却予定日</th>
 
-			<div class="modal-message">
+				</tr>
-				返却処理が完了しました！
+			</thead>
-			</div>
-
-			<div class="modal-buttons">
-
-				<!-- OK -->
-				<form method="get" action="/lendList">
-
-					<button type="submit" class="modal-btn">
-						OK
-					</button>
-
-				</form>
 
 
+			<tbody>
+				<tr th:each="booklist : ${list}">
 
-			</div>
+					<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>
 
-		</div>
 
-	</div>
+					<td>
+						<form th:action="@{/return-book}" method="get">
+							<button type="submit" name="lendId" th:value="${booklist.lendId}"
+								onclick="return MoveCheck();">返却
+							</button>
+						</form>
+					</td>
 
+				</tr>
+				
+			</tbody>
+			
+		</table>
+
+
+		<script>
+
+			function MoveCheck() {
+				return window.confirm("返却処理を実行します。よろしいですか？");
+			}
+
+		</script>
 
 </body>
 

src/main/resources/templates/topmenu.html

@@ -35,17 +35,16 @@
 
 
 	<!-- ===== 共通：社内図書一覧 ===== -->
-	<form method="post" name="社内図書一覧" action="book">
-		<a href="javascript:form1.submit()">リンク名</a>
-		<button type="submit" class="btn-book">
 
-			<h3>社内図書一覧</h3>
+	<a class="card" href="/book">
+
+		<h3>社内図書一覧</h3>
+
+		<p>
+			登録されている図書の<br> 一覧を表示します。
+		</p>
+	</a>
 
-			<p>
-				登録されている図書の<br> 一覧を表示します。
-			</p>
-		</button>
-	</form>
 	<hr> <!--区切り線-->
 
 	<!-- ===== 共通：寄贈申請 ===== -->