[EDIT]:画面遷移ができなくなるエラー修正

# Conflicts:
#	src/main/java/com/example/demo/repository/BookLendRepository.java
#	src/main/java/com/example/demo/service/BookLendService.java

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

@@ -6,8 +6,11 @@ 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
@@ -15,14 +18,43 @@ 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("book", bookService.findAll());
+
+		model.addAttribute("bookSearchForm", new BookSearchForm());
+
 		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/BookInsertConfirmController.java

@@ -1,14 +1,6 @@
 package com.example.demo.controller;
 
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
+//@Controller
 
-@Controller
-public class BookInsertConfirmController {
-	@GetMapping("/bookInsertConfirm")
-	public String bookInsertConfirm() {
-		return "bookInsertConfirm";
 
-	}
 
-}

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

@@ -1,13 +1,85 @@
 package com.example.demo.controller;
 
+import java.util.ArrayList;
+
+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.PostMapping;
+
+import com.example.demo.entity.BookInsert;
+import com.example.demo.repository.BookCategoryRepository;
+import com.example.demo.repository.StorageLocationRepository;
+import com.example.demo.repository.SubCategoryRepository;
+import com.example.demo.service.BookInsertService;
 
 @Controller
 public class BookInsertController {
-	@GetMapping("bookInsert")
-		public String bookInsert() {
+	
+@Autowired
+private BookInsertService bookInsertService;
+
+@Autowired
+private BookCategoryRepository categoryRepository;
+
+@Autowired
+private SubCategoryRepository subCategoryRepository;
+
+@Autowired 
+private StorageLocationRepository storageLocationRepository;
+
+	    @GetMapping("/bookInsert")
+	    public String bookInsert(Model model) {
+	    	model.addAttribute("categoryList",categoryRepository.findAll());
+	    model.addAttribute("subCategoryList",subCategoryRepository.findAll());
+		model.addAttribute("locationList",storageLocationRepository.findAll());
+	    	model.addAttribute("bookInsert",new BookInsert());
 	        return "bookInsert";
+	    }
+	    
+	    // 初期表示: 空のformを渡す(th:fieldの初期値が空になる)
+	    
+	    // 確認画面から戻る: POSTされた入力中の値がformに入ったまま入力画面へ
+	    @PostMapping("/bookInsertConfirm")
+	    public String bookInsertConfirm(BookInsert bookInsert,Model model) {
+	    	System.out.println(bookInsert);
+	    	bookInsertService.save(bookInsert);
+	    	model.addAttribute("bookInsert",bookInsert);
+	        return "bookInsertConfirm";
+	    }
+	    
+	    @PostMapping("/bookInsert")
+	    public String bookInsertBack(BookInsert bookInsert,Model model) {
+	    	model.addAttribute("categoryList",categoryRepository.findAll());
+	    	model.addAttribute("subCategoryList",new ArrayList<>());
+	    	model.addAttribute("locationList",storageLocationRepository.findAll());
+	    	model.addAttribute("bookInsert",bookInsert);
+	        return "bookInsert";
+	    }
+	    
+	    @PostMapping("/bookInsert/category")
+	    public String changeCategory(BookInsert bookInsert,Model model) {
+	    	    //カテゴリプルダウンに表示するデータを取得
+	    		model.addAttribute("categoryList",categoryRepository.findAll());
+
+	        model.addAttribute("subCategoryList",subCategoryRepository.findByBookCategory_BookCategoryId(bookInsert.getBookCategoryId()));
+	        model.addAttribute("locationList",storageLocationRepository.findAll());
+	        model.addAttribute("bookInsert", bookInsert);
+
+	        return "bookInsert";
+	    }
+	    
+	    
 	
 	    }
-}
+
+
+	//画面で選択したカテゴリbookInsert.getBookCategoryId()に選択した結果をいれる
+	//subCategoryRepository.findBookCategory_BookCategoryId(bookInsert.getBookCategoryId(1)));
+	//「カテゴリIDが1のサブカテゴリを取ってくる」
+	//model.addAttribute("subCategoryList",取得結果)
+	    
+	  
+	   
+	 

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

