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

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

@@ -6,55 +6,23 @@ 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.ModelAttribute;
-import org.springframework.web.bind.annotation.PostMapping;
 
 import com.example.demo.entity.Book;
-import com.example.demo.form.BookSearchForm;
 import com.example.demo.service.BookServiceImpl;
 
 @Controller
 public class BookController {
 	@Autowired
 	private BookServiceImpl bookService;
-
-	/* 一覧表示 */
+	
 	@GetMapping("/book")
 	public String book(Model model) {
-
+		
 		List<Book> aaa = bookService.findAll();
-
+		
 		// DBから取得したデータをHTMLで扱えるようにする
-		model.addAttribute("book", bookService.findAll());
-
-		model.addAttribute("bookSearchForm", new BookSearchForm());
-
+		model.addAttribute("book",bookService.findAll());
 		return "book";
 	}
 
-	/* 検索処理 */
-	@GetMapping("/searchBooks")
-	public String searchBooks(@ModelAttribute BookSearchForm bookSearchForm,
-			Model model) {
-		
-		model.addAttribute("book", bookService.findBooks(bookSearchForm.getKeyword()));
-
-		model.addAttribute("bookSearchForm", bookSearchForm);
-
-		return "book";
-
-	}
-
-	/* クリア処理 */
-	@PostMapping("/clearBookList")
-	public String clearBookList(Model model) {
-		
-		model.addAttribute("book", bookService.findAll());
-
-		model.addAttribute("bookSearchForm", new BookSearchForm());
-
-		// 一覧表示画面に戻る
-		return "/book";
-	}
-
 }

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など）
-	@Column(name = "employee_id", nullable = false)
-	private Integer employeeId;
+	@ManyToOne
+	@JoinColumn(name = "employee_id", nullable = false)
+	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/form/BookForm.java

@@ -0,0 +1,5 @@
+package com.example.demo.form;
+
+public class BookForm {
+
+}

src/main/java/com/example/demo/form/BookSearchForm.java

@@ -1,10 +0,0 @@
-package com.example.demo.form;
-
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class BookSearchForm {
-	private String keyword;
-}

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/repository/BookRepository.java

@@ -1,20 +1,10 @@
 package com.example.demo.repository;
 
 
-import java.util.List;
-
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
 
 import com.example.demo.entity.Book;
 
 public interface BookRepository extends JpaRepository<Book, Integer>{
-	@Query("""
-			SELECT b FROM Book b
-			WHERE b.title LIKE %:keyword%
-				OR b.publisher LIKE %:keyword%
-				OR b.author LIKE %:keyword%
-			""")
-	List<Book> searchBooks(@Param("keyword")String keyword);
+
 }

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/java/com/example/demo/service/BookService.java

@@ -0,0 +1,11 @@
+package com.example.demo.service;
+
+import java.util.List;
+
+import com.example.demo.entity.Book;
+
+public interface BookService {
+	String booklist(Book book);
+
+	List<java.awt.print.Book> findAll();
+}

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

@@ -1,5 +1,6 @@
 package com.example.demo.service;
 
+
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -9,17 +10,26 @@ import com.example.demo.entity.Book;
 import com.example.demo.repository.BookRepository;
 
 @Service
