[edit]バグ修正をしました

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

@@ -17,93 +17,80 @@ import com.example.demo.service.BookInsertService;
 
 @Controller
 public class BookInsertController {
-	
-@Autowired
-private BookInsertService bookInsertService;
 
-@Autowired
+	@Autowired
-private BookCategoryRepository categoryRepository;
+	private BookInsertService bookInsertService;
 
-@Autowired
+	@Autowired
-private SubCategoryRepository subCategoryRepository;
+	private BookCategoryRepository categoryRepository;
 
-@Autowired 
+	@Autowired
-private StorageLocationRepository storageLocationRepository;
+	private SubCategoryRepository subCategoryRepository;
 
-@Autowired
+	@Autowired
-private BookInsertRepository bookInsertRepository;
+	private StorageLocationRepository storageLocationRepository;
 
-	    @GetMapping("/bookInsert")
+	@Autowired
-	    public String bookInsert(Model model) {
+	private BookInsertRepository bookInsertRepository;
-	    	model.addAttribute("nextBookManageId",bookInsertService.createBookManageId());
+
-	    	model.addAttribute("bookInsert",new BookInsert());
+	@GetMapping("/bookInsert")
-	    	model.addAttribute("categoryList",categoryRepository.findAll());
+	public String bookInsert(Model model) {
-	    model.addAttribute("subCategoryList",subCategoryRepository.findAll());
+		model.addAttribute("nextBookManageId", bookInsertService.createBookManageId());
-		model.addAttribute("locationList",storageLocationRepository.findAll());
+		model.addAttribute("bookInsert", new BookInsert());
-	    	model.addAttribute("bookInsert",new BookInsert());
+		model.addAttribute("categoryList", categoryRepository.findAll());
-	        return "bookInsert";
+		model.addAttribute("subCategoryList", subCategoryRepository.findAll());
-	    }
+		model.addAttribute("locationList", storageLocationRepository.findAll());
-	    
+		model.addAttribute("bookInsert", new BookInsert());
-	    // 初期表示: 空のformを渡す(th:fieldの初期値が空になる)
+		return "bookInsert";
-	    
+	}
-	    // 確認画面から戻る: POSTされた入力中の値がformに入ったまま入力画面へ
+
-	    @PostMapping("/bookInsertConfirm")
+	// 初期表示: 空のformを渡す(th:fieldの初期値が空になる)
-	    public String bookInsertConfirm(@Validated BookInsert bookInsert,BindingResult result,Model model) {
+
-	    	if(result.hasErrors()) {
+	// 確認画面から戻る: POSTされた入力中の値がformに入ったまま入力画面へ
-	    		model.addAttribute("nextBookManageId",bookInsertService.createBookManageId());
+	//入力内容確認してOKであれば確認画面へ
-	    		model.addAttribute("categoryList",categoryRepository.findAll());
+	@PostMapping("/bookInsertConfirm")
-	    		if(bookInsert.getBookCategoryId() != null) { //nullじゃなかったら
+	public String bookInsertConfirm(@Validated BookInsert bookInsert, BindingResult result, Model model) {
-	    			model.addAttribute("subCategoryList",subCategoryRepository.findByBookCategory_BookCategoryId(bookInsert.getBookCategoryId()));
+		if (result.hasErrors()) {
-	    			//そのカテゴリに属するサブカテゴリを持ってくる
+			model.addAttribute("nextBookManageId", bookInsertService.createBookManageId());
-	    			} else{
+			model.addAttribute("categoryList", categoryRepository.findAll());
-	    			model.addAttribute("subCategoryList",subCategoryRepository.findAll());
+			if (bookInsert.getBookCategoryId() != null) { //nullじゃなかったら
-	    			}
+				model.addAttribute("subCategoryList",
-	    		model.addAttribute("locationList",storageLocationRepository.findAll());
+						subCategoryRepository.findByBookCategory_BookCategoryId(bookInsert.getBookCategoryId()));
-	    		model.addAttribute("bookInsert", bookInsert);
+				//そのカテゴリに属するサブカテゴリを持ってくる
-	    		return "bookInsert";
+			} else {
-	    		
+				model.addAttribute("subCategoryList", subCategoryRepository.findAll());
-	    	}
+			}
-	    	bookInsertService.save(bookInsert);
+			model.addAttribute("locationList",storageLocationRepository.findAll());
-	    	model.addAttribute("bookInsert",bookInsert);
+			model.addAttribute("bookInsert", bookInsert);
-	        return "bookInsertConfirm";
+			return "bookInsert";
-	    }
+
-	    
+		}
-	    //確認画面から「もどる」ボタンを押したら入力画面に戻る
+		bookInsertService.save(bookInsert);
-	    @PostMapping("/bookInsert")
+		model.addAttribute("bookInsert", bookInsert);
-	    public String bookInsertBack(BookInsert bookInsert,Model model) {
+		return "bookInsertConfirm";
-	    	model.addAttribute("nextBookManageId",bookInsertService.createBookManageId());
+	}
-	    	model.addAttribute("categoryList",categoryRepository.findAll());
+
-	    	if(bookInsert.getBookCategoryId() !=null) {
+	@PostMapping("/bookInsert/category")
-	    		model.addAttribute("subCategoryList",subCategoryRepository.findByBookCategory_BookCategoryId(bookInsert.getBookCategoryId()));
+	public String changeCategory(BookInsert bookInsert, Model model) {
-	    			} else{
+		//カテゴリプルダウンに表示するデータを取得
-	    				model.addAttribute("subCategoryList",subCategoryRepository.findAll());
+		model.addAttribute("nextBookManageId", bookInsertService.createBookManageId());
-	    			}
+		model.addAttribute("categoryList", categoryRepository.findAll());
-	    		model.addAttribute("locationList",storageLocationRepository.findAll());
+		if (bookInsert.getBookCategoryId() != null) { //nullじゃなかったら
-	    		model.addAttribute("bookInsert",bookInsert);
+			model.addAttribute("subCategoryList",
-	        return "bookInsert";
+					subCategoryRepository.findByBookCategory_BookCategoryId(bookInsert.getBookCategoryId()));
-	    }
+			//そのカテゴリに属するサブカテゴリを持ってくる
-	    
+		} else {
-	    @PostMapping("/bookInsert/category")
+			model.addAttribute("subCategoryList", subCategoryRepository.findAll());
-	    public String changeCategory(BookInsert bookInsert,Model model) {
+		}
-	    	    //カテゴリプルダウンに表示するデータを取得
+		model.addAttribute("locationList", storageLocationRepository.findAll());
-	    		model.addAttribute("nextBookManageId",bookInsertService.createBookManageId());
+		model.addAttribute("bookInsert", bookInsert);
-	    		model.addAttribute("categoryList",categoryRepository.findAll());
+
-	    		model.addAttribute("subCategoryList",subCategoryRepository.findByBookCategory_BookCategoryId(bookInsert.getBookCategoryId()));
+		return "bookInsert";
-	        model.addAttribute("locationList",storageLocationRepository.findAll());
+	}
-	        model.addAttribute("bookInsert", bookInsert);
 
-	        return "bookInsert";
-	    }
-	    
 }