@@ -1,13 +1,38 @@
 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.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
+
+import com.example.demo.repository.EmployeeRepository;
+import com.example.demo.service.BookServiceImpl;
+
+import lombok.RequiredArgsConstructor;
+
 @Controller
+@RequiredArgsConstructor
 public class BookLendController {
+	
+	@Autowired
+	private final BookServiceImpl bookServiceImpl;
+
+	@Autowired
+	private EmployeeRepository employeeRepository;
+
 	@PostMapping("/bookLend")
-		public String bookLend() {
+	public String bookLend(Model model) {
+		return "bookLend";
+	}
+	
+	@PostMapping("/bookLend/{id}")
+	public String bookLend(@PathVariable int id, Model model) {
+		System.out.println(id);
+		model.addAttribute("book", bookServiceImpl.findById(id));
 		return "bookLend";
 	}
 	
 	
+
 }

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

@@ -1,11 +1,13 @@
 package com.example.demo.controller;
 
+import java.util.List;
+
 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.entity.BookLend;
 import com.example.demo.service.BookLendService;
 
 
@@ -18,19 +20,12 @@ public class LendListController {
 	@GetMapping("/lendList")
 	public String list(Model model) {
 		
+		List<BookLend> aaa = lendlistService.findAll();
+		
  		// 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/AccountEntity.java

@@ -5,6 +5,8 @@ import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
 
 import lombok.Getter;
@@ -28,8 +30,9 @@ public class AccountEntity {
 	@Column(name="login_info_id")
 	private Integer loginInfoId;
 	
-	@Column(name="employee_id")
-	private Integer employeeId;
+	@ManyToOne
+	@JoinColumn(name = "employee_id")
+	private Employee employee;
 	
 	@Column(name="password_hash")
 	private String passwordHash;

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

@@ -0,0 +1,75 @@
+package com.example.demo.entity;
+import java.time.LocalDate;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
+
+import lombok.Data;
+
+@Entity  // このクラスがDBのテーブルに対応することを表す
+@Table(name = "book")
+@Data
+public class BookInsert {
+
+    @Id  // 主キー
+    @GeneratedValue(strategy = GenerationType.IDENTITY)  // 自動採番
+    @Column(name = "book_id")
+    private Integer bookId;
+    
+    @Column(name = "book_manage_id")
+    private String bookManageId;
+
+    @Column(name = "title")
+    private String title;
+    
+    @Column(name = "isbn")
+    private String isbn;
+    
+    @Column(name = "author")
+    private String author;
+    
+    @Column(name = "book_subcategory_id")
+    private Integer subcategory;
+    
+    @Column(name = "publisher")
+    private String publisher;
+    
+    @Column(name = "publication_date")
+    private LocalDate publicationDate;
+    
+    @Column(name = "location_id")
+    private Integer location;
+    
+    @Column(name = "condition_s")
+    private Integer condition;
+    
+    @Column(name = "donor_id")
+    private Integer donor;
+    
+    @Column(name = "description")
+    private String description;
+    
+    @Column(name = "created_at")
+    private LocalDate createdAt;
+
+    @Column(name = "updated_at")
+    private LocalDate updatedAt;
+
+    @Column(name = "is_deleted")
+    private Integer isDeleted;
+    
+    @Column(name = "book_approval")
+    private Integer bookApproval;
+  
+    @Transient //DB保存無効
+    private Integer bookCategoryId;
+    
+    
+    
+ 
+}

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

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

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

@@ -0,0 +1,7 @@
+package com.example.demo.form;
+
+// 図書の貸出処理に使用予定
+
+public class BookLendForm {
+
+}

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

@@ -0,0 +1,10 @@
+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/AccountRepository.java

@@ -6,6 +6,6 @@ import com.example.demo.entity.AccountEntity;
 
 public interface AccountRepository extends JpaRepository<AccountEntity,Integer>{
 	
-	AccountEntity findByEmployeeId (Integer employeeId);
+	AccountEntity findByEmployee_EmployeeId (Integer employeeId);
 
 }

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

@@ -0,0 +1,11 @@
+package com.example.demo.repository;
+
+
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import com.example.demo.entity.BookInsert;
+
+public interface BookInsertRepository extends JpaRepository<BookInsert,Integer> {
+
+}

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

@@ -1,10 +1,20 @@
 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/repository/EmployeeRepository.java

@@ -0,0 +1,12 @@
+package com.example.demo.repository;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import com.example.demo.entity.Employee;
+
+public interface EmployeeRepository extends JpaRepository<Employee, Integer>{
+
+	List<Employee> findByEmployeeId(Integer employeeId);
+}

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

@@ -0,0 +1,9 @@
+package com.example.demo.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import com.example.demo.entity.StorageLocation;
+
+public interface StorageLocationRepository extends JpaRepository<StorageLocation, Integer> {
+
+}

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

@@ -0,0 +1,12 @@
+package com.example.demo.repository;
+import java.util.List;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import com.example.demo.entity.BookSubcategory;
+
+public interface SubCategoryRepository
+        extends JpaRepository<BookSubcategory,Integer> {
+	List<BookSubcategory> findByBookCategory_BookCategoryId(Integer bookCategoryId);
+
+}

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

@@ -0,0 +1,11 @@
+package com.example.demo.service;
+
+import java.util.List;
+
+import com.example.demo.entity.BookInsert;
+
+public interface BookInsertService {
+	String regist(BookInsert book);
+	List<BookInsert> findAll();
+	void save(BookInsert bookInsert);
+}

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

@@ -0,0 +1,47 @@
+	package com.example.demo.service;
+	
+	import java.time.LocalDate;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.example.demo.entity.BookInsert;
+import com.example.demo.repository.BookInsertRepository;
+	
+	@Service
+	public class BookInsertServiceImpl implements BookInsertService {
+	
+	    @Autowired
+	    private BookInsertRepository bookInsertRepository;
+	
+	    @Override
+	    public String regist(BookInsert book) {
+	        // DTO → エンティティへ詰め替えて保存
+	        bookInsertRepository.save(book);  // 保存
+	        return "登録が完了しました";
+	    }
+	
+	    @Override
+	    public List<BookInsert> findAll() {
+	        return bookInsertRepository.findAll();  // 全件取得
+	    }
+	    
+	    public void save(BookInsert bookInsert) {
+	    	bookInsert.setCreatedAt(LocalDate.now());//登録日時設定
+	    	bookInsert.setUpdatedAt(LocalDate.now());//更新日時設定
+	    	bookInsert.setIsDeleted(0);//削除フラグ設定
+	    	bookInsert.setBookApproval(0);//承認フラグ(承認されていないため0)
+	    	bookInsertRepository.save(bookInsert);
+	    	//BK〇〇〇〇形式で管理IDを作る
+	    	String manageId="BK-" + bookInsert.getBookId();//BookId取得→BK形式に変換
+	    	bookInsert.setBookManageId(manageId);
+	    
+	     bookInsertRepository.save(bookInsert);//データベースに保存
+	    }
+	}
+	
+	
+	
+	// ※BookService インタフェースにも List<Review> findAll(); を追加すること
+	

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

@@ -4,7 +4,6 @@ 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;
@@ -16,19 +15,7 @@ public class BookLendService {
 	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);
+		return bookLendRepository.findAll();
 	}
 
 }

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

@@ -1,11 +0,0 @@
-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,35 +1,41 @@
 package com.example.demo.service;
 
-
 import java.util.List;
+import java.util.Optional;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
+import org.springframework.web.server.ResponseStatusException;
 
 import com.example.demo.entity.Book;
 import com.example.demo.repository.BookRepository;
 
+import lombok.RequiredArgsConstructor;
+
 @Service
-public class BookServiceImpl{
+@RequiredArgsConstructor
+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);
+	}
 
+	public Book findById(int bookId) {
+		Optional<Book> book = bookRepository.findById(bookId);
+		if (book.isEmpty()) {
+			throw new ResponseStatusException(
+					HttpStatus.NOT_FOUND, "図書情報が見つかりません");
+		}
 
+		return book.get();
+	}
 
 }

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

