Merge branch 'y-watanabe' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/ShareBooks_new into s-tajihi

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

@@ -1,5 +1,7 @@
 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;
@@ -10,7 +12,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 
 import com.example.demo.entity.BookInsert;
 import com.example.demo.repository.BookCategoryRepository;
-import com.example.demo.repository.BookInsertRepository;
 import com.example.demo.repository.StorageLocationRepository;
 import com.example.demo.repository.SubCategoryRepository;
 import com.example.demo.service.BookInsertService;
@@ -30,13 +31,8 @@ private SubCategoryRepository subCategoryRepository;
 @Autowired 
 private StorageLocationRepository storageLocationRepository;
 
-@Autowired
-private BookInsertRepository bookInsertRepository;
-
 	    @GetMapping("/bookInsert")
 	    public String bookInsert(Model model) {
-	    	model.addAttribute("nextBookManageId",bookInsertService.createBookManageId());
-	    	model.addAttribute("bookInsert",new BookInsert());
 	    	model.addAttribute("categoryList",categoryRepository.findAll());
 	    model.addAttribute("subCategoryList",subCategoryRepository.findAll());
 		model.addAttribute("locationList",storageLocationRepository.findAll());
@@ -50,19 +46,19 @@ private BookInsertRepository bookInsertRepository;
 	    @PostMapping("/bookInsertConfirm")
 	    public String bookInsertConfirm(@Validated BookInsert bookInsert,BindingResult result,Model model) {
 	    	if(result.hasErrors()) {
-	    		model.addAttribute("nextBookManageId",bookInsertService.createBookManageId());
 	    		model.addAttribute("categoryList",categoryRepository.findAll());
 	    		if(bookInsert.getBookCategoryId() != null) { //nullじゃなかったら
 	    			model.addAttribute("subCategoryList",subCategoryRepository.findByBookCategory_BookCategoryId(bookInsert.getBookCategoryId()));
 	    			//そのカテゴリに属するサブカテゴリを持ってくる
 	    			} else{
-	    			model.addAttribute("subCategoryList",subCategoryRepository.findAll());
+	    			model.addAttribute("subCategoryList",new ArrayList<>());
 	    			}
 	    		model.addAttribute("locationList",storageLocationRepository.findAll());
 	    		model.addAttribute("bookInsert", bookInsert);
 	    		return "bookInsert";
 	    		
 	    	}
+	    	System.out.println(bookInsert);
 	    	bookInsertService.save(bookInsert);
 	    	model.addAttribute("bookInsert",bookInsert);
 	        return "bookInsertConfirm";
@@ -71,12 +67,11 @@ private BookInsertRepository bookInsertRepository;
 	    //確認画面から「もどる」ボタンを押したら入力画面に戻る
 	    @PostMapping("/bookInsert")
 	    public String bookInsertBack(BookInsert bookInsert,Model model) {
-	    	model.addAttribute("nextBookManageId",bookInsertService.createBookManageId());
 	    	model.addAttribute("categoryList",categoryRepository.findAll());
-	    	if(bookInsert.getBookCategoryId() !=null) {
+	    	if(bookInsert.getBookCategoryId() != null) {
 	    		model.addAttribute("subCategoryList",subCategoryRepository.findByBookCategory_BookCategoryId(bookInsert.getBookCategoryId()));
 	    			} else{
-	    				model.addAttribute("subCategoryList",subCategoryRepository.findAll());
+	    				model.addAttribute("subCategoryList",new ArrayList<>());
 	    			}
 	    		model.addAttribute("locationList",storageLocationRepository.findAll());
 	    		model.addAttribute("bookInsert",bookInsert);
@@ -86,7 +81,6 @@ private BookInsertRepository bookInsertRepository;
 	    @PostMapping("/bookInsert/category")
 	    public String changeCategory(BookInsert bookInsert,Model model) {
 	    	    //カテゴリプルダウンに表示するデータを取得
-	    		model.addAttribute("nextBookManageId",bookInsertService.createBookManageId());
 	    		model.addAttribute("categoryList",categoryRepository.findAll());
 	    		model.addAttribute("subCategoryList",subCategoryRepository.findByBookCategory_BookCategoryId(bookInsert.getBookCategoryId()));
 	        model.addAttribute("locationList",storageLocationRepository.findAll());
@@ -95,8 +89,9 @@ private BookInsertRepository bookInsertRepository;
 	        return "bookInsert";
 	    }
 	    
-}
 	    
+	
+	    }
 
 
 	//画面で選択したカテゴリbookInsert.getBookCategoryId()に選択した結果をいれる
@@ -104,6 +99,6 @@ private BookInsertRepository bookInsertRepository;
 	//「カテゴリIDが1のサブカテゴリを取ってくる」
 	//model.addAttribute("subCategoryList",取得結果)
 	    
-
+	  
 	   
 	 

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

@@ -1,52 +1,30 @@
 package com.example.demo.controller;
 
-import java.time.LocalDate;
-
 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 org.springframework.web.bind.annotation.RequestParam;
 
-import com.example.demo.service.BookLendService;
+import com.example.demo.entity.Employee;
-import com.example.demo.service.BookServiceImpl;
+import com.example.demo.repository.EmployeeRepository;
-
-import lombok.RequiredArgsConstructor;
 
 @Controller
-@RequiredArgsConstructor
 public class BookLendController {
 
 	@Autowired
-	private final BookServiceImpl bookServiceImpl;
+	private EmployeeRepository employeeRepository;
-	
-	@Autowired
-	private final BookLendService bookLendService;
 
 	@PostMapping("/bookLend")
 	public String bookLend(Model model) {
 		return "bookLend";
 	}
-
+	
-	@PostMapping("/bookLend/{id}")
+	// 社員IDを取得してプルダウンに表示させる
-	public String bookLend(@PathVariable int id, Model model) {
+	@PostMapping("/bookLend/employeeId")
-		model.addAttribute("book", bookServiceImpl.findById(id));
+	public String selectEmployeeId(Employee employee, Model model) {
+		model.addAttribute("employeeList", employeeRepository.findByEmployeeId(employee.getEmployeeId()));
+		model.addAttribute("bookLend", employee);
 		return "bookLend";
 	}
 
-	// 貸出処理
-	@PostMapping("/bookLend/confirm")
-	public String bookLendConfirm(
-			@RequestParam(name = "bookId") int bookId,
-			@RequestParam(name = "bookManageId") String bookManageId,
-			@RequestParam(name = "employeeId") int employeeId,
-			@RequestParam(name = "returnDate") LocalDate bookReturnDate,
-			Model model) {
-
-		bookLendService.save(bookId,bookManageId,employeeId,bookReturnDate);
-		
-		return "redirect:/book";
-	}
-
 }

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

@@ -28,7 +28,8 @@ public class BookInsert {
     @Column(name = "title")
     private String title;
     
-    @Pattern(regexp = "^(?=(?:.*-){4})[0-9-]{17}$",message = "ISBNは半角数字(13文字)とハイフン(4つ)を含めて入力してください")
+    @Pattern(regexp = "^(?=(?:.*-){4})[0-9-]{17}$",
+    		message = "ISBNは半角数字(13文字)とハイフン(4つ)を含めて入力してください")
     @Column(name = "isbn")
     private String isbn;
     
@@ -68,7 +69,7 @@ public class BookInsert {
     @Column(name = "book_approval")
     private Integer bookApproval;
   
-    @Transient 
+    @Transient //DB保存無効
     private Integer bookCategoryId;
     
     

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

@@ -1,6 +1,6 @@
 package com.example.demo.entity;
 
-import java.time.LocalDate;
+import java.sql.Date;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -35,11 +35,11 @@ public class BookLend {
 
 	// 貸出日
 	@Column(name = "book_lend_date", nullable = false)
-	private LocalDate bookLendDate;
+	private Date bookLendDate;
 
 	// 返却日
 	@Column(name = "book_return_date", nullable = false)
-	private LocalDate bookReturnDate;
+	private Date bookReturnDate;
 
 	// 貸出状態
 	@Column(name = "book_status", nullable = false)

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

@@ -1,27 +1,7 @@
 package com.example.demo.form;
 
-import java.sql.Date;
-
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-
-import com.example.demo.entity.Book;
-import com.example.demo.entity.Employee;
-
 // 図書の貸出処理に使用予定
 
 public class BookLendForm {
-	
-	private Book book;
-
-	@NotBlank(message = "社員IDの入力は必須です")
-	private Employee employeeBooklend;
-	
-	private Date bookLendDate;
-
-	@NotNull(message = "返却日の入力は必須です")
-	private Date bookReturnDate;
-	
-	private Integer bookStatus;
 
 }

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

@@ -3,13 +3,9 @@ package com.example.demo.repository;
 
 
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
 
 import com.example.demo.entity.BookInsert;
 
-@Repository
 public interface BookInsertRepository extends JpaRepository<BookInsert,Integer> {
 
-	BookInsert findFirstByOrderByBookIdDesc();//bookIDが一番大きいデータを取得
+}
-
-	}

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

@@ -8,5 +8,4 @@ public interface BookInsertService {
 	String regist(BookInsert book);
 	List<BookInsert> findAll();
 	void save(BookInsert bookInsert);
-	String createBookManageId(); 
+}
-	}

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

@@ -12,17 +12,9 @@ import com.example.demo.repository.BookInsertRepository;
 	@Service
 	public class BookInsertServiceImpl implements BookInsertService {
 	
-	@Autowired
+	    @Autowired
-	private BookInsertRepository bookInsertRepository;
+	    private BookInsertRepository bookInsertRepository;
 	
-	@Override
-	public String createBookManageId() { //次に表示する図書管理IDを作る
-	    		BookInsert book =bookInsertRepository.findFirstByOrderByBookIdDesc();
-	    			if(book ==null){
-	                return "BK-1";}
-	    			return "BK-"+(book.getBookId()+1); //いまのIDの次のIDを返す
-	    }
-	    
 	    @Override
 	    public String regist(BookInsert book) {
 	        // DTO → エンティティへ詰め替えて保存
@@ -41,14 +33,15 @@ import com.example.demo.repository.BookInsertRepository;
 	    	bookInsert.setIsDeleted(0);//削除フラグ設定
 	    	bookInsert.setBookApproval(0);//承認フラグ(承認されていないため0)
 	    	bookInsertRepository.save(bookInsert);
-	    	//BK-〇形式で管理IDを作る
+	    	//BK〇〇〇〇形式で管理IDを作る
-	    	String manageId="BK-"+bookInsert.getBookId();//BookId取得→BK形式に変換
+	    	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

@@ -1,55 +1,21 @@
 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.Book;
 import com.example.demo.entity.BookLend;
-import com.example.demo.entity.Employee;
 import com.example.demo.repository.BookLendRepository;
-import com.example.demo.repository.BookRepository;
-import com.example.demo.repository.EmployeeRepository;
 
 @Service
 public class BookLendService {
 
 	@Autowired
 	private BookLendRepository bookLendRepository;
-	
-	@Autowired
-	private BookRepository bookRepository;
-	
-	@Autowired
-	private EmployeeRepository employeeRepository;
 
 	public List<BookLend> findAll() {
-		return bookLendRepository.findAll();
+		return bookLendRepository.findBybookStatus(1);
-	}
-
-	public void save(int bookId, String bookManageId, int employeeId,
-			LocalDate bookReturnDate) {
-
-		BookLend bookLend = new BookLend();
-		
-		
-		Book book = bookRepository.findById(bookId)
-		        .orElseThrow(
-		                () -> new IllegalArgumentException("対象の本が見つかりません"));
-		
-		Employee employee = employeeRepository.findById(employeeId)
-		        .orElseThrow(
-		                () -> new IllegalArgumentException("対象のが見つかりません"));
-
-		bookLend.setBook(book);
-		bookLend.setEmployeeBooklend(employee);
-		bookLend.setBookLendDate(LocalDate.now());
-		bookLend.setBookReturnDate(bookReturnDate);
-		bookLend.setBookStatus(1);
-
-		bookLendRepository.save(bookLend);
 	}
 
 }

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

@@ -1,20 +1,14 @@
 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
-@RequiredArgsConstructor
 public class BookServiceImpl {
 
 	@Autowired
@@ -23,19 +17,9 @@ public class BookServiceImpl {
 	public List<Book> findAll() {
 		return bookRepository.findAll();
 	}
-
+	
-	public List<Book> findBooks(String keyword) {
+	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

@@ -1,24 +0,0 @@
-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/resources/templates/book.html

@@ -80,7 +80,6 @@
 				<tbody>
 					<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>
@@ -107,8 +106,8 @@
 						
 						<td th:if="${session.loginEmployee.adminFlag == 1}">
 							
-							<form method="post" th:action="@{/bookLend/{id}(id=${book.bookId})}">
+							<form method="post" action="/bookLend">
-								<input type="hidden" name="id" th:value="*{book.bookId}">
+								<input type="hidden" name="bookManageId" th:value="*{book.bookManageId}">
 								<button type="submit"
 									th:disabled="*{book.bookLends != null && book.bookLends.bookStatus == 1}">
 									貸出

src/main/resources/templates/bookInsert.html

@@ -8,33 +8,28 @@
 
 <body>
 	<h1>新規図書登録入力</h1>
-	       <br>
+	       <br><br>
-	<h4>新しく図書を登録します。必要事項を入力し、「登録」ボタンを押してください。</h4>
+	<h4>新しく図書を登録します。必要事項を入力し、「登録」ボタンを押してください</h4>
 	<span style="color:red;">※は必須項目です</span>
-	<br>
+	<br><br>
-	<h4>図書情報</h4>
 	<form action="/bookInsertConfirm" method="POST" th:object="${bookInsert}">
  
 		
 		<label for="bookmanageId">図書管理ID</label><br>
-				<input type="text" id="bookManageId" th:value="${nextBookManageId}" readonly>
+				<input type="text"
-				<div style="font-size:12px; color:rgb(128, 128, 128);">
+				       id="bookManageId"
-				※例：BK-1、BK-2...
+				       placeholder="登録時に自動採番されます" readonly>
-				</div>
+				<br><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-4-123-45678-9" th:value="${bookInsert.isbn}"  required>
+	<input type="text" id="isbn" name="isbn" placeholder="ISBNを入力" th:value="${bookInsert.isbn}"  required>
-	<div style="font-size:12px; color:rgb(128, 128, 128);">
+		   <div th:if="${#fields.hasErrors('isbn')}" th:errors="*{isbn}" style="color:red">
-	※ハイフン(4つ)を含む形式で入力してください
-	</div>
-	<div th:if="${#fields.hasErrors('isbn')}" th:errors="*{isbn}" style="color:red">
 		   </div>
-		<br>
+		<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>
@@ -55,34 +50,30 @@
 		<br><br>
 		
 		<label for="subcategory">サブカテゴリ<span style="color:red;">※</span></label><br>
-		<select th:field="*{subcategory}"  required>
+		<select th:field="*{subcategory}">
 		    <option value="">選択してください</option>
 			<option th:each="sub:${subCategoryList}"
 				    th:value="${sub.bookSubcategoryId}"
-				    th:text="${sub.bookSubcategoryName}">
+				    th:text="${sub.bookSubcategoryName}" required>
 				    </option>
 				</select>
-				<div th:if="${#fields.hasErrors('subcategory')}" th:errors="*{subcategory}" style="color:red">
-						</div>
 		<br><br>
 		
 		<label for="location">保管場所<span style="color:red;">※</span></label><br>
-		<select th:field="*{location}" required>
+		<select th:field="*{location}">
 		<option value="">選択してください</option>
 			<option th:each="location:${locationList}"
 		            th:value="${location.locationId}"
-		            th:text="${location.locationName}" >
+		            th:text="${location.locationName}" required>
 		    </option>
 
 		</select>
-		<div th:if="${#fields.hasErrors('location')}" th:errors="*{location}" style="color:red">
-		</div>
 		<br><br>
 		
 		<label for="condition">図書状態<span style="color:red;">※</span></label><br>
 		<select th:field="*{condition}" required>
 			<option value="">選択してください</option>
-		    <option value="1">新品</option>
+		    <option value="1">新品同様</option>
 		    <option value="2">良好</option>
 		    <option value="3">使用感あり</option>
 		    <option value="4">傷みあり</option>
@@ -107,9 +98,11 @@
 		<br><br>
 </label>-->
 
-<input type="submit" value="登録" onclick="return confirm('この内容で登録しますか？');">
 
+	<input type="submit" value="登録" class="btn">
 </form>
+
+
 </body>
 
 </html>

src/main/resources/templates/bookInsertConfirm.html

@@ -9,6 +9,30 @@
 <body>
 	<h1>登録内容確認</h1>
 
+		
+		<!-- もどる: 入力中の値を持って入力画面へ -->
+		<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="bookCategoryId" 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">
+		<input type="submit" value="完了" class="btn">
+	</form>
+	<div id="registerModal" class="modal-overlay">
 
 		<div class="modal">
 

src/main/resources/templates/bookLend.html

@@ -13,112 +13,181 @@
 	</h1>
 
 	<p>
-		以下の図書を貸出します。貸出先の社員IDと返却予定日を入力してください。
+		以下の図書を貸出します。貸出先と貸出日・返却予定日を入力してください。
 	</p>
 
 	<h2>
 		図書情報
 	</h2>
 
-	<form th:action="@{/bookLend/confirm}" method="POST"
+	<div class="card-body">
-			id="lendForm">
+		<table class="info-table">
+			<tr>
+				<th>
+					図書管理ID
+				</th>
 
-		<div class="card-body">
+				<td>
-			<table class="info-table">
+					（図書管理IDをここに表示させる）
-				<thead>
+				</td>
-					<tr>
+			</tr>
-						<th>図書管理ID</th>
-						<th>図書タイトル</th>
-						<th>著者名</th>
-						<th>ISBN</th>
-					</tr>
-				</thead>
 
-				<tbody>
+			<tr>
-					<tr>
+				<th>
-<!--						<td th:hidden="*{book.bookId}"></td>-->
+					図書タイトル
-						<td th:text="*{book.bookManageId}"></td>
+				</th>
-						<td th:text="*{book.title}"></td>
-						<td th:text="*{book.author}"></td>
-						<td th:text="*{book.isbn}"></td>
-					</tr>
 
-				</tbody>
+				<td>
+					（タイトルをここに表示させる）
+				</td>
+			</tr>
 
-			</table>
+			<tr>
+				<th>
+					著者名
+				</th>
+
+				<td>
+					（著者名をここに表示させる）
+				</td>
+			</tr>
+
+			<tr>
+				<th>
+					ISBN
+				</th>
+
+				<td>
+					（ISBNをここに表示させる）
+				</td>
+			</tr>
+		</table>
+	</div>
+
+	<h2>
+		社員情報
+	</h2>
+
+	<div class="card">
+
+		<div class="form-row">
+
+			<label for="employeeSelect">
+				社員ID
+			</label>
+
+<!--			<select th:field="*{employeeId}" onchange="this.form.action='/bookLend/employeeId';this.form.submit();">-->
+
+			<select name="employeeId" id="employeeSelect">
+				
+				<option value="">
+					社員IDを選択してください
+				</option>
+
+<!--				<option th:each="employee : ${employeeList}" th:value="${employee.employeeId}">-->
+<!--				</option>-->
+
+				<option value="1">1</option>
+				<option value="2">2</option>
+				<option value="3">3</option>
+				<option value="4">4</option>
+				
+			</select>
 		</div>
 
-		<h2>
+		<div class="form-row">
-			社員情報
+			<label for="employeeName">
-		</h2>
+				社員名
+			</label>
 
-		<div class="card">
+			<input type="text" id="employeeName" value="" placeholder="社員名が表示されます" readonly>
 
-			<div class="form-row">
+		</div>
 
-				<label for="employeeSelect">
+	</div>
-					社員ID
-				</label>
 
-				<input type="text" name="employeeId" placeholder="社員IDを入力してください">
+	<h2>
+		貸出・返却日入力
+	</h2>
 
-				</select>
+	<div class="date-section">
+
+		<div class="date-box">
+
+			<label>
+				貸出日(自動取得)
+			</label>
+
+			<input type="date" id="loanDate" name="loanDate" value="">
+
+			<div class="note">
+				※ 現在の日付が自動で設定されます。
 			</div>
 
 		</div>
 
-		<h2>
+		<div class="date-box">
-			貸出・返却日入力
-		</h2>
 
-		<div class="date-section">
+			<label>
+				貸出期間日数
+			</label>
 
-			<div class="date-box">
+			<input type="text" id="loanDays" placeholder="日数を入力してください">
-
-				<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 class="note">
+				※ 数値（1以上）で入力してください。
 			</div>
 
 		</div>
 
-		<h3>
+		<div class="date-box">
+
+			<label>
+				返却予定日（必須）
+			</label>
+
+			<input type="date" id="returnDate" name="returnDate">
+
+			<div class="note">
+				※ カレンダーから日付を選択してください。
+			</div>
+
+			<div class="error">
+				※ 現在の日付より前は選択できません。
+			</div>
+
+		</div>
+
+	</div>
+
+	<div class="warning-area">
+
+		<strong>
 			注意事項
-		</h3>
+		</strong>
 
-		<p>
+		<ul>
-			貸出処理を行うと、対象の図書のステータスが「貸出中」に変更されます。
+			<li>
-		</p>
+				貸出処理を行うと、対象の図書のステータスが「貸出中」に変更されます。
-		
+			</li>
-		<input type="hidden" name="bookManageId" th:value="${book.bookManageId}">
-		<input type="hidden" name="bookId" th:value="${book.bookId}">
 
-		<input type="submit" name="submit" onclick="submitLend()" value="貸出する">
+			<li>
+				返却予定日を必ず指定してください。
+			</li>
+		</ul>
 
-		<input type="reset" name="reset" value="入力内容をクリア">
+	</div>
+
+	<form id="lendForm" action="bookLendConfirmation" method="post">
+		<div class="button-area">
+
+			<div class="right-buttons">
+				<button type="button" class="btn btn-primary" onclick="submitLend()">
+					貸出する
+				</button>
+			</div>
+
+		</div>
 
 	</form>
 
@@ -132,19 +201,6 @@
 			}
 		}
 
-		// カレンダーを当日以前の日付を入力できないようにする
-		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>