-	    
 
-
+//画面で選択したカテゴリbookInsert.getBookCategoryId()に選択した結果をいれる
-	//画面で選択したカテゴリbookInsert.getBookCategoryId()に選択した結果をいれる
+//subCategoryRepository.findBookCategory_BookCategoryId(bookInsert.getBookCategoryId(1)));
-	//subCategoryRepository.findBookCategory_BookCategoryId(bookInsert.getBookCategoryId(1)));
+//「カテゴリIDが1のサブカテゴリを取ってくる」
-	//「カテゴリIDが1のサブカテゴリを取ってくる」
+//model.addAttribute("subCategoryList",取得結果)
-	//model.addAttribute("subCategoryList",取得結果)
-	    
-
-	   
-	 

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

@@ -3,20 +3,13 @@ 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.entity.Employee;
 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;
@@ -26,13 +19,12 @@ public class BookLendController {
 		return "bookLend";
 	}
 	
-	@PostMapping("/bookLend/{id}")
+	// 社員IDを取得してプルダウンに表示させる
-	public String bookLend(@PathVariable int id, Model model) {
+	@PostMapping("/bookLend/employeeId")
-		System.out.println(id);
+	public String selectEmployeeId(Employee employee, Model model) {
-		model.addAttribute("book", bookServiceImpl.findById(id));
+		model.addAttribute("employeeList", employeeRepository.findByEmployeeId(employee.getEmployeeId()));
+		model.addAttribute("bookLend", employee);
 		return "bookLend";
 	}
-	
-	
 
 }

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

@@ -15,7 +15,7 @@ public class BookLendService {
 	private BookLendRepository bookLendRepository;
 
 	public List<BookLend> findAll() {
-		return bookLendRepository.findAll();
+		return bookLendRepository.findBybookStatus(1);
 	}
 
 }

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/bookLend.html

@@ -13,109 +13,181 @@
 	</h1>
 
 	<p>
-		以下の図書を貸出します。貸出先の社員IDと返却予定日を入力してください。
+		以下の図書を貸出します。貸出先と貸出日・返却予定日を入力してください。
 	</p>
 
 	<h2>
 		図書情報
 	</h2>
 
-	<form id="lendForm" action="bookLendConfirm" method="post">
+	<div class="card-body">
+		<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:each="book : ${book}">
+				<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" id="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="submit" name="submit" onclick="submitLend()" value="貸出する">
+			<li>
-<!--		<button type="button" class="btn btn-primary" onclick="submitLend()">-->
+				返却予定日を必ず指定してください。
+			</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>
 
@@ -129,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>