@@ -0,0 +1,24 @@
+package com.example.demo.service;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.example.demo.entity.Employee;
+import com.example.demo.repository.EmployeeRepository;
+
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class EmployeeService {
+
+	@Autowired
+	private EmployeeRepository employeeRepository;
+	
+	public List<Employee> findAll() {
+		return employeeRepository.findAll();
+	}
+	
+}

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

@@ -16,7 +16,7 @@ public class LoginService {
 	
 	public AccountEntity login(LoginForm form) {
 		AccountEntity accountEntity = 
-				accountRepository.findByEmployeeId(form.getEmployeeId());
+				accountRepository.findByEmployee_EmployeeId(form.getEmployeeId());
 		
 		if(accountEntity == null) {
 			return null;

src/main/resources/templates/book.html

@@ -8,16 +8,58 @@
 </head>
 
 <body>
+	
+	<div class="header-bar">
+
+			<div class="header-left">
+				ShareBooks
+			</div>
+
+			<div class="header-right">
+
+				<span class="user">
+					<span th:text="${session.loginEmployee.employee.employeeName}"></span>
+					(<span th:text="${session.loginEmployee.adminFlag == 1 ? '管理者' : '一般'}"></span>)
+				</span>
+
+				<a class="button-link" th:href="@{/logout}">
+					ログアウト
+				</a>
+
+			</div>
+
+		</div>
+		
 	<div class="container">
 		<h1>社内図書一覧</h1>
+
 		<div class="float-end">
+			<a th:href="@{/topmenu}">トップメニューへ</a>
 		</div>
-		<form method="get" action="bookLend">
+
+		<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>
+
 
 			<table class="table table-striped">
 				<thead>
 					<tr>
-						<th>図書ID</th>
+						<th>図書管理ID</th>
 						<th>ISBN</th>
 						<th>タイトル</th>
 						<th>著者名</th>
@@ -26,18 +68,19 @@
 						<th>カテゴリー名</th>
 						<th>サブカテゴリー名</th>
 						<th>保管場所</th>
-						<th>本の状態</th>
-						<th>登録日時</th>
-						<th>更新日時</th>
-						<th>寄贈者</th>
-						<th>貸出状態??</th>
-						<th>操作??</th>
+						<th th:if="${session.loginEmployee.adminFlag == 1}">本の状態</th>
+						<th th:if="${session.loginEmployee.adminFlag == 1}">登録日時</th>
+						<th th:if="${session.loginEmployee.adminFlag == 1}">更新日時</th>
+						<th th:if="${session.loginEmployee.adminFlag == 1}">寄贈者</th>
+						<th>貸出状態</th>
+						<th th:if="${session.loginEmployee.adminFlag == 1}">操作</th>
 					</tr>
 				</thead>
 
 				<tbody>
-					<tr th:each="book : ${book}">
+					<tr th:each="book : ${book}" th:if="${book.bookManageId != null}">
 
+						<td th:hidden="*{book.bookId}"></td>
 						<td th:text="*{book.bookManageId}"></td>
 						<td th:text="*{book.isbn}"></td>
 						<td th:text="*{book.title}"></td>
@@ -47,54 +90,58 @@
 						<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}"></td>
-						<td th:text="*{book.createdAt}"></td>
-						<td th:text="*{book.updatedAt}"></td>
-						<td th:text="*{book.employee != null ? book.employee.employeeId : '-'}"></td>
-						<td th:text="*{book.bookLends != null ? book.bookLends.bookStatus : '-'}"></td>
+						<td th:if="${session.loginEmployee.adminFlag == 1}"
+							 th:text="*{book.condition == 0 ? '分からない':
+									   book.condition == 1 ? '新品':
+									   book.condition == 2 ? '良好':
+									   book.condition == 3 ? '使用感あり':
+									   book.condition == 4 ? '痛みあり':
+								       '不明'}">
+						</td>
+						<td th:if="${session.loginEmployee.adminFlag == 1}" th:text="*{book.createdAt}"></td>
+						<td th:if="${session.loginEmployee.adminFlag == 1}" th:text="*{book.updatedAt}"></td>
+						<td th:if="${session.loginEmployee.adminFlag == 1}" 
+							th:text="*{book.employee != null ? book.employee.employeeName : '-'}"></td>
+						<td th:text="*{book.bookLends != null ? 
+							(book.bookLends.bookStatus == 0 ? '貸出可': '貸出不可') : '貸出可'}"></td>
 						