-public class BookServiceImpl {
-
+public class BookServiceImpl{
+	
 	@Autowired
 	private BookRepository bookRepository;
+	
+//	@Override
+//	public String booklist(com.example.demo.entity.Book book) {
+//		Book booklist = new Book();
+//		booklist.setBookId(book.getBookId());
+//		
+//		return null;
+//	}
+	
+	
 
 	public List<Book> findAll() {
 		return bookRepository.findAll();
 	}
+
+	
 	
-	public List<Book> findBooks(String keyword){ 
-		return bookRepository.searchBooks(keyword);
-	}
 
 }

src/main/resources/templates/book.html

@@ -12,33 +12,12 @@
 		<h1>社内図書一覧</h1>
 		<div class="float-end">
 		</div>
-
-		<form class="input-group" th:action="@{/searchBooks}" th:object="${bookSearchForm}" method="get">
-
-			<input type="text" th:field="*{keyword}" class="form-control" placeholder="キーワードを入力">
-
-			<button class="btn btn-outline-success" type="submit">
-				検索
-			</button>
-
-		</form>
-		
-		<form method="post" th:action="@{/clearBookList}">
-			<button class="button button-secondary" type="submit">
-				クリア
-			</button>
-		</form>
-		
-		<p>※「タイトル」「出版社」「著者名」で検索</p>
-
-
-
 		<form method="get" action="bookLend">
 
 			<table class="table table-striped">
 				<thead>
 					<tr>
-						<th>図書管理ID</th>
+						<th>図書ID</th>
 						<th>ISBN</th>
 						<th>タイトル</th>
 						<th>著者名</th>
@@ -51,14 +30,14 @@
 						<th>登録日時</th>
 						<th>更新日時</th>
 						<th>寄贈者</th>
-						<th>貸出状態</th>
-						<th>操作</th>
+						<th>貸出状態??</th>
+						<th>操作??</th>
 					</tr>
 				</thead>
 
 				<tbody>
-					<tr th:each="book : ${book}" th:if="${book.bookManageId != null}">
-
+					<tr th:each="book : ${book}">
+						
 						<td th:text="*{book.bookManageId}"></td>
 						<td th:text="*{book.isbn}"></td>
 						<td th:text="*{book.title}"></td>
@@ -68,47 +47,52 @@
 						<td th:text="*{book.bookSubcategory.bookCategory.bookCategoryName}"></td>
 						<td th:text="*{book.bookSubcategory.bookSubcategoryName}"></td>
 						<td th:text="*{book.storageLocation.locationName}"></td>
-						<td th:text="*{book.condition == 0 ? '分からない':
-									   book.condition == 1 ? '新品':
-									   book.condition == 2 ? '良好':
-									   book.condition == 3 ? '使用感あり':
-									   book.condition == 4 ? '痛みあり':
-								       '不明'}">
-						</td>
+						<td th:text="*{book.condition}"></td>
 						<td th:text="*{book.createdAt}"></td>
 						<td th:text="*{book.updatedAt}"></td>
-						<td th:text="*{book.employee != null ? book.employee.employeeName : '-'}"></td>
-						<td
-							th:text="*{book.bookLends != null ? (book.bookLends.bookStatus == 0 ? '貸出可': '貸出不可') : '貸出可'}">
-						</td>
-						<td>
-							<form method="post" action="/bookLend">
-								<input type="hidden" name="bookManageId" th:value="*{book.bookManageId}">
-								<button type="submit"
-									th:disabled="*{book.bookLends != null && book.bookLends.bookStatus == 1}">
-									貸出
-								</button>
-							</form>
-							<form method="post" action="/updateconfirm">
-								<input type="hidden" name="bookManageId" th:value="*{book.bookManageId}">
-								<button type="submit">更新</button>
-							</form>
-							<form method="get" action="/delete">
-								<input type="hidden" name="bookManageId" th:value="*{book.bookManageId}">
-								<button type="submit">削除</button>
-							</form>
-						</td>
-					</tr>
-					
-					<tr th:if="${#lists.isEmpty(book)}">
-						<td colspan="15">
-							該当する図書がありません
-						</td>
+						<td th:text="*{book.employee != null ? book.employee.employeeId : '-'}"></td>
+						<td th:text="*{book.bookLends != null ? book.bookLends.bookStatus : '-'}"></td>
+						
+						
+						
 					</tr>
 				</tbody>
 			</table>
 
 
+			<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>
+
+		<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>

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">
+			<thead>
+				<tr>
+					<th>社員ID</th>
+					<th>社員名</th>
+					<th>管理ID</th>
+					<th>タイトル</th>
+					<th>返却予定日</th>
 
-		<div class="modal">
-
-			<div class="modal-message">
-				返却処理が完了しました！
-			</div>
-
-			<div class="modal-buttons">
-
-				<!-- OK -->
-				<form method="get" action="/lendList">
-
-					<button type="submit" class="modal-btn">
-						OK
-					</button>
-
-				</form>
+				</tr>
+			</thead>
 
 
+			<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>