+						<td th:if="${session.loginEmployee.adminFlag == 1}">
 							
-						
-					</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>
+							<form method="post" th:action="@{/bookLend/{id}(id=${book.bookId})}">
+								<input type="hidden" name="id" th:value="*{book.bookId}">
+								<button type="submit"
+									th:disabled="*{book.bookLends != null && book.bookLends.bookStatus == 1}">
 									貸出
 								</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>
+							<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>
+					</tr>
+					
+				</tbody>
+			</table>
+
+	</div>
 </body>
 
 </html>

src/main/resources/templates/bookInsert.html

@@ -8,8 +8,99 @@
 
 <body>
 	<h1>新規図書登録入力</h1>
-	<form action="/bookInsertConfirm" method="GET">
-	<input type="submit" value="確認画面へ" class="btn">
+	       <br><br>
+	<h4>新しく図書を登録します。必要事項を入力し、「登録」ボタンを押してください</h4>
+	<span style="color:red;">※は必須項目です</span>
+	<br><br>
+	<form action="/bookInsertConfirm" method="POST" th:object="${bookInsert}">
+ 
+		
+		<label for="bookmanageId">図書管理ID</label><br>
+				<input type="text"
+				       id="bookManageId"
+				       placeholder="登録時に自動採番されます" readonly>
+				<br><br>
+
+	<label for="title">タイトル<span style="color:red;">※</span></label><br>
+	<input type="text" id="title" name="title" placeholder="タイトルを入力" th:value="${bookInsert.title}" required>
+	<br><br>
+	
+	<label for="isbn">ISBN<span style="color:red;">※</span></label><br>
+	<input type="text" id="isbn" name="isbn" placeholder="例:978-1-23-456789-0" th:value="${bookInsert.isbn}" required>
+		<br><br>
+	
+		<label for="title">著者名<span style="color:red;">※</span></label><br>
+		<input type="text" id="author" name="author" placeholder="著者名を入力" th:value="${bookInsert.author}" required>
+		<br><br>
+		
+		<!--自動でサブかてを絞り込む。カテゴリをせんたくして、
+		このselectが入っているformの送信先を/bookInsert/categoryに変更、そのformを送信-->
+		<label for="category">カテゴリ</label><br>
+		<select th:field="*{bookCategoryId}" onchange="this.form.action='/bookInsert/category';this.form.submit();">
+		<option value=""> 選択してください
+		 </option>
+		<option th:each="category:${categoryList}"
+		       th:value="${category.bookCategoryId}"
+		       th:text="${category.bookCategoryName}">
+		    </option>
+
+		</select>
+		<br><br>
+		
+		<label for="subcategory">サブカテゴリ<span style="color:red;">※</span></label><br>
+		<select th:field="*{subcategory}">
+		    <option value="">選択してください</option>
+			<option th:each="sub:${subCategoryList}"
+				    th:value="${sub.bookSubcategoryId}"
+				    th:text="${sub.bookSubcategoryName}" required>
+				    </option>
+				</select>
+		<br><br>
+		
+		<label for="location">保管場所<span style="color:red;">※</span></label><br>
+		<select th:field="*{location}">
+		<option value="">選択してください</option>
+			<option th:each="location:${locationList}"
+		            th:value="${location.locationId}"
+		            th:text="${location.locationName}" required>
+		    </option>
+
+		</select>
+		<br><br>
+		
+		<label for="condition">図書状態<span style="color:red;">※</span></label><br>
+		<select name="condition" required>
+			<option value="">選択してください</option>
+		    <option value="1">新品同様</option>
+		    <option value="2">良好</option>
+		    <option value="3">使用感あり</option>
+		    <option value="4">傷みあり</option>
+		</select>
+		<br><br>		
+		
+		<label for="publisher">出版社</label><br>
+				<input type="text" id="publisher" name="publisher" th:value="${bookInsert.publisher}">
+				<br><br>
+				
+				<label for="publicationDate">出版日</label><br>
+				<input type="date" id="publicationDate" name="publicationDate" th:value="${bookInsert.publicationDate}">
+				<br><br>
+	   
+		<label for="donor">寄贈者社員ID</label><br>
+		<input type="text" id="donor" name="donor" th:value="${bookInsert.donor}">
+		<br><br>
+		
+		<!--
+		<label for="description">備考</label><br>
+		<input type="text" id="description" name="description" th:value="${bookInsert.description}">
+		<br><br>
+</label>-->
+
+
+	<input type="submit" value="登録" class="btn">
+</form>
+
+
 </body>
 
 </html>

src/main/resources/templates/bookInsertConfirm.html

@@ -9,9 +9,24 @@
 <body>
 	<h1>登録内容確認</h1>
 
-	<!-- 戻る -->
-	<form action="/bookInsert" method="GET">
-		<input type="submit" value="戻る" class="btn">
+		
+		<!-- もどる: 入力中の値を持って入力画面へ -->
+		<form method="post" th:action="@{/bookInsert}" >
+		    <input type="hidden" name="bookId" th:value="${bookInsert.bookId}">
+			<input type="hidden" name="bookmanageId" th:value="${bookInsert.bookManageId}">
+		    <input type="hidden" name="title" th:value="${bookInsert.title}">
+			<input type="hidden" name="isbn" th:value="${bookInsert.isbn}">
+			<input type="hidden" name="author" th:value="${bookInsert.author}">
+			<input type="hidden" name="category" th:value="${bookInsert.bookCategoryId}">
+			<input type="hidden" name="subcategory" th:value="${bookInsert.subcategory}">
+			<input type="hidden" name="publisher" th:value="${bookInsert.publisher}">
+			<input type="hidden" name="publicationDate" th:value="${bookInsert.publicationDate}">
+			<input type="hidden" name="location" th:value="${bookInsert.location}">
+			<input type="hidden" name="condition" th:value="${bookInsert.condition}">
+			<input type="hidden" name="donor" th:value="${bookInsert.donor}">
+			<input type="hidden" name="description" th:value="${bookInsert.description}">
+		    <button type="submit">もどる</button>
+		</form>
 	</form>
 	<!-- 完了 -->
 	<form action="/book" method="GET">
@@ -53,6 +68,7 @@
 
 				</form>
 				
+
 			</div>
 
 		</div>

src/main/resources/templates/bookLend.html

@@ -1,32 +1,149 @@
 <!DOCTYPE html>
-<html>
-<head>
-<meta charset="UTF-8">
-<title>図書貸出処理</title>
-</head>
-<body>
-	図書貸出処理
-	<form id="loanForm"action="bookLendConfirmation" method="post">
-			<div class="button-area">
+<html xmlns:th="http://www.thymeleaf.org">
 
-						<div class="right-buttons">
-							<button type="button" class="btn btn-primary"
-								onclick="submitLoan()">貸出する</button>
+<head>
+	<meta charset="UTF-8">
+	<title>図書貸出処理</title>
+</head>
+
+<body>
+
+	<h1>
+		図書貸出処理
+	</h1>
+
+	<p>
+		以下の図書を貸出します。貸出先の社員IDと返却予定日を入力してください。
+	</p>
+
+	<h2>
+		図書情報
+	</h2>
+
+	<form id="lendForm" action="bookLendConfirm" method="post">
+
+		<div class="card-body">
+			<table class="info-table">
+				<thead>
+					<tr>
+						<th>図書管理ID</th>
+						<th>図書タイトル</th>
+						<th>著者名</th>
+						<th>ISBN</th>
+					</tr>
+				</thead>
+
+				<tbody>
+					<tr th:each="book : ${book}">
+						<td th:hidden="*{book.bookId}"></td>
+						<td th:text="*{book.bookManageId}"></td>
+						<td th:text="*{book.title}"></td>
+						<td th:text="*{book.author}"></td>
+						<td th:text="*{book.isbn}"></td>
+					</tr>
+
+				</tbody>
+
+			</table>
 		</div>
+
+		<h2>
+			社員情報
+		</h2>
+
+		<div class="card">
+
+			<div class="form-row">
+
+				<label for="employeeSelect">
+					社員ID
+				</label>
+
+				<input type="text" id="employeeId" placeholder="社員IDを入力してください">
+
+				</select>
 			</div>
 
+		</div>
+
+		<h2>
+			貸出・返却日入力
+		</h2>
+
+		<div class="date-section">
+
+			<div class="date-box">
+
+				<label>
+					貸出日（現在の日付が自動で設定されます。)
+				</label>
+
+				<p th:text="${#calendars.format(#calendars.createNowForTimeZone('Asia/Tokyo'), 
+				'yyyy年MM月dd日')}">
+				</p>
+
+			</div>
+
+			<div class="date-box">
+
+				<label>
+					返却予定日（必ず指定してください。）
+				</label>
+
+				<input type="date" id="returnDate" name="returnDate">
+
+				<div class="note">
+					※ カレンダーから日付を選択してください。
+				</div>
+
+				<div class="error">
+					※ 現在の日付より前は選択できません。
+				</div>
+
+			</div>
+
+		</div>
+
+		<h3>
+			注意事項
+		</h3>
+
+		<p>
+			貸出処理を行うと、対象の図書のステータスが「貸出中」に変更されます。
+		</p>
+
+		<input type="submit" name="submit" onclick="submitLend()" value="貸出する">
+<!--		<button type="button" class="btn btn-primary" onclick="submitLend()">-->
+
+		<input type="reset" name="reset" value="入力内容をクリア">
+
 	</form>
 
 	<script>
 
-				function submitLoan() {
+		function submitLend() {
 
 			if (confirm('この図書を貸出しますか？')) {
 				// OK選択時にフォーム送信を実行し、BookLendReturnControllerに処理を投げる
-								document.getElementById('loanForm').submit();
+				document.getElementById('lendForm').submit();
 			}
 		}
+
+		// カレンダーを当日以前の日付を入力できないようにする
+		const today = new Date();
+		function dateFormat(today, format) {
+			format = format.replace("YYYY", today.getFullYear());
+			format = format.replace("MM", ("0" + (today.getMonth() + 1)).slice(-2));
+			format = format.replace("DD", ("0" + today.getDate()).slice(-2));
+			return format;
+		}
+
+		const data = dateFormat(today, 'YYYY-MM-DD');
+		const field = document.getElementById('returnDate');
+		field.setAttribute("min", data);
+
 	</script>
 
 </body>
+
 </html>

src/main/resources/templates/bookLendResult.html

@@ -1,20 +0,0 @@
-<!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

@@ -10,6 +10,10 @@
 <body>
 	<h1>貸出中図書一覧</h1>
 
+	<!-- action先要修正 -->
+	<form action="/lendList" method="GET">
+		<input type="submit" value="返却" class="btn">
+
 
 		<table>
 			
@@ -20,7 +24,7 @@
 				<th>管理ID</th>
 				<th>タイトル</th>
 				<th>返却予定日</th>
-
+				<th>超過日数</th>
 			</tr>
 		</thead>
 
@@ -33,30 +37,42 @@
 				<td th:text="*{booklist.book.bookManageId}"></td>
 				<td th:text="*{booklist.book.title}"></td>
 				<td th:text="*{booklist.bookReturnDate}"></td>
-
-
-					<td>
-						<form th:action="@{/return-book}" method="get">
-							<button type="submit" name="lendId" th:value="${booklist.lendId}"
-								onclick="return MoveCheck();">返却
-							</button>
-						</form>
-					</td>
-
+<!--				<td th:text="*{booklist.}"></td>-->
 			</tr>
-				
 		</tbody>
-			
 		</table>
 		
 		
-		<script>
+	</form>
 
-			function MoveCheck() {
-				return window.confirm("返却処理を実行します。よろしいですか？");
-			}
+	<!-- 以下ポップアップ -->
+	<div id="registerModal" class="modal-overlay">
+
+		<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>
+
+
+
+			</div>
+
+		</div>
+
+	</div>
 
-		</script>
 
 </body>