登録確認ボタン_配置修正

承認画面のレイアウト変更しました
layout Edit
2026-10-22 09:56:34 +09:00 · 2026-10-22 09:54:49 +09:00 · 2026-10-22 09:29:36 +09:00 · 2026-10-21 16:27:14 +09:00 · 2026-10-21 16:26:55 +09:00 · 2026-10-21 16:22:56 +09:00
43 changed files with 2273 additions and 292 deletions
--- a/book-rent/pom.xml
+++ b/book-rent/pom.xml
@@ -30,67 +30,54 @@
 	<properties>
 		<java.version>21</java.version>
 	</properties>
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-jpa</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-thymeleaf</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-validation</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-webmvc</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-devtools</artifactId>
-			<scope>runtime</scope>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.mysql</groupId>
-			<artifactId>mysql-connector-j</artifactId>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-tomcat</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-jpa-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-thymeleaf-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-validation-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-webmvc-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
+ <dependencies>
+<dependency>
+<groupId>org.springframework.boot</groupId>
+<artifactId>spring-boot-starter-data-jpa</artifactId>
+</dependency>
+<dependency>
+<groupId>org.springframework.boot</groupId>
+<artifactId>spring-boot-starter-thymeleaf</artifactId>
+</dependency>
+<dependency>
+<groupId>org.springframework.boot</groupId>
+<artifactId>spring-boot-starter-validation</artifactId>
+</dependency>
+<!-- webmvcから通常のwebスターターに変更 -->
+<dependency>
+<groupId>org.springframework.boot</groupId>
+<artifactId>spring-boot-starter-web</artifactId>
+</dependency>
+ 
+<dependency>
+<groupId>org.springframework.boot</groupId>
+<artifactId>spring-boot-devtools</artifactId> <!-- ここを修正 -->
+<scope>runtime</scope>
+<optional>true</optional>
+</dependency>

+<dependency>
+<groupId>com.mysql</groupId>
+<artifactId>mysql-connector-j</artifactId>
+<scope>runtime</scope>
+</dependency>
+<dependency>
+<groupId>org.projectlombok</groupId>
+<artifactId>lombok</artifactId>
+<optional>true</optional>
+</dependency>
+<dependency>
+<groupId>org.springframework.boot</groupId>
+<artifactId>spring-boot-starter-tomcat</artifactId>
+<scope>provided</scope>
+</dependency>
+		
+<dependency>
+<groupId>org.springframework.boot</groupId>
+<artifactId>spring-boot-starter-test</artifactId>
+<scope>test</scope>
+</dependency>
+</dependencies>
 	<build>
 		<plugins>
 			<plugin>
@@ -135,5 +122,6 @@
 			</plugin>
 		</plugins>
 	</build>
-
+ 
 </project>
+
--- a/book-rent/src/main/java/com/example/demo/controller/AdminBookController.java
+++ b/book-rent/src/main/java/com/example/demo/controller/AdminBookController.java
@@ -1,5 +1,125 @@
 package com.example.demo.controller;

-public class AdminBookController {
+import java.util.List;

+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 org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.SessionAttribute;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import com.example.demo.common.BusinessException;
+import com.example.demo.common.Const;
+import com.example.demo.common.LoginUser;
+import com.example.demo.form.BookForm;
+import com.example.demo.service.BookAdminService;
+
+/** BOOK-02 書籍登録 / BOOK-03 書籍編集（管理者のみ：/admin/** で拒否）。入力 → 確認 → 完了 */
+@Controller
+public class AdminBookController {
+    private static final String NEW = "/admin/books/new";
+    private static final String EDIT = "/admin/books/edit";
+
+    private final BookAdminService bookAdminService;
+
+    public AdminBookController(BookAdminService bookAdminService) {
+        this.bookAdminService = bookAdminService;
+    }
+
+    // ===== BOOK-02 登録 =====
+    @GetMapping(NEW)
+    public String newInput(Model model) {
+        return input(new BookForm(), List.of(), "書籍登録", NEW, model);
+    }
+
+    @PostMapping(NEW + "/input")
+    public String newBack(@ModelAttribute("form") BookForm form, Model model) {
+        return input(form, List.of(), "書籍登録", NEW, model);
+    }
+
+    @PostMapping(NEW + "/confirm")
+    public String newConfirm(@ModelAttribute("form") BookForm form, Model model) {
+        List<String> errors = bookAdminService.validate(form);
+        if (!errors.isEmpty()) return input(form, errors, "書籍登録", NEW, model);
+        return confirm("書籍登録", NEW, model);
+    }
+
+    @PostMapping(NEW + "/execute")
+    public String newExecute(@ModelAttribute("form") BookForm form,
+                             @SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser admin,
+                             Model model, RedirectAttributes ra) {
+        try {
+            bookAdminService.register(form, admin);
+        } catch (BusinessException e) {
+            return input(form, List.of(e.getMessage()), "書籍登録", NEW, model);
+        }
+        ra.addFlashAttribute("message", "書籍登録が完了しました。");
+        return "redirect:" + NEW + "/complete";
+    }
+
+    @GetMapping(NEW + "/complete")
+    public String newComplete(Model model) {
+        model.addAttribute("backUrl", "/books");
+        model.addAttribute("backLabel", "書籍一覧に戻る");
+        return "complete";
+    }
+
+    // ===== BOOK-03 編集 =====
+    @GetMapping(EDIT)
+    public String editInput(@RequestParam Integer idBook, Model model, RedirectAttributes ra) {
+        try {
+            BookForm form = bookAdminService.toForm(bookAdminService.find(idBook));
+            return input(form, List.of(), "書籍編集", EDIT, model);
+        } catch (BusinessException e) {
+            ra.addFlashAttribute("errorMessage", e.getMessage());
+            return "redirect:/books";
+        }
+    }
+
+    @PostMapping(EDIT + "/input")
+    public String editBack(@ModelAttribute("form") BookForm form, Model model) {
+        return input(form, List.of(), "書籍編集", EDIT, model);
+    }
+
+    @PostMapping(EDIT + "/confirm")
+    public String editConfirm(@ModelAttribute("form") BookForm form, Model model) {
+        List<String> errors = bookAdminService.validate(form);
+        if (!errors.isEmpty()) return input(form, errors, "書籍編集", EDIT, model);
+        return confirm("書籍編集", EDIT, model);
+    }
+
+    @PostMapping(EDIT + "/execute")
+    public String editExecute(@ModelAttribute("form") BookForm form,
+                              @SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser admin,
+                              Model model, RedirectAttributes ra) {
+        try {
+            bookAdminService.update(form, admin);
+        } catch (BusinessException e) {
+            return input(form, List.of(e.getMessage()), "書籍編集", EDIT, model);
+        }
+        ra.addFlashAttribute("message", "書籍編集が完了しました。");
+        return "redirect:" + EDIT + "/complete";
+    }
+
+    @GetMapping(EDIT + "/complete")
+    public String editComplete(Model model) {
+        return newComplete(model);
+    }
+
+    private String input(BookForm form, List<String> errors, String title, String base, Model model) {
+        model.addAttribute("form", form);
+        model.addAttribute("errors", errors);
+        model.addAttribute("title", title);
+        model.addAttribute("base", base);
+        return "bookInput";
+    }
+
+    private String confirm(String title, String base, Model model) {
+        model.addAttribute("title", title);
+        model.addAttribute("base", base);
+        return "bookConfirm";
+    }
 }
--- a/book-rent/src/main/java/com/example/demo/controller/AdminLoanController.java
+++ b/book-rent/src/main/java/com/example/demo/controller/AdminLoanController.java
@@ -1,116 +1,118 @@
 package com.example.demo.controller;
-
-import java.util.logging.Logger;
-
-import jakarta.servlet.http.HttpSession;
-
 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.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.SessionAttribute;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;

 import com.example.demo.common.BusinessException;
 import com.example.demo.common.Const;
 import com.example.demo.common.LoginUser;
-import com.example.demo.dto.BorrowView;
-import com.example.demo.form.RentalForm;
 import com.example.demo.service.LoanService;

+/**
+ * 管理者用：LOAN-02 申請一覧、LOAN-03 承認/却下、LOAN-04 貸出中一覧、LOAN-05 返却。
+ * /admin/** は LoginCheckInterceptor で管理者以外を拒否する。
+ */
@Controller
 public class AdminLoanController {
+    private final LoanService loanService;

-	private final static Logger LOGGER = Logger.getLogger(AdminLoanController.class.getName());
-	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
+    public AdminLoanController(LoanService loanService) {
+        this.loanService = loanService;
+    }

-	private final LoanService loanService;
+    // ===== LOAN-02 書籍申請一覧（承認待） =====
+    @GetMapping("/admin/applications")
+    public String applications(Model model) {
+        model.addAttribute("list", loanService.listByStatus(Const.STATUS_WAITING));
+        return "applicationList";
+    }

-	public AdminLoanController(LoanService loanService) {
-		this.loanService = loanService;
-	}
+    // ===== LOAN-03 承認／却下 =====
+    @GetMapping("/admin/applications/{id}")
+    public String approvalConfirm(@PathVariable Integer id, Model model, RedirectAttributes ra) {
+        try {
+            model.addAttribute("r", loanService.getView(id, Const.STATUS_WAITING));
+            return "approvalConfilm"; 
+        } catch (BusinessException e) {
+            ra.addFlashAttribute("errorMessage", e.getMessage());
+            return "redirect:/admin/applications";
+        }
+    }

-	
-	@GetMapping("/admin/applications/{id}")
-	public String showApprovalConfirm(@PathVariable("id") Integer idRequest, HttpSession session, Model model) {
+    @PostMapping("/admin/applications/{id}/approve")
+    public String approve(@PathVariable Integer id,
+                          @SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser admin, RedirectAttributes ra) {
+        try {
+            loanService.approve(id, admin);
+            ra.addFlashAttribute("message", "書籍貸出申請を承認しました。");
+            return "approvalComplete";
+        } catch (BusinessException e) {
+            ra.addFlashAttribute("errorMessage", e.getMessage());
+            return "redirect:/admin/applications";
+        }
+    }

-		// セッションからログイン情報のチェック
-		LoginUser loginUser = (LoginUser) session.getAttribute("LOGIN_USER");
-		if (loginUser == null) {
-			return "redirect:/login";
-		}
+    @PostMapping("/admin/applications/{id}/reject")
+    public String reject(@PathVariable Integer id,
+                         @SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser admin, RedirectAttributes ra) {
+        try {
+            loanService.reject(id, admin);
+            ra.addFlashAttribute("message", "書籍貸出申請を却下しました。");
+            return "approvalRejected";
+        } catch (BusinessException e) {
+            ra.addFlashAttribute("errorMessage", e.getMessage());
+            return "redirect:/admin/applications";
+        }
+    }

-		// エラーによる差し戻し(Form)がModel内に存在する場合は、二重に作成しない
-		if (!model.containsAttribute("approvalConfilm")) {
-			try {
-				//  LoanServiceから現在の承認待ち状態のデータを取得
-				BorrowView view = loanService.getView(idRequest, Const.STATUS_WAITING);
+    @GetMapping("/admin/approval/complete")
+    public String approvalComplete(Model model) {
+        model.addAttribute("backUrl", "/admin/applications");
+        model.addAttribute("backLabel", "承認待ち一覧に戻る");
+        return "complete";
+    }

-				//  取得したデータを画面用の RentalForm（approvalConfilm）に詰め替える
-				RentalForm form = new RentalForm();
-				form.setIdRequest(view.getIdRequest());
-				form.setNmEmployee(view.getNmApplicant()); 
-				form.setDateRequest(view.getDateRequest() != null ? view.getDateRequest().toString() : "");
-				form.setIsbn(view.getIsbn());
-				form.setNmBook(view.getNmBook());
-				form.setPublisher(view.getPublisher());
-				form.setNote(view.getNote() != null ? view.getNote() : "");
-				form.setDateBorrow(view.getDateBorrow() != null ? view.getDateBorrow().toString() : "");
-				form.setDateScheduledReturn(
-						view.getDateScheduledReturn() != null ? view.getDateScheduledReturn().toString() : "");
+    // ===== LOAN-04 貸出中書籍一覧 =====
+    @GetMapping("/admin/lendings")
+    public String lendings(Model model) {
+        model.addAttribute("list", loanService.listByStatus(Const.STATUS_LENDING));
+        return "lendingList";
+    }

-				//  画面オブジェクトをモデルに設定
-				model.addAttribute("approvalConfilm", form);
+    // ===== LOAN-05 返却 =====
+    @GetMapping("/admin/lendings/{id}")
+    public String returnConfirm(@PathVariable Integer id, Model model, RedirectAttributes ra) {
+        try {
+            model.addAttribute("r", loanService.getView(id, Const.STATUS_LENDING));
+            return "returnConfirm";
+        } catch (BusinessException e) {
+            ra.addFlashAttribute("errorMessage", e.getMessage());
+            return "redirect:/admin/lendings";
+        }
+    }

-			} catch (BusinessException e) {
-				// 対象データがない、または既に別の人に処理されていた場合は、一覧画面にメッセージ付きで戻す
-				model.addAttribute("errorMessage", e.getMessage());
-				return "redirect:/applicationList";
-			}
-		}
+    @PostMapping("/admin/lendings/{id}/return")
+    public String doReturn(@PathVariable Integer id,
+                           @SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser admin, RedirectAttributes ra) {
+        try {
+            loanService.returnBook(id, admin);
+            ra.addFlashAttribute("message", "書籍の返却が完了しました。");
+            return "returnComplete";
+        } catch (BusinessException e) {
+            ra.addFlashAttribute("errorMessage", e.getMessage());
+            return "redirect:/admin/lendings";
+        }
+    }

-		//  書籍貸出承認確認画面（HTMLファイル名）を呼び出す
-		return "admin/approvalConfirm";
-	}
-
-	@PostMapping("/submit")
-	public String executeApproval(
-			@ModelAttribute("approvalConfilm") RentalForm form,
-			@RequestParam("action") String action,
-			HttpSession session,
-			RedirectAttributes redirectAttributes) {
-
-		//  セッションからログイン中の管理者情報を取得
-		LoginUser loginUser = (LoginUser) session.getAttribute("LOGIN_USER");
-		if (loginUser == null) {
-			return "redirect:/login";
-		}
-
-		try {
-			//  アクション（ボタンのvalue属性）に応じたサービス処理の実行
-			if ("approve".equals(action)) {
-				loanService.approve(form.getIdRequest(), loginUser);
-				redirectAttributes.addFlashAttribute("successMessage", "申請を承認しました。");
-
-			} else if ("reject".equals(action)) {
-				loanService.reject(form.getIdRequest(), loginUser);
-				redirectAttributes.addFlashAttribute("successMessage", "申請を却下しました。");
-
-			} else {
-				throw new BusinessException("不正な操作が行われました。");
-			}
-
-		} catch (BusinessException e) {
-			redirectAttributes.addFlashAttribute("errorMessage", e.getMessage());
-
-			// エラーが起きた入力データをそのまま保持して詳細（確認）画面に戻す
-			redirectAttributes.addFlashAttribute("approvalConfilm", form);
-
-			return "redirect:/admin/applications/" + form.getIdRequest();
-		}
-
-		return "redirect:/applicationList";
-	}
+    @GetMapping("/admin/return/complete")
+    public String returnComplete(Model model) {
+        model.addAttribute("backUrl", "/admin/lendings");
+        model.addAttribute("backLabel", "貸出中書籍一覧に戻る");
+        return "complete";
+    }
 }
+
--- a/book-rent/src/main/java/com/example/demo/controller/BookController.java
+++ b/book-rent/src/main/java/com/example/demo/controller/BookController.java
@@ -1,5 +1,39 @@
 package com.example.demo.controller;

+
+
+
+	
+
+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.BookService;
+
+
+/** BOOK-01：書籍検索（bookList.html） */
+@Controller
 public class BookController {
+    private final BookService bookService;
+
+    public BookController(BookService bookService) {
+        this.bookService = bookService;
+    }
+
+    /** メニューの「書籍一覧」＝条件なし（全件）、検索ボタン＝条件付きで同じURLを使う */
+    @GetMapping("/books")
+    public String list(@RequestParam(defaultValue = "") String nmBook,
+                       @RequestParam(defaultValue = "") String publisher,
+                       @RequestParam(defaultValue = "") String note,
+                       Model model) {
+        model.addAttribute("books", bookService.searchLendable(nmBook, publisher, note));
+        // 検索条件を保持
+        model.addAttribute("nmBook", nmBook);
+        model.addAttribute("publisher", publisher);
+        model.addAttribute("note", note);
+        return "bookList";
+    }

 }
--- a/book-rent/src/main/java/com/example/demo/controller/EmployeeController.java
+++ b/book-rent/src/main/java/com/example/demo/controller/EmployeeController.java
@@ -1,5 +1,178 @@
 package com.example.demo.controller;

-public class EmployeeController {
+import java.util.List;
+import java.util.Optional;

+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 org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.SessionAttribute;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import com.example.demo.common.BusinessException;
+import com.example.demo.common.Const;
+import com.example.demo.common.LoginUser;
+import com.example.demo.entity.Employee;
+import com.example.demo.form.EmployeeForm;
+import com.example.demo.service.EmployeeService;
+
+/**
+ * EMP-01 社員登録（管理者のみ：/admin/** で拒否）
+ * EMP-02 社員編集（管理者：メールアドレスで検索して全項目 ／ 一般：自分のパスワードのみ）
+ */
+@Controller
+public class EmployeeController {
+	private static final String NEW = "/admin/employees/new";
+	private static final String EDIT = "/employees/edit";
+
+	private final EmployeeService employeeService;
+
+	public EmployeeController(EmployeeService employeeService) {
+		this.employeeService = employeeService;
+	}
+
+	// ===== EMP-01 社員登録 =====
+	@GetMapping(NEW)
+	public String registInput(Model model) {
+		return registView(new EmployeeForm(), List.of(), model);
+	}
+
+	@PostMapping(NEW + "/input")
+	public String registBack(@ModelAttribute("form") EmployeeForm form, Model model) {
+		return registView(form, List.of(), model);
+	}
+
+	@PostMapping(NEW + "/confirm")
+	public String registConfirm(@ModelAttribute("form") EmployeeForm form, Model model) {
+		List<String> errors = employeeService.validateRegist(form);
+		if (!errors.isEmpty())
+			return registView(form, errors, model);
+		return "employeeRegistConfirm";
+	}
+
+	@PostMapping(NEW + "/execute")
+	public String registExecute(@ModelAttribute("form") EmployeeForm form,
+			@SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser admin,
+			Model model, RedirectAttributes ra) {
+		try {
+			employeeService.register(form, admin);
+		} catch (BusinessException e) {
+			return registView(form, List.of(e.getMessage()), model);
+		}
+		ra.addFlashAttribute("message", "社員登録が完了しました。");
+		return "redirect:" + NEW + "/complete";
+	}
+
+	@GetMapping(NEW + "/complete")
+	public String registComplete(Model model) {
+		return complete(model);
+	}
+
+	private String registView(EmployeeForm form, List<String> errors, Model model) {
+		model.addAttribute("form", form);
+		model.addAttribute("errors", errors);
+		return "employeeRegistInput";
+	}
+
+	// ===== EMP-02 社員編集 =====
+
+	/** メニュー「社員編集」：管理者は検索画面へ、一般ユーザーは検索せず自分の編集画面へ */
+	@GetMapping("/employees/search")
+	public String search(@SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser user) {
+		return user.isAdmin() ? "employeeSearch" : "redirect:" + EDIT;
+	}
+
+	@PostMapping("/employees/search")
+	public String doSearch(@RequestParam(defaultValue = "") String mailAddress,
+			@SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser user, Model model) {
+		if (!user.isAdmin())
+			return "redirect:/menu";
+		Optional<Employee> e = employeeService.findByMail(mailAddress);
+		if (e.isEmpty()) {
+			model.addAttribute("mailAddress", mailAddress);
+			model.addAttribute("errorMessage", "該当する社員が見つかりません。");
+			return "employeeSearch";
+		}
+		return "redirect:" + EDIT + "?idEmployee=" + e.get().getIdEmployee();
+	}
+
+	@GetMapping(EDIT)
+	public String editInput(@RequestParam(required = false) Integer idEmployee,
+			@SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser user,
+			Model model, RedirectAttributes ra) {
+		// 一般ユーザーは常に自分自身（リクエストの社員IDは使わない）
+		Integer target = user.isAdmin() ? idEmployee : user.getIdEmployee();
+		if (target == null)
+			return "redirect:/employees/search";
+		try {
+			return editView(employeeService.toForm(employeeService.find(target)), List.of(), user, model);
+		} catch (BusinessException e) {
+			ra.addFlashAttribute("errorMessage", e.getMessage());
+			return "redirect:/menu";
+		}
+	}
+
+	@PostMapping(EDIT + "/input")
+	public String editBack(@ModelAttribute("form") EmployeeForm form,
+			@SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser user, Model model) {
+		fixTarget(form, user);
+		return editView(form, List.of(), user, model);
+	}
+
+	@PostMapping(EDIT + "/confirm")
+	public String editConfirm(@ModelAttribute("form") EmployeeForm form,
+			@SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser user, Model model) {
+		fixTarget(form, user);
+		List<String> errors = user.isAdmin()
+				? employeeService.validateUpdateByAdmin(form)
+				: employeeService.validateUpdateBySelf(form);
+		if (!errors.isEmpty())
+			return editView(form, errors, user, model);
+		model.addAttribute("admin", user.isAdmin());
+		return "employeeUpdateConfirm";
+	}
+
+	@PostMapping(EDIT + "/execute")
+	public String editExecute(@ModelAttribute("form") EmployeeForm form,
+			@SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser user,
+			Model model, RedirectAttributes ra) {
+		fixTarget(form, user);
+		try {
+			if (user.isAdmin())
+				employeeService.updateByAdmin(form, user);
+			else
+				employeeService.updateBySelf(form, user);
+		} catch (BusinessException e) {
+			return editView(form, List.of(e.getMessage()), user, model);
+		}
+		ra.addFlashAttribute("message", "社員編集が完了しました。");
+		return "redirect:" + EDIT + "/complete";
+	}
+
+	@GetMapping(EDIT + "/complete")
+	public String editComplete(Model model) {
+		return complete(model);
+	}
+
+	/** 一般ユーザーの対象は常にセッションの社員ID（URL/フォーム値の書き換えを無視） */
+	private static void fixTarget(EmployeeForm form, LoginUser user) {
+		if (!user.isAdmin())
+			form.setIdEmployee(user.getIdEmployee());
+	}
+
+	private String editView(EmployeeForm form, List<String> errors, LoginUser user, Model model) {
+		model.addAttribute("form", form);
+		model.addAttribute("errors", errors);
+		model.addAttribute("admin", user.isAdmin());
+		return "employeeUpdateInput";
+	}
+
+	private String complete(Model model) {
+		model.addAttribute("backUrl", "/menu");
+		model.addAttribute("backLabel", "メニューに戻る");
+		return "complete";
+	}
 }
--- a/book-rent/src/main/java/com/example/demo/controller/GlobalExceptionHandler.java
+++ b/book-rent/src/main/java/com/example/demo/controller/GlobalExceptionHandler.java
@@ -1,5 +1,34 @@
 package com.example.demo.controller;

-public class GlobalExceptionHandler {

+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.resource.NoResourceFoundException;
+
+/** 予期しない例外：内部情報を画面に出さず、原因調査用にログへ出力する（NFR-04, NFR-08） */
+@ControllerAdvice
+public class GlobalExceptionHandler {
+    private static final Logger log = LoggerFactory.getLogger(GlobalExceptionHandler.class);
+
+    /** 存在しないURL（favicon.ico など）はエラーログを出さず404にする */
+    @ExceptionHandler(NoResourceFoundException.class)
+    public ModelAndView handleNotFound(NoResourceFoundException e) {
+        ModelAndView mav = new ModelAndView("error");
+        mav.setStatus(HttpStatus.NOT_FOUND);
+        mav.addObject("errorMessage", "ページが見つかりません。");
+        return mav;
+    }
+
+    @ExceptionHandler(Exception.class)
+    public ModelAndView handle(Exception e) {
+        log.error("予期しないエラーが発生しました", e);
+        ModelAndView mav = new ModelAndView("error");
+        mav.addObject("errorMessage", "システムエラーが発生しました。しばらくしてからもう一度お試しください。");
+        return mav;
+    }
 }
--- a/book-rent/src/main/java/com/example/demo/controller/LoginController.java
+++ b/book-rent/src/main/java/com/example/demo/controller/LoginController.java
@@ -1,6 +1,6 @@
 package com.example.demo.controller;
-
-
+ 
+ 
 import java.util.Optional;

 import jakarta.servlet.http.HttpServletRequest;
@@ -15,21 +15,21 @@ import org.springframework.web.bind.annotation.RequestParam;
 import com.example.demo.common.Const;
 import com.example.demo.common.LoginUser;
 import com.example.demo.service.AuthService;
-
+ 
 /** AUTH-01：ログイン／ログアウト（login.html） */
@Controller
 public class LoginController {
    private final AuthService authService;
-
+ 
    public LoginController(AuthService authService) {
        this.authService = authService;
    }
-
+ 
    @GetMapping("/")
    public String root() {
        return "redirect:/menu";
    }
-
+ 
    @GetMapping("/login")
    public String loginForm(HttpSession session) {
        if (session.getAttribute(Const.SESSION_LOGIN_USER) != null) {
@@ -37,14 +37,14 @@ public class LoginController {
        }
        return "login";
    }
-
+ 
    @PostMapping("/login")
    public String login(@RequestParam(defaultValue = "") String mailAddress,
                        @RequestParam(defaultValue = "") String password,
                        HttpServletRequest request, Model model) {
        String mail = mailAddress.trim();
        model.addAttribute("mailAddress", mail);   // 入力値を保持（パスワードは保持しない）
-
+ 
        if (mail.isEmpty() || password.isEmpty()) {
            model.addAttribute("errorMessage", "メールアドレスとパスワードを入力してください。");
            return "login";
@@ -63,11 +63,10 @@ public class LoginController {
        request.getSession(true).setAttribute(Const.SESSION_LOGIN_USER, user.get());
        return "redirect:/menu";
    }
-
+ 
    @PostMapping("/logout")
    public String logout(HttpSession session) {
        session.invalidate();
        return "redirect:/login";
    }
-}
-
+}
--- a/book-rent/src/main/java/com/example/demo/controller/MenuController.java
+++ b/book-rent/src/main/java/com/example/demo/controller/MenuController.java
@@ -1,19 +1,13 @@
 package com.example.demo.controller;

 import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
-
+ 
+/** メニュー画面（menu.html）。表示内容は管理者フラグで切り替える。 */
@Controller
 public class MenuController {
-
    @GetMapping("/menu")
-    public String showMenu(Model model) {
-
-        // 仮のログインユーザー名
-        model.addAttribute("loginUserName", "テストユーザー");
-
-        // menu.htmlを表示
+    public String menu() {
        return "menu";
    }
-}
+}
--- a/book-rent/src/main/java/com/example/demo/form/EmployeeForm.java
+++ b/book-rent/src/main/java/com/example/demo/form/EmployeeForm.java
@@ -1,33 +1,82 @@
 package com.example.demo.form;
+
 /** 社員登録・編集フォーム */
 public class EmployeeForm {
-    private Integer idEmployee;
-    private String nmEmployee = "";
-    private String knEmployee = "";
-    private String mailAddress = "";
-    private String password = "";
-    private String flgAdmin = "0";
-    private String flgRetirement = "0";
+	private Integer idEmployee;
+	private String nmEmployee = "";
+	private String knEmployee = "";
+	private String mailAddress = "";
+	private String password = "";
+	private String flgAdmin = "0";
+	private String flgRetirement = "0";

-    public void trim() {
-        nmEmployee = t(nmEmployee); knEmployee = t(knEmployee); mailAddress = t(mailAddress);
-        flgAdmin = t(flgAdmin); flgRetirement = t(flgRetirement);
-        if (password == null) password = "";
-    }
-    private static String t(String s) { return s == null ? "" : s.trim(); }
+	public void trim() {
+		nmEmployee = t(nmEmployee);
+		knEmployee = t(knEmployee);
+		mailAddress = t(mailAddress);
+		flgAdmin = t(flgAdmin);
+		flgRetirement = t(flgRetirement);
+		if (password == null)
+			password = "";
+	}

-    public Integer getIdEmployee() { return idEmployee; }
-    public void setIdEmployee(Integer v) { this.idEmployee = v; }
-    public String getNmEmployee() { return nmEmployee; }
-    public void setNmEmployee(String v) { this.nmEmployee = v; }
-    public String getKnEmployee() { return knEmployee; }
-    public void setKnEmployee(String v) { this.knEmployee = v; }
-    public String getMailAddress() { return mailAddress; }
-    public void setMailAddress(String v) { this.mailAddress = v; }
-    public String getPassword() { return password; }
-    public void setPassword(String v) { this.password = v; }
-    public String getFlgAdmin() { return flgAdmin; }
-    public void setFlgAdmin(String v) { this.flgAdmin = v; }
-    public String getFlgRetirement() { return flgRetirement; }
-    public void setFlgRetirement(String v) { this.flgRetirement = v; }
+	private static String t(String s) {
+		return s == null ? "" : s.trim();
+	}
+
+	public Integer getIdEmployee() {
+		return idEmployee;
+	}
+
+	public void setIdEmployee(Integer v) {
+		this.idEmployee = v;
+	}
+
+	public String getNmEmployee() {
+		return nmEmployee;
+	}
+
+	public void setNmEmployee(String v) {
+		this.nmEmployee = v;
+	}
+
+	public String getKnEmployee() {
+		return knEmployee;
+	}
+
+	public void setKnEmployee(String v) {
+		this.knEmployee = v;
+	}
+
+	public String getMailAddress() {
+		return mailAddress;
+	}
+
+	public void setMailAddress(String v) {
+		this.mailAddress = v;
+	}
+
+	public String getPassword() {
+		return password;
+	}
+
+	public void setPassword(String v) {
+		this.password = v;
+	}
+
+	public String getFlgAdmin() {
+		return flgAdmin;
+	}
+
+	public void setFlgAdmin(String v) {
+		this.flgAdmin = v;
+	}
+
+	public String getFlgRetirement() {
+		return flgRetirement;
+	}
+
+	public void setFlgRetirement(String v) {
+		this.flgRetirement = v;
+	}
 }
--- a/book-rent/src/main/resources/application.properties
+++ b/book-rent/src/main/resources/application.properties
@@ -10,4 +10,4 @@ spring.jpa.open-in-view=false
 spring.jpa.properties.hibernate.jdbc.time_zone=Asia/Tokyo
 
 spring.thymeleaf.cache=false
-server.servlet.session.timeout=30m
+server.servlet.session.timeout=30m
--- a/book-rent/src/main/resources/static/css/style.css
+++ b/book-rent/src/main/resources/static/css/style.css
@@ -0,0 +1,90 @@
+body
+{font-family:
+	"Meiryo","Hiragino Sans",sans-serif;
+	margin:0;color:#222;
+	background:#f6f7f9}
+header.top
+{display:flex;
+	justify-content:space-between;
+	align-items:center;
+	background:#176a78;color:#fff;
+	padding:10px 20px
+}
+header.top form
+{display:inline;
+	margin:0}
+header.top .user
+{margin-right:12px
+}
+main
+{max-width:960px;
+	margin:24px auto;
+	padding:0 16px
+}
+h1
+{font-size:20px
+}
+.card
+{background:#fff;
+	border:1px solid #dde;
+	border-radius:6px;
+	padding:20px;
+	margin-bottom:16px
+}
+label
+{display:block;
+	margin:10px 0 4px;
+	font-weight:bold
+}
+input[type=text],input[type=password],input[type=email]
+{width:100%;
+	max-width:360px;
+	padding:6px;
+	box-sizing:border-box
+}
+button,.btn
+{display:inline-block;
+	background:#176a78;
+	color:#fff;border:0;
+	border-radius:4px;
+	padding:7px 16px;
+	cursor:pointer;
+	text-decoration:none;
+	font-size:14px
+}
+button.sub,.btn.sub
+{background:#6b7b80
+}
+.error
+{background:#fdecea;color:#b3261e;
+	border:1px solid #f5c2be;
+	padding:8px 12px;
+	border-radius:4px;
+	margin-bottom:12px
+}
+.info
+{background:#e8f4ea;
+	color:#1b5e20;
+	border:1px solid #bfdcc3;
+	padding:8px 12px;
+	border-radius:4px;
+	margin-bottom:12px
+}
+table
+{border-collapse:collapse;
+	width:100%;
+	background:#fff
+}
+th,td
+{border:1px solid #dde;
+	padding:6px 8px;
+	text-align:left;
+	font-size:14px
+}
+th
+{background:#eaf4f6
+}
+.menu a
+{display:block;
+	margin:8px 0
+}
--- a/book-rent/src/main/resources/templates/applicationConfirm.html
+++ b/book-rent/src/main/resources/templates/applicationConfirm.html
@@ -1,37 +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>
-	<table>
-		<!-- エラーメッセージ -->
-		<div class="msgBox error" th:if="${messageError != null}">
-			<span class="error" th:text="${messageError.message}"></span>
-			<th class="header">蔵書ID</th>
-			<td>
-				<input placeholder="蔵書ID" th:field="*{id_book}" type="number" />
-			</td>
-			<th class="header">書籍名</th>
-			<td>
-				<input placeholder="蔵書ID" th:field="*{nm_book}" type="text" />
-			</td>
-			<th class="header">貸出日</th>
-			<td>
-				<input placeholder="貸出日" th:field="*{date_borrow}" type="text" />
-			</td>
-			<th class="header">返却予定日</th>
-			<td>
-				<input placeholder="返却予定日" th:field="*{date_schedule_return}" type="text" />
-			</td>
-
-			<a href="applicationComplete/html" class="btn"> 申請</a>
-	</table>
-	<a href="@{/application}">申請情報入力</a>
-</body>
-
-</html>
--- a/book-rent/src/main/resources/templates/approvalComplete.html
+++ b/book-rent/src/main/resources/templates/approvalComplete.html
@@ -0,0 +1,23 @@
+<!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>
+	<div th:replace="~{fragments/header :: header}"></div>
+	<main class="complete-container">
+	<h1>完了</h1>
+	<div class="info" th:text="${message} ?:'書籍貸出申請を承認しました。'"></div>
+
+	<p>
+		<a class="btn" th:href="@{/admin/applications}">承認待ち一覧に戻る</a>
+		<a class="btn sub" th:href="@{/menu}">メニューに戻る</a>
+	</p>
+	</main>
+</body>
+
+</html>
--- a/book-rent/src/main/resources/templates/approvalConfilm.html
+++ b/book-rent/src/main/resources/templates/approvalConfilm.html
@@ -0,0 +1,85 @@
+<!DOCTYPE html>
+<html xmlns:th="http://thymeleaf.org">
+
+<head>
+	<meta charset="UTF-8">
+	<title>書籍貸出承認確認</title>
+	<link rel="stylesheet" th:href="@{/css/style.css}">
+</head>
+
+<body>
+	<div th:replace="~{fragments/header :: header}"></div>
+	<main>
+		<h1>書籍貸出承認確認</h1>
+		<div class="card">
+			<table>
+				<tr>
+					<th>申請ID</th>
+					<td th:text="${r.idRequest}"></td>
+				</tr>
+				<tr>
+					<th>申請者名</th>
+					<td th:text="${r.nmApplicant}"></td>
+				</tr>
+				<tr>
+					<th>申請日</th>
+					<td th:text="${r.dateRequest}"></td>
+				</tr>
+				<tr>
+					<th>ISBN</th>
+					<td th:text="${r.isbn}"></td>
+				</tr>
+				<tr>
+					<th>書籍名</th>
+					<td th:text="${r.nmBook}" style="width: 700px;"></td>
+				</tr>
+				<tr>
+					<th>出版社</th>
+					<td th:text="${r.publisher}"></td>
+				</tr>
+				<tr>
+					<th>特記事項</th>
+					<td th:text="${r.note}"></td>
+				</tr>
+				<tr>
+					<th>貸出日</th>
+					<td th:text="${r.dateBorrow}"></td>
+				</tr>
+				<tr>
+					<th>返却予定日</th>
+					<td th:text="${r.dateScheduledReturn}"></td>
+				</tr>
+			</table>
+
+			<div class="buttonSection" style="margin-top: 20px;">
+
+				<form th:action="@{/admin/applications/{id}/approve(id=${r.idRequest})}" method="post"
+					style="display: inline;">
+					<button type="submit">承認</button>
+				</form>
+
+
+				<form th:action="@{/admin/applications/{id}/reject(id=${r.idRequest})}" method="post"
+					style="display: inline; margin-left: 10px;">
+					<button type="submit" class="sub">却下</button>
+				</form>
+				<a th:href="@{/admin/applications}" style="text-decoration: none; margin-left: 10px;">
+					<button type="button" class="sub">承認待ち一覧に戻る</button>
+				</a>
+			</div>
+
+
+
+
+			<script>
+				function logoutSubmit() {
+					if (confirm("ログアウトしますか？")) {
+						window.location.href = "/logout";
+					}
+				}
+			</script>
+		</div>
+	</main>
+</body>
+
+</html>
--- a/book-rent/src/main/resources/templates/approvalRejected.html
+++ b/book-rent/src/main/resources/templates/approvalRejected.html
@@ -0,0 +1,25 @@
+<!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>
+		<div th:replace="~{fragments/header :: header}"></div>
+		<main class="complete-container">
+		<h1>却下</h1>
+			<div class="info" th:text="${message} ?: '書籍貸出申請を却下しました。'"></div>
+
+			<p>
+				<a class="btn" th:href="@{/admin/applications}">承認待ち一覧に戻る</a>
+				<a class="btn sub" th:href="@{/menu}">メニューに戻る</a>
+			</p>
+
+		</main>
+	</body>
+
+
+</html>
--- a/book-rent/src/main/resources/templates/bookConfirm.html
+++ b/book-rent/src/main/resources/templates/bookConfirm.html
@@ -0,0 +1,42 @@
+<!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>
+<div th:replace="~{fragments/header :: header}"></div>
+<main>
+  <h1>書籍情報確認</h1>
+  <div class="card">
+    <h2 th:text="${title}">書籍登録</h2>
+    <table>
+      <tr><th>ISBN</th><td th:text="${form.isbn}"></td></tr>
+      <tr><th>書籍名</th><td th:text="${form.nmBook}"></td></tr>
+      <tr><th>書籍名よみ</th><td th:text="${form.knBook}"></td></tr>
+      <tr><th>出版社</th><td th:text="${form.publisher}"></td></tr>
+      <tr><th>特記事項</th><td th:text="${form.note}"></td></tr>
+    </table>
+    <form th:action="@{${base + '/execute'}}" method="post" style="display:inline">
+      <input type="hidden" name="idBook" th:value="${form.idBook}">
+      <input type="hidden" name="isbn" th:value="${form.isbn}">
+      <input type="hidden" name="nmBook" th:value="${form.nmBook}">
+      <input type="hidden" name="knBook" th:value="${form.knBook}">
+      <input type="hidden" name="publisher" th:value="${form.publisher}">
+      <input type="hidden" name="note" th:value="${form.note}">
+      <button type="submit" th:text="${title == '書籍登録'} ? '登録' : '編集'">登録</button>
+    </form>
+    <form th:action="@{${base + '/input'}}" method="post" style="display:inline">
+      <input type="hidden" name="idBook" th:value="${form.idBook}">
+      <input type="hidden" name="isbn" th:value="${form.isbn}">
+      <input type="hidden" name="nmBook" th:value="${form.nmBook}">
+      <input type="hidden" name="knBook" th:value="${form.knBook}">
+      <input type="hidden" name="publisher" th:value="${form.publisher}">
+      <input type="hidden" name="note" th:value="${form.note}">
+      <button type="submit" class="sub">書籍情報入力に戻る</button>
+    </form>
+  </div>
+</main>
+</body>
+</html>
--- a/book-rent/src/main/resources/templates/bookInput.html
+++ b/book-rent/src/main/resources/templates/bookInput.html
@@ -0,0 +1,34 @@
+<!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>
+<div th:replace="~{fragments/header :: header}"></div>
+<main>
+  <h1>書籍情報入力</h1>
+  <div class="error" th:if="${errorMessage}" th:text="${errorMessage}"></div>
+  <div class="error" th:each="e : ${errors}" th:text="${e}"></div>
+  <div class="card">
+    <h2 th:text="${title}">書籍登録</h2>
+    <form th:action="@{${base + '/confirm'}}" method="post">
+      <input type="hidden" name="idBook" th:value="${form.idBook}">
+      <label for="isbn">ISBN（必須・13文字以内）</label>
+      <input type="text" id="isbn" name="isbn" th:value="${form.isbn}" maxlength="13">
+      <label for="nmBook">書籍名（必須・50文字以内）</label>
+      <input type="text" id="nmBook" name="nmBook" th:value="${form.nmBook}" maxlength="50">
+      <label for="knBook">書籍名よみ（100文字以内）</label>
+      <input type="text" id="knBook" name="knBook" th:value="${form.knBook}" maxlength="100">
+      <label for="publisher">出版社（50文字以内）</label>
+      <input type="text" id="publisher" name="publisher" th:value="${form.publisher}" maxlength="50">
+      <label for="note">特記事項</label>
+      <input type="text" id="note" name="note" th:value="${form.note}">
+      <p><button type="submit" th:text="${title} + '確認'">確認</button>
+         <a class="btn sub" th:href="@{/books}">書籍一覧に戻る</a></p>
+    </form>
+  </div>
+</main>
+</body>
+</html>
--- a/book-rent/src/main/resources/templates/bookList.html
+++ b/book-rent/src/main/resources/templates/bookList.html
@@ -0,0 +1,67 @@
+<!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>
+	<div th:replace="~{fragments/header :: header}"></div>
+	<main>
+		<h1>書籍一覧</h1>
+		<div class="error" th:if="${errorMessage}" th:text="${errorMessage}"></div>
+		<div class="card">
+			<form th:action="@{/books}" method="get">
+				<label for="nmBook">書籍名</label>
+				<input type="text" id="nmBook" name="nmBook" th:value="${nmBook}">
+				<label for="publisher">出版社</label>
+				<input type="text" id="publisher" name="publisher" th:value="${publisher}">
+				<label for="note">特記事項</label>
+				<input type="text" id="note" name="note" th:value="${note}">
+				<p><button type="submit">検索</button>
+					<a class="btn sub" th:href="@{/menu}">メニューに戻る</a>
+					<a class="btn" th:if="${session.loginUser.admin}" th:href="@{/admin/books/new}">書籍新規登録</a>
+				</p>
+			</form>
+		</div>
+
+		<div class="card">
+			<h2>検索結果</h2>
+			<p th:if="${#lists.isEmpty(books)}">該当する書籍はありません。</p>
+			<table th:unless="${#lists.isEmpty(books)}">
+				<thead>
+					<tr>
+						<th>蔵書ID</th>
+						<th>ISBN</th>
+						<th>書籍名</th>
+						<th>書籍名よみ</th>
+						<th>出版社</th>
+						<th>特記事項</th>
+						<th>操作</th>
+					</tr>
+				</thead>
+				<tbody>
+					<tr th:each="b : ${books}">
+						<td th:text="${b.idBook}"></td>
+						<td th:text="${b.isbn}"></td>
+						<td th:text="${b.nmBook}"></td>
+						<td th:text="${b.knBook}"></td>
+						<td th:text="${b.publisher}"></td>
+						<td th:text="${b.note}"></td>
+						<td>
+							<!-- 一般：貸出申請(LOAN-01) ／ 管理者：編集(BOOK-03) -->
+							<a class="btn" th:unless="${session.loginUser.admin}"
+								th:href="@{/loan/apply(idBook=${b.idBook})}">貸出申請</a>
+							<a class="btn" th:if="${session.loginUser.admin}"
+								th:href="@{/admin/books/edit(idBook=${b.idBook})}">編集</a>
+						</td>
+					</tr>
+				</tbody>
+			</table>
+		</div>
+	</main>
+</body>
+
+</html>
--- a/book-rent/src/main/resources/templates/complete.html
+++ b/book-rent/src/main/resources/templates/complete.html
@@ -0,0 +1,19 @@
+<!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>
+<div th:replace="~{fragments/header :: header}"></div>
+<main>
+  <h1>完了</h1>
+  <div class="info" th:text="${message} ?: '処理が完了しました。'"></div>
+  <p>
+    <a class="btn" th:href="@{${backUrl}}" th:text="${backLabel}">戻る</a>
+<!--    <a class="btn sub" th:href="@{/menu}">メニューに戻る</a>-->
+  </p>
+</main>
+</body>
+</html>
--- a/book-rent/src/main/resources/templates/employeeRegistConfirm.html
+++ b/book-rent/src/main/resources/templates/employeeRegistConfirm.html
@@ -0,0 +1,101 @@
+
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>社員登録確認</title>
+    <link rel="stylesheet" th:href="@{/css/style.css}">
+</head>
+
+<body>
+
+    <!-- 共通ヘッダー -->
+    <div th:replace="~{fragments/header :: header}"></div>
+
+    <main>
+        <h2>社員登録確認</h2>
+
+        <!-- エラーメッセージ -->
+        <div class="error"
+             th:if="${errors != null and !errors.isEmpty()}">
+            <p th:each="error : ${errors}"
+               th:text="${error}">
+            </p>
+        </div>
+
+        <!-- 登録内容確認 -->
+        <div class="card">
+
+            <p>以下の内容で登録します。内容を確認してください。</p>
+
+            <form th:action="@{/admin/employees/new/execute}"
+                  th:object="${form}"
+                  method="post">
+
+                <!-- 登録内容一覧 -->
+                <table>
+                    <tbody>
+                        <tr>
+                            <th>社員名</th>
+                            <td th:text="*{nmEmployee}"></td>
+                        </tr>
+
+                        <tr>
+                            <th>社員名よみ</th>
+                            <td th:text="*{knEmployee}"></td>
+                        </tr>
+
+                        <tr>
+                            <th>メールアドレス</th>
+                            <td th:text="*{mailAddress}"></td>
+                        </tr>
+
+                        <tr>
+                            <th>パスワード</th>
+                            <td>********</td>
+                        </tr>
+
+                        <tr>
+                            <th>権限</th>
+                            <td th:text="*{flgAdmin == '1' ? '管理者' : '一般'}"></td>
+                        </tr>
+                    </tbody>
+                </table>
+
+                <!-- 登録処理に必要な値を引き継ぐ -->
+                <input type="hidden" th:field="*{nmEmployee}">
+                <input type="hidden" th:field="*{knEmployee}">
+                <input type="hidden" th:field="*{mailAddress}">
+                <input type="hidden" th:field="*{password}">
+                <input type="hidden" th:field="*{flgAdmin}">
+
+                <!-- ボタン：左に戻る、右に登録 -->
+<!--                <div style="display: flex;-->
+<!--                            justify-content: space-between;-->
+<!--                            align-items: center;-->
+<!--                            width: 100%;-->
+<!--                            margin-top: 20px;">-->
+
+                    <!-- 社員情報入力に戻る -->
+					<p>
+                    <a class="btn sub"
+                       th:href="@{/admin/employees/new}">
+                        社員情報入力に戻る
+                    </a>
+
+                    <!-- 登録 -->
+                    <button type="submit" class="btn">
+                        登録
+                    </button>
+					</p>
+			
+
+            </form>
+
+        </div>
+    </main>
+
+</body>
+</html>
--- a/book-rent/src/main/resources/templates/employeeRegistInput.html
+++ b/book-rent/src/main/resources/templates/employeeRegistInput.html
@@ -0,0 +1,117 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+
+<head>
+	<meta charset="UTF-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<title>社員登録</title>
+	<link rel="stylesheet" th:href="@{/css/style.css}">
+</head>
+
+<body>
+
+	<!-- 共通ヘッダー -->
+	<div th:replace="~{fragments/header :: header}"></div>
+
+	<main>
+		<h2>社員登録</h2>
+
+		<!-- 入力エラー表示 -->
+		<div class="error" th:if="${errors != null and !errors.isEmpty()}">
+			<p th:each="error : ${errors}" th:text="${error}">
+			</p>
+		</div>
+
+		<!-- 社員登録フォーム -->
+		<div class="card">
+
+			<form th:action="@{/admin/employees/new/confirm}" th:object="${form}" method="post">
+
+				<!-- 社員名 -->
+				<div>
+					<label for="nmEmployee">社員名</label>
+					<input type="text" id="nmEmployee" th:field="*{nmEmployee}">
+				</div>
+
+				<!-- 社員名よみ -->
+				<div>
+					<label for="knEmployee">社員名よみ</label>
+					<input type="text" id="knEmployee" th:field="*{knEmployee}">
+				</div>
+
+				<!-- メールアドレス -->
+				<div>
+					<label for="mailAddress">メールアドレス</label>
+					<input type="email" id="mailAddress" th:field="*{mailAddress}">
+				</div>
+
+				<!-- パスワード -->
+				<div>
+					<label for="password">パスワード</label>
+					<input type="password" id="password" th:field="*{password}">
+				</div>
+				<label for="flgAdmin">管理者フラグ</label>
+				<select id="flgAdmin" name="flgAdmin">
+					<option value="0" th:selected="${form.flgAdmin == '0'}">0：一般</option>
+					<option value="1" th:selected="${form.flgAdmin == '1'}">1：管理者</option>
+				</select>
+				<p><a class="btn sub" th:href="@{/menu}">メニューへ戻る</a>
+					<button type="submit">登録確認</button>
+				</p>
+
+				<!-- 権限：枠線なし・横並び -->
+				<!--                <div style="border: none;-->
+				<!--                            display: flex;-->
+				<!--                            flex-direction: row;-->
+				<!--                            align-items: center;-->
+				<!--                            gap: 25px;-->
+				<!--                            margin: 15px 0 25px;">-->
+
+				<!--                    <label style="display: inline-flex;-->
+				<!--                                  align-items: center;-->
+				<!--                                  gap: 5px;-->
+				<!--                                  white-space: nowrap;">-->
+				<!--                        <input type="radio"-->
+				<!--                               th:field="*{flgAdmin}"-->
+				<!--                               value="1">-->
+				<!--                        管理者-->
+				<!--                    </label>-->
+
+				<!--                    <label style="display: inline-flex;-->
+				<!--                                  align-items: center;-->
+				<!--                                  gap: 5px;-->
+				<!--                                  white-space: nowrap;">-->
+				<!--                        <input type="radio"-->
+				<!--                               th:field="*{flgAdmin}"-->
+				<!--                               value="0">-->
+				<!--                        一般ユーザー-->
+				<!--                    </label>-->
+
+				<!--                </div>-->
+
+				<!--                 ボタン：左に戻る・右に確認 -->
+				<!--                <div style="display: flex;-->
+				<!--                            justify-content: space-between;-->
+				<!--                            align-items: center;-->
+				<!--                            width: 100%;-->
+				<!--                            margin-top: 20px;">-->
+
+				<!--                    <a class="btn sub"-->
+				<!--                       th:href="@{/menu}">-->
+				<!--                        メニューに戻る-->
+				<!--                    </a>-->
+
+				<!--                    <button type="submit" class="btn">-->
+				<!--                        確認-->
+				<!--                    </button>-->
+
+				<!--                </div>-->
+
+			</form>
+
+		</div>
+	</main>
+
+</body>
+
+</html>
--- a/book-rent/src/main/resources/templates/employeeSearch.html
+++ b/book-rent/src/main/resources/templates/employeeSearch.html
@@ -0,0 +1,29 @@
+<!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>
+	<div th:replace="~{fragments/header :: header}"></div>
+	<main>
+		<h1>社員検索</h1>
+		<div class="error" th:if="${errorMessage}" th:text="${errorMessage}"></div>
+		<div class="error" th:each="e : ${errors}" th:text="${e}"></div>
+		<div class="card">
+			<form th:action="@{/employees/search}" method="post">
+				<label for="mailAddress">メールアドレス（256文字以内）</label>
+				<input type="text" id="mailAddress" name="mailAddress" th:value="${mailAddress}">
+
+				<p><button type="submit">検索</button>
+					<a class="btn sub" th:href="@{/menu}">メニューに戻る</a>
+				</p>
+			</form>
+		</div>
+	</main>
+</body>
+
+</html>
--- a/book-rent/src/main/resources/templates/employeeUpdateConfirm.html
+++ b/book-rent/src/main/resources/templates/employeeUpdateConfirm.html
@@ -0,0 +1,67 @@
+<!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>
+	<div th:replace="~{fragments/header :: header}"></div>
+	<main>
+		<h1>社員編集確認</h1>
+		<div class="card">
+			<table>
+				<th:block th:if="${admin}">
+					<tr>
+						<th>社員名</th>
+						<td th:text="${form.nmEmployee}"></td>
+					</tr>
+					<tr>
+						<th>社員名よみ</th>
+						<td th:text="${form.knEmployee}"></td>
+					</tr>
+					<tr>
+						<th>メールアドレス</th>
+						<td th:text="${form.mailAddress}"></td>
+					</tr>
+					<tr>
+						<th>管理者フラグ</th>
+						<td th:text="${form.flgAdmin == '1'} ? '1：管理者' : '0：一般'"></td>
+					</tr>
+					<tr>
+						<th>退職フラグ</th>
+						<td th:text="${form.flgRetirement == '1'} ? '1：退職' : '0：所属'"></td>
+					</tr>
+				</th:block>
+				<tr>
+					<th>パスワード</th>
+					<td th:text="${#strings.isEmpty(form.password)} ? '（変更しない）' : '********'"></td>
+				</tr>
+			</table>
+			<form th:action="@{/employees/edit/execute}" method="post" style="display:inline">
+				<input type="hidden" name="idEmployee" th:value="${form.idEmployee}">
+				<input type="hidden" name="nmEmployee" th:value="${form.nmEmployee}">
+				<input type="hidden" name="knEmployee" th:value="${form.knEmployee}">
+				<input type="hidden" name="mailAddress" th:value="${form.mailAddress}">
+				<input type="hidden" name="flgAdmin" th:value="${form.flgAdmin}">
+				<input type="hidden" name="flgRetirement" th:value="${form.flgRetirement}">
+				<input type="hidden" name="password" th:value="${form.password}">
+				<button type="submit">編集</button>
+			</form>
+			<form th:action="@{/employees/edit/input}" method="post" style="display:inline">
+				<input type="hidden" name="idEmployee" th:value="${form.idEmployee}">
+				<input type="hidden" name="nmEmployee" th:value="${form.nmEmployee}">
+				<input type="hidden" name="knEmployee" th:value="${form.knEmployee}">
+				<input type="hidden" name="mailAddress" th:value="${form.mailAddress}">
+				<input type="hidden" name="flgAdmin" th:value="${form.flgAdmin}">
+				<input type="hidden" name="flgRetirement" th:value="${form.flgRetirement}">
+				<input type="hidden" name="password" th:value="${form.password}">
+				<button type="submit" class="sub">社員情報入力に戻る</button>
+			</form>
+		</div>
+	</main>
+</body>
+
+</html>
--- a/book-rent/src/main/resources/templates/employeeUpdateInput.html
+++ b/book-rent/src/main/resources/templates/employeeUpdateInput.html
@@ -0,0 +1,52 @@
+<!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>
+	<div th:replace="~{fragments/header :: header}"></div>
+	<main>
+		<h1>社員編集</h1>
+		<div class="error" th:if="${errorMessage}" th:text="${errorMessage}"></div>
+		<div class="error" th:each="e : ${errors}" th:text="${e}"></div>
+		<div class="card">
+			<form th:action="@{/employees/edit/confirm}" method="post">
+				<input type="hidden" name="idEmployee" th:value="${form.idEmployee}">
+				<th:block th:if="${admin}">
+					<label for="nmEmployee">社員名（必須・50文字以内）</label>
+					<input type="text" id="nmEmployee" name="nmEmployee" th:value="${form.nmEmployee}" maxlength="50">
+					<label for="knEmployee">社員名よみ（必須・100文字以内）</label>
+					<input type="text" id="knEmployee" name="knEmployee" th:value="${form.knEmployee}" maxlength="100">
+					<label for="mailAddress">メールアドレス（必須）</label>
+					<input type="text" id="mailAddress" name="mailAddress" th:value="${form.mailAddress}"
+						maxlength="256">
+					<label for="flgAdmin">管理者フラグ</label>
+					<select id="flgAdmin" name="flgAdmin">
+						<option value="0" th:selected="${form.flgAdmin == '0'}">0：一般</option>
+						<option value="1" th:selected="${form.flgAdmin == '1'}">1：管理者</option>
+					</select>
+					<label for="flgRetirement">退職フラグ</label>
+					<select id="flgRetirement" name="flgRetirement">
+						<option value="0" th:selected="${form.flgRetirement == '0'}">0：所属</option>
+						<option value="1" th:selected="${form.flgRetirement == '1'}">1：退職</option>
+					</select>
+					<label for="password">パスワード（変更する場合のみ入力）</label>
+				</th:block>
+				<th:block th:unless="${admin}">
+					<p>※パスワードのみ変更できます。</p>
+					<label for="password">新しいパスワード（必須）</label>
+				</th:block>
+				<input type="password" id="password" name="password" maxlength="256" autocomplete="new-password">
+				<p><button type="submit">編集確認</button>
+					<a class="btn sub" th:href="@{/menu}">メニューへ戻る</a>
+				</p>
+			</form>
+		</div>
+	</main>
+</body>
+
+</html>
--- a/book-rent/src/main/resources/templates/fragments/header.html
+++ b/book-rent/src/main/resources/templates/fragments/header.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+
+<body>
+	<!-- ログイン後の全画面共通ヘッダー：右上にログイン者名とログアウト（要件定義書 7.1） -->
+	<header class="top" th:fragment="header">
+		<span>書籍貸出管理システム</span>
+		<span>
+			<span class="user" th:text="${session.loginUser.nmEmployee}">社員名</span>
+			<form th:action="@{/logout}" method="post"><button type="submit" class="sub">ログアウト</button></form>
+		</span>
+	</header>
+</body>
+
+</html>
--- a/book-rent/src/main/resources/templates/frament/header.html
+++ b/book-rent/src/main/resources/templates/frament/header.html
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="UTF-8">
-<title>Insert title here</title>
-</head>
-<body>
-
-</body>
-</html>
--- a/book-rent/src/main/resources/templates/lendingList.html
+++ b/book-rent/src/main/resources/templates/lendingList.html
@@ -0,0 +1,34 @@
+<!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>
+<div th:replace="~{fragments/header :: header}"></div>
+<main>
+  <h1>貸出中書籍一覧</h1>
+  <div class="error" th:if="${errorMessage}" th:text="${errorMessage}"></div>
+  <div class="error" th:each="e : ${errors}" th:text="${e}"></div>
+  <div class="card">
+    <p th:if="${#lists.isEmpty(list)}">貸出中の書籍はありません。</p>
+    <table th:unless="${#lists.isEmpty(list)}">
+      <thead><tr><th>申請ID</th><th>申請者名</th><th>書籍名</th><th>申請日</th><th>貸出日</th><th>返却予定日</th><th>操作</th></tr></thead>
+      <tbody>
+        <tr th:each="r : ${list}">
+          <td th:text="${r.idRequest}"></td>
+          <td th:text="${r.nmApplicant}"></td>
+          <td th:text="${r.nmBook}"></td>
+          <td th:text="${r.dateRequest}"></td>
+          <td th:text="${r.dateBorrow}"></td>
+          <td th:text="${r.dateScheduledReturn}"></td>
+          <td><a class="btn" th:href="@{/admin/lendings/{id}(id=${r.idRequest})}">返却</a></td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+  <p><a class="btn sub" th:href="@{/menu}">メニューに戻る</a></p>
+</main>
+</body>
+</html>
--- a/book-rent/src/main/resources/templates/loanApplyConfirm.html
+++ b/book-rent/src/main/resources/templates/loanApplyConfirm.html
@@ -0,0 +1,38 @@
+<!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>
+<div th:replace="~{fragments/header :: header}"></div>
+<main>
+  <h1>書籍貸出申請確認</h1>
+  <div class="card">
+    <table>
+      <tr><th>書籍名</th><td th:text="${book.nmBook}"></td></tr>
+      <tr><th>ISBN</th><td th:text="${book.isbn}"></td></tr>
+      <tr><th>出版社</th><td th:text="${book.publisher}"></td></tr>
+      <tr><th>特記事項</th><td th:text="${book.note}"></td></tr>
+    </table>
+    <table>
+      <tr><th>貸出日</th><td th:text="${dateBorrow}"></td></tr>
+      <tr><th>返却予定日</th><td th:text="${dateScheduledReturn}"></td></tr>
+    </table>
+    <form th:action="@{/loan/apply/execute}" method="post" style="display:inline">
+      <input type="hidden" name="idBook" th:value="${idBook}">
+      <input type="hidden" name="dateBorrow" th:value="${dateBorrow}">
+      <input type="hidden" name="dateScheduledReturn" th:value="${dateScheduledReturn}">
+      <button type="submit">申請</button>
+    </form>
+    <form th:action="@{/loan/apply/input}" method="post" style="display:inline">
+      <input type="hidden" name="idBook" th:value="${idBook}">
+      <input type="hidden" name="dateBorrow" th:value="${dateBorrow}">
+      <input type="hidden" name="dateScheduledReturn" th:value="${dateScheduledReturn}">
+      <button type="submit" class="sub">申請情報入力に戻る</button>
+    </form>
+  </div>
+</main>
+</body>
+</html>
--- a/book-rent/src/main/resources/templates/loanApplyInput.html
+++ b/book-rent/src/main/resources/templates/loanApplyInput.html
@@ -0,0 +1,33 @@
+<!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>
+<div th:replace="~{fragments/header :: header}"></div>
+<main>
+  <h1>書籍貸出申請</h1>
+  <div class="error" th:if="${errorMessage}" th:text="${errorMessage}"></div>
+  <div class="error" th:each="e : ${errors}" th:text="${e}"></div>
+  <div class="card">
+    <table>
+      <tr><th>書籍名</th><td th:text="${book.nmBook}"></td></tr>
+      <tr><th>ISBN</th><td th:text="${book.isbn}"></td></tr>
+      <tr><th>出版社</th><td th:text="${book.publisher}"></td></tr>
+      <tr><th>特記事項</th><td th:text="${book.note}"></td></tr>
+    </table>
+    <form th:action="@{/loan/apply/confirm}" method="post">
+      <input type="hidden" name="idBook" th:value="${idBook}">
+      <label for="dateBorrow">貸出日</label>
+      <input type="date" id="dateBorrow" name="dateBorrow" th:value="${dateBorrow}">
+      <label for="dateScheduledReturn">返却予定日</label>
+      <input type="date" id="dateScheduledReturn" name="dateScheduledReturn" th:value="${dateScheduledReturn}">
+      <p><button type="submit">申請確認</button>
+         <a class="btn sub" th:href="@{/books}">書籍一覧に戻る</a></p>
+    </form>
+  </div>
+</main>
+</body>
+</html>
--- a/book-rent/src/main/resources/templates/login.html
+++ b/book-rent/src/main/resources/templates/login.html
@@ -1,12 +1,12 @@
 <!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>
 	<main>
 		<h1>書籍貸出管理システム</h1>
@@ -24,43 +24,43 @@
 		</div>
 	</main>
 </body>
-
+ 
 </html>
-
+ 
 <!--<!DOCTYPE html>-->
 <!--<html xmlns:th="http://www.thymeleaf.org">-->
-
+ 
 <!--<head>-->
 <!--    <meta charset="UTF-8">-->
 <!--    <meta name="viewport" content="width=device-width, initial-scale=1.0">-->
-
+ 
 <!--     外部スクリプトの読み込み -->
 <!--    <script th:src="@{/js/common.js}"></script>-->
-
+ 
 <!--     CSSの読み込み -->
 <!--    <link rel="stylesheet" th:href="@{/css/all.css}" type="text/css">-->
 <!--    <link rel="stylesheet" th:href="@{/css/style.css}" type="text/css">-->
-
+ 
 <!--    <title>ログイン</title>-->
 <!--</head>-->
-
+ 
 <!--<body>-->
-
+ 
 <!--    <div class="loginContainer">-->
-
+ 
 <!--        <h1>ログイン</h1>-->
-
+ 
 <!--        <form th:action="@{/doLogin}"-->
 <!--              method="post"-->
 <!--              th:object="${loginInfoForm}">-->
-
+ 
 <!--             エラーメッセージ -->
 <!--            <div class="msgBox error"-->
 <!--                 th:if="${messageError != null}">-->
 <!--                <span class="error"-->
 <!--                      th:text="${messageError.message}"></span>-->
 <!--            </div>-->
-
+ 
 <!--            <table>-->
 <!--                 メールアドレス -->
 <!--                <tr>-->
@@ -75,7 +75,7 @@
 <!--                        />-->
 <!--                    </td>-->
 <!--                </tr>-->
-
+ 
 <!--                 パスワード -->
 <!--                <tr>-->
 <!--                    <th class="header">パスワード</th>-->
@@ -89,7 +89,7 @@
 <!--                        />-->
 <!--                    </td>-->
 <!--                </tr>-->
-
+ 
 <!--                 ボタン -->
 <!--                <tr>-->
 <!--                    <td class="btnArea" colspan="2">-->
@@ -97,7 +97,7 @@
 <!--                            type="submit"-->
 <!--                            value="ログイン"-->
 <!--                        />-->
-
+ 
 <!--                        <button-->
 <!--                            type="button"-->
 <!--                            onclick="clearInput()">-->
@@ -106,11 +106,11 @@
 <!--                    </td>-->
 <!--                </tr>-->
 <!--            </table>-->
-
+ 
 <!--        </form>-->
-
+ 
 <!--    </div>-->
-
+ 
 <!--     入力内容のリセット -->
 <!--    <script>-->
 <!--        function clearInput() {-->
@@ -118,6 +118,6 @@
 <!--            document.getElementById('password').value = '';-->
 <!--        }-->
 <!--    </script>-->
-
+ 
 <!--</body>-->
 <!--</html>-->
--- a/book-rent/src/main/resources/templates/menu.html
+++ b/book-rent/src/main/resources/templates/menu.html
@@ -1,28 +1,28 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org">
-
 <head>
-	<meta charset="UTF-8">
-	<title>メニュー</title>
-<!--	<link rel="stylesheet" th:href="@{/css/style.css}">-->
+  <meta charset="UTF-8">
+  <title>メニュー</title>
+  <link rel="stylesheet" th:href="@{/css/style.css}">
 </head>
-
 <body>
-	<div th:replace="~{fragments/header :: header}"></div>
-	<main>
-		<h1>メニュー</h1>
-		<div class="error" th:if="${errorMessage}" th:text="${errorMessage}"></div>
-		<div class="card menu">
-			<a class="btn" th:href="@{/books}">書籍一覧</a>
-			<!-- 管理者のみ（サーバー側でも /admin/** は管理者以外を拒否している） -->
-			<th:block th:if="${session.loginUser.admin}">
-				<a class="btn" th:href="@{/admin/applications}">書籍貸出申請一覧</a>
-				<a class="btn" th:href="@{/admin/lendings}">貸出中書籍一覧</a>
-				<a class="btn" th:href="@{/admin/employees/new}">社員登録</a>
-			</th:block>
-			<a class="btn" th:href="@{/employees/search}">社員編集</a>
-		</div>
-	</main>
+<div th:replace="~{fragments/header :: header}"></div>
+<main>
+  <h1>メニュー</h1>
+  <div class="error" th:if="${errorMessage}" th:text="${errorMessage}"></div>
+  <div class="card menu">
+    <a class="btn" th:href="@{/books}">書籍一覧</a>
+    <!-- 管理者のみ（サーバー側でも /admin/** は管理者以外を拒否している） -->
+    <th:block th:if="${session.loginUser.admin}">
+      <a class="btn" th:href="@{/admin/applications}">書籍貸出申請一覧</a>
+      <a class="btn" th:href="@{/admin/lendings}">貸出中書籍一覧</a>
+      <a class="btn" th:href="@{/admin/employees/new}">社員登録</a>
+    </th:block>
+    <a class="btn" th:href="@{/employees/search}">社員編集</a>
+  </div>
+</main>
 </body>
+</html>
+ 

-</html>
+ 
--- a/book-rent/src/main/resources/templates/returnComplete.html
+++ b/book-rent/src/main/resources/templates/returnComplete.html
@@ -0,0 +1,23 @@
+<!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>
+	<div th:replace="~{fragments/header :: header}"></div>
+	<main class="complete-container">
+	<h1>返却完了</h1>
+	<div class="info" th:text="${message} ?: '書籍の返却が完了しました。'"></div>
+
+	<p>
+		<a class="btn" th:href="@{/admin/lendings}">貸出中書籍一覧に戻る</a>
+		<a class="btn sub" th:href="@{/menu}">メニューに戻る</a>
+	</p>
+	</main>
+</body>
+
+</html>
--- a/book-rent/src/main/resources/templates/returnConfirm.html
+++ b/book-rent/src/main/resources/templates/returnConfirm.html
@@ -0,0 +1,31 @@
+<!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>
+<div th:replace="~{fragments/header :: header}"></div>
+<main>
+  <h1>書籍返却確認</h1>
+  <div class="error" th:if="${errorMessage}" th:text="${errorMessage}"></div>
+  <div class="error" th:each="e : ${errors}" th:text="${e}"></div>
+  <div class="card">
+    <table>
+      <tr><th>申請ID</th><td th:text="${r.idRequest}"></td></tr>
+      <tr><th>申請者名</th><td th:text="${r.nmApplicant}"></td></tr>
+      <tr><th>申請日</th><td th:text="${r.dateRequest}"></td></tr>
+      <tr><th>ISBN</th><td th:text="${r.isbn}"></td></tr>
+      <tr><th>書籍名</th><td th:text="${r.nmBook}"></td></tr>
+      <tr><th>出版社</th><td th:text="${r.publisher}"></td></tr>
+      <tr><th>特記事項</th><td th:text="${r.note}"></td></tr>
+      <tr><th>貸出日</th><td th:text="${r.dateBorrow}"></td></tr>
+      <tr><th>返却予定日</th><td th:text="${r.dateScheduledReturn}"></td></tr>
+    </table>
+  </div>
+  <form method="post" style="display:inline" th:action="@{/admin/lendings/{id}/return(id=${r.idRequest})}"><button type="submit">返却</button></form>
+  <a class="btn sub" th:href="@{/admin/lendings}">貸出中書籍一覧に戻る</a>
+</main>
+</body>
+</html>
--- a/book_rent/.gitattributes
+++ b/book_rent/.gitattributes
@@ -0,0 +1,2 @@
+/mvnw text eol=lf
+*.cmd text eol=crlf
--- a/book_rent/.gitignore
+++ b/book_rent/.gitignore
@@ -0,0 +1,33 @@
+HELP.md
+target/
+.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
--- a/book_rent/.mvn/wrapper/maven-wrapper.properties
+++ b/book_rent/.mvn/wrapper/maven-wrapper.properties
@@ -0,0 +1,3 @@
+wrapperVersion=3.3.4
+distributionType=only-script
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.10.0/apache-maven-3.10.0-bin.zip
--- a/book_rent/mvnw
+++ b/book_rent/mvnw
@@ -0,0 +1,295 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Apache Maven Wrapper startup batch script, version 3.3.4
+#
+# Optional ENV vars
+# -----------------
+#   JAVA_HOME - location of a JDK home dir, required when download maven via java source
+#   MVNW_REPOURL - repo url base for downloading maven distribution
+#   MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
+#   MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output
+# ----------------------------------------------------------------------------
+
+set -euf
+[ "${MVNW_VERBOSE-}" != debug ] || set -x
+
+# OS specific support.
+native_path() { printf %s\\n "$1"; }
+case "$(uname)" in
+CYGWIN* | MINGW*)
+  [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")"
+  native_path() { cygpath --path --windows "$1"; }
+  ;;
+esac
+
+# set JAVACMD and JAVACCMD
+set_java_home() {
+  # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched
+  if [ -n "${JAVA_HOME-}" ]; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ]; then
+      # IBM's JDK on AIX uses strange locations for the executables
+      JAVACMD="$JAVA_HOME/jre/sh/java"
+      JAVACCMD="$JAVA_HOME/jre/sh/javac"
+    else
+      JAVACMD="$JAVA_HOME/bin/java"
+      JAVACCMD="$JAVA_HOME/bin/javac"
+
+      if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then
+        echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2
+        echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2
+        return 1
+      fi
+    fi
+  else
+    JAVACMD="$(
+      'set' +e
+      'unset' -f command 2>/dev/null
+      'command' -v java
+    )" || :
+    JAVACCMD="$(
+      'set' +e
+      'unset' -f command 2>/dev/null
+      'command' -v javac
+    )" || :
+
+    if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then
+      echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2
+      return 1
+    fi
+  fi
+}
+
+# hash string like Java String::hashCode
+hash_string() {
+  str="${1:-}" h=0
+  while [ -n "$str" ]; do
+    char="${str%"${str#?}"}"
+    h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296))
+    str="${str#?}"
+  done
+  printf %x\\n $h
+}
+
+verbose() { :; }
+[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; }
+
+die() {
+  printf %s\\n "$1" >&2
+  exit 1
+}
+
+trim() {
+  # MWRAPPER-139:
+  #   Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds.
+  #   Needed for removing poorly interpreted newline sequences when running in more
+  #   exotic environments such as mingw bash on Windows.
+  printf "%s" "${1}" | tr -d '[:space:]'
+}
+
+scriptDir="$(dirname "$0")"
+scriptName="$(basename "$0")"
+
+# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties
+while IFS="=" read -r key value; do
+  case "${key-}" in
+  distributionUrl) distributionUrl=$(trim "${value-}") ;;
+  distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;;
+  esac
+done <"$scriptDir/.mvn/wrapper/maven-wrapper.properties"
+[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties"
+
+case "${distributionUrl##*/}" in
+maven-mvnd-*bin.*)
+  MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/
+  case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in
+  *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;;
+  :Darwin*x86_64) distributionPlatform=darwin-amd64 ;;
+  :Darwin*arm64) distributionPlatform=darwin-aarch64 ;;
+  :Linux*x86_64*) distributionPlatform=linux-amd64 ;;
+  *)
+    echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2
+    distributionPlatform=linux-amd64
+    ;;
+  esac
+  distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip"
+  ;;
+maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;;
+*) MVN_CMD="mvn${scriptName#mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;;
+esac
+
+# apply MVNW_REPOURL and calculate MAVEN_HOME
+# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
+[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}"
+distributionUrlName="${distributionUrl##*/}"
+distributionUrlNameMain="${distributionUrlName%.*}"
+distributionUrlNameMain="${distributionUrlNameMain%-bin}"
+MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}"
+MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")"
+
+exec_maven() {
+  unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || :
+  exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD"
+}
+
+if [ -d "$MAVEN_HOME" ]; then
+  verbose "found existing MAVEN_HOME at $MAVEN_HOME"
+  exec_maven "$@"
+fi
+
+case "${distributionUrl-}" in
+*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;;
+*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;;
+esac
+
+# prepare tmp dir
+if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then
+  clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; }
+  trap clean HUP INT TERM EXIT
+else
+  die "cannot create temp dir"
+fi
+
+mkdir -p -- "${MAVEN_HOME%/*}"
+
+# Download and Install Apache Maven
+verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
+verbose "Downloading from: $distributionUrl"
+verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
+
+# select .zip or .tar.gz
+if ! command -v unzip >/dev/null; then
+  distributionUrl="${distributionUrl%.zip}.tar.gz"
+  distributionUrlName="${distributionUrl##*/}"
+fi
+
+# verbose opt
+__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR=''
+[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v
+
+# normalize http auth
+case "${MVNW_PASSWORD:+has-password}" in
+'') MVNW_USERNAME='' MVNW_PASSWORD='' ;;
+has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;;
+esac
+
+if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then
+  verbose "Found wget ... using wget"
+  wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl"
+elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then
+  verbose "Found curl ... using curl"
+  curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl"
+elif set_java_home; then
+  verbose "Falling back to use Java to download"
+  javaSource="$TMP_DOWNLOAD_DIR/Downloader.java"
+  targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName"
+  cat >"$javaSource" <<-END
+	public class Downloader extends java.net.Authenticator
+	{
+	  protected java.net.PasswordAuthentication getPasswordAuthentication()
+	  {
+	    return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() );
+	  }
+	  public static void main( String[] args ) throws Exception
+	  {
+	    setDefault( new Downloader() );
+	    java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() );
+	  }
+	}
+	END
+  # For Cygwin/MinGW, switch paths to Windows format before running javac and java
+  verbose " - Compiling Downloader.java ..."
+  "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java"
+  verbose " - Running Downloader.java ..."
+  "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")"
+fi
+
+# If specified, validate the SHA-256 sum of the Maven distribution zip file
+if [ -n "${distributionSha256Sum-}" ]; then
+  distributionSha256Result=false
+  if [ "$MVN_CMD" = mvnd.sh ]; then
+    echo "Checksum validation is not supported for maven-mvnd." >&2
+    echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
+    exit 1
+  elif command -v sha256sum >/dev/null; then
+    if echo "$distributionSha256Sum  $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c - >/dev/null 2>&1; then
+      distributionSha256Result=true
+    fi
+  elif command -v shasum >/dev/null; then
+    if echo "$distributionSha256Sum  $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then
+      distributionSha256Result=true
+    fi
+  else
+    echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2
+    echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
+    exit 1
+  fi
+  if [ $distributionSha256Result = false ]; then
+    echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2
+    echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2
+    exit 1
+  fi
+fi
+
+# unzip and move
+if command -v unzip >/dev/null; then
+  unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip"
+else
+  tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar"
+fi
+
+# Find the actual extracted directory name (handles snapshots where filename != directory name)
+actualDistributionDir=""
+
+# First try the expected directory name (for regular distributions)
+if [ -d "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" ]; then
+  if [ -f "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/bin/$MVN_CMD" ]; then
+    actualDistributionDir="$distributionUrlNameMain"
+  fi
+fi
+
+# If not found, search for any directory with the Maven executable (for snapshots)
+if [ -z "$actualDistributionDir" ]; then
+  # enable globbing to iterate over items
+  set +f
+  for dir in "$TMP_DOWNLOAD_DIR"/*; do
+    if [ -d "$dir" ]; then
+      if [ -f "$dir/bin/$MVN_CMD" ]; then
+        actualDistributionDir="$(basename "$dir")"
+        break
+      fi
+    fi
+  done
+  set -f
+fi
+
+if [ -z "$actualDistributionDir" ]; then
+  verbose "Contents of $TMP_DOWNLOAD_DIR:"
+  verbose "$(ls -la "$TMP_DOWNLOAD_DIR")"
+  die "Could not find Maven distribution directory in extracted archive"
+fi
+
+verbose "Found extracted Maven distribution directory: $actualDistributionDir"
+printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$actualDistributionDir/mvnw.url"
+mv -- "$TMP_DOWNLOAD_DIR/$actualDistributionDir" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME"
+
+clean || :
+exec_maven "$@"
--- a/book_rent/mvnw.cmd
+++ b/book_rent/mvnw.cmd
@@ -0,0 +1,189 @@
+<# : batch portion
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements.  See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership.  The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License.  You may obtain a copy of the License at
+@REM
+@REM    http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied.  See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Apache Maven Wrapper startup batch script, version 3.3.4
+@REM
+@REM Optional ENV vars
+@REM   MVNW_REPOURL - repo url base for downloading maven distribution
+@REM   MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
+@REM   MVNW_VERBOSE - true: enable verbose log; others: silence the output
+@REM ----------------------------------------------------------------------------
+
+@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0)
+@SET __MVNW_CMD__=
+@SET __MVNW_ERROR__=
+@SET __MVNW_PSMODULEP_SAVE=%PSModulePath%
+@SET PSModulePath=
+@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @(
+  IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B)
+)
+@SET PSModulePath=%__MVNW_PSMODULEP_SAVE%
+@SET __MVNW_PSMODULEP_SAVE=
+@SET __MVNW_ARG0_NAME__=
+@SET MVNW_USERNAME=
+@SET MVNW_PASSWORD=
+@IF NOT "%__MVNW_CMD__%"=="" ("%__MVNW_CMD__%" %*)
+@echo Cannot start maven from wrapper >&2 && exit /b 1
+@GOTO :EOF
+: end batch / begin powershell #>
+
+$ErrorActionPreference = "Stop"
+if ($env:MVNW_VERBOSE -eq "true") {
+  $VerbosePreference = "Continue"
+}
+
+# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties
+$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl
+if (!$distributionUrl) {
+  Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties"
+}
+
+switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) {
+  "maven-mvnd-*" {
+    $USE_MVND = $true
+    $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip"
+    $MVN_CMD = "mvnd.cmd"
+    break
+  }
+  default {
+    $USE_MVND = $false
+    $MVN_CMD = $script -replace '^mvnw','mvn'
+    break
+  }
+}
+
+# apply MVNW_REPOURL and calculate MAVEN_HOME
+# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
+if ($env:MVNW_REPOURL) {
+  $MVNW_REPO_PATTERN = if ($USE_MVND -eq $False) { "/org/apache/maven/" } else { "/maven/mvnd/" }
+  $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace "^.*$MVNW_REPO_PATTERN",'')"
+}
+$distributionUrlName = $distributionUrl -replace '^.*/',''
+$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$',''
+
+$MAVEN_M2_PATH = "$HOME/.m2"
+if ($env:MAVEN_USER_HOME) {
+  $MAVEN_M2_PATH = "$env:MAVEN_USER_HOME"
+}
+
+if (-not (Test-Path -Path $MAVEN_M2_PATH)) {
+    New-Item -Path $MAVEN_M2_PATH -ItemType Directory | Out-Null
+}
+
+$MAVEN_WRAPPER_DISTS = $null
+if ((Get-Item $MAVEN_M2_PATH).Target[0] -eq $null) {
+  $MAVEN_WRAPPER_DISTS = "$MAVEN_M2_PATH/wrapper/dists"
+} else {
+  $MAVEN_WRAPPER_DISTS = (Get-Item $MAVEN_M2_PATH).Target[0] + "/wrapper/dists"
+}
+
+$MAVEN_HOME_PARENT = "$MAVEN_WRAPPER_DISTS/$distributionUrlNameMain"
+$MAVEN_HOME_NAME = ([System.Security.Cryptography.SHA256]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join ''
+$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME"
+
+if (Test-Path -Path "$MAVEN_HOME" -PathType Container) {
+  Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME"
+  Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
+  exit $?
+}
+
+if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) {
+  Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl"
+}
+
+# prepare tmp dir
+$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile
+$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir"
+$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null
+trap {
+  if ($TMP_DOWNLOAD_DIR.Exists) {
+    try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
+    catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
+  }
+}
+
+New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null
+
+# Download and Install Apache Maven
+Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
+Write-Verbose "Downloading from: $distributionUrl"
+Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
+
+$webclient = New-Object System.Net.WebClient
+if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) {
+  $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD)
+}
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null
+
+# If specified, validate the SHA-256 sum of the Maven distribution zip file
+$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum
+if ($distributionSha256Sum) {
+  if ($USE_MVND) {
+    Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties."
+  }
+  Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash
+  if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) {
+    Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property."
+  }
+}
+
+# unzip and move
+Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null
+
+# Find the actual extracted directory name (handles snapshots where filename != directory name)
+$actualDistributionDir = ""
+
+# First try the expected directory name (for regular distributions)
+$expectedPath = Join-Path "$TMP_DOWNLOAD_DIR" "$distributionUrlNameMain"
+$expectedMvnPath = Join-Path "$expectedPath" "bin/$MVN_CMD"
+if ((Test-Path -Path $expectedPath -PathType Container) -and (Test-Path -Path $expectedMvnPath -PathType Leaf)) {
+  $actualDistributionDir = $distributionUrlNameMain
+}
+
+# If not found, search for any directory with the Maven executable (for snapshots)
+if (!$actualDistributionDir) {
+  Get-ChildItem -Path "$TMP_DOWNLOAD_DIR" -Directory | ForEach-Object {
+    $testPath = Join-Path $_.FullName "bin/$MVN_CMD"
+    if (Test-Path -Path $testPath -PathType Leaf) {
+      $actualDistributionDir = $_.Name
+    }
+  }
+}
+
+if (!$actualDistributionDir) {
+  Write-Error "Could not find Maven distribution directory in extracted archive"
+}
+
+Write-Verbose "Found extracted Maven distribution directory: $actualDistributionDir"
+Rename-Item -Path "$TMP_DOWNLOAD_DIR/$actualDistributionDir" -NewName $MAVEN_HOME_NAME | Out-Null
+try {
+  Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null
+} catch {
+  if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) {
+    Write-Error "fail to move MAVEN_HOME"
+  }
+} finally {
+  try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
+  catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
+}
+
+Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
--- a/book_rent/pom.xml
+++ b/book_rent/pom.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>4.1.1</version>
+		<relativePath/> <!-- lookup parent from repository -->
+	</parent>
+	<groupId>com.example</groupId>
+	<artifactId>book_rent</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<packaging>war</packaging>
+	<name>book_rent</name>
+	<description/>
+	<url/>
+	<licenses>
+		<license/>
+	</licenses>
+	<developers>
+		<developer/>
+	</developers>
+	<scm>
+		<connection/>
+		<developerConnection/>
+		<tag/>
+		<url/>
+	</scm>
+	<properties>
+		<java.version>21</java.version>
+	</properties>
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-jpa</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-thymeleaf</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-validation</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-webmvc</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-devtools</artifactId>
+			<scope>runtime</scope>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>com.mysql</groupId>
+			<artifactId>mysql-connector-j</artifactId>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-tomcat</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-jpa-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-thymeleaf-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-validation-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-webmvc-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>default-compile</id>
+						<phase>compile</phase>
+						<goals>
+							<goal>compile</goal>
+						</goals>
+						<configuration>
+							<annotationProcessorPaths>
+								<path>
+									<groupId>org.projectlombok</groupId>
+									<artifactId>lombok</artifactId>
+								</path>
+							</annotationProcessorPaths>
+						</configuration>
+					</execution>
+					<execution>
+						<id>default-testCompile</id>
+						<phase>test-compile</phase>
+						<goals>
+							<goal>testCompile</goal>
+						</goals>
+						<configuration>
+							<annotationProcessorPaths>
+								<path>
+									<groupId>org.projectlombok</groupId>
+									<artifactId>lombok</artifactId>
+								</path>
+							</annotationProcessorPaths>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
--- a/book_rent/src/main/java/com/example/demo/BookRentApplication.java
+++ b/book_rent/src/main/java/com/example/demo/BookRentApplication.java
@@ -0,0 +1,13 @@
+package com.example.demo;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class BookRentApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(BookRentApplication.class, args);
+	}
+
+}
--- a/book_rent/src/main/java/com/example/demo/ServletInitializer.java
+++ b/book_rent/src/main/java/com/example/demo/ServletInitializer.java
@@ -0,0 +1,13 @@
+package com.example.demo;
+
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+
+public class ServletInitializer extends SpringBootServletInitializer {
+
+	@Override
+	protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
+		return application.sources(BookRentApplication.class);
+	}
+
+}
--- a/book_rent/src/main/resources/application.properties
+++ b/book_rent/src/main/resources/application.properties
@@ -0,0 +1,15 @@
+spring.application.name=book-rent
+# --- MySQL (CREATE DATABASE.sql で作成した book_manage) ---
+spring.datasource.url=jdbc:mysql://localhost:3306/book_manage?serverTimezone=Asia/Tokyo&characterEncoding=UTF-8
+spring.datasource.username=bookuser
+spring.datasource.password=Book2026
+ 
+# テーブルはSQLで作成済み。JPAでは変更しない
+spring.jpa.hibernate.ddl-auto=none
+spring.jpa.open-in-view=false
+spring.jpa.properties.hibernate.jdbc.time_zone=Asia/Tokyo
+ 
+spring.thymeleaf.cache=false
+server.servlet.session.timeout=30m
+
+
--- a/book_rent/src/test/java/com/example/demo/BookRentApplicationTests.java
+++ b/book_rent/src/test/java/com/example/demo/BookRentApplicationTests.java
@@ -0,0 +1,13 @@
+package com.example.demo;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+class BookRentApplicationTests {
+
+	@Test
+	void contextLoads() {
+	}
+
+}
Author	SHA1	Message	Date
m-shimizu	9c591c9ff2	登録確認ボタン_配置修正	2026-10-22 09:56:34 +09:00
t-eguchi	61e89fc36f	承認画面のレイアウト変更しました	2026-10-22 09:54:49 +09:00
h.hein	10182adc6d	layout Edit	2026-10-22 09:29:36 +09:00
m-shimizu	e73b98e76d	Merge branch 't-eguchi' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into m_shimizu	2026-10-21 16:27:14 +09:00
m-shimizu	b36bce38e1	FR-09	2026-10-21 16:26:55 +09:00
t-eguchi	da41c781df	レイアウト変更を行いました	2026-10-21 16:22:56 +09:00
h.hein	103acf1106	Merge branch 'm_shimizu' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into h-hein2	2026-10-21 14:28:51 +09:00
m-shimizu	7d5d038a9e	FR-09	2026-10-21 14:27:40 +09:00
h.hein	6f56164c13	Merge branch 'o-matsuda' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into h-hein2	2026-10-21 14:27:19 +09:00
o-matsuda	ce94b90bf1	Merge branch 'h-hein2' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into o-matsuda # Conflicts: # book-rent/src/main/resources/templates/employeeUpdateConfirm.html	2026-10-21 14:26:59 +09:00
h.hein	9db673abb8	Merge branch 't-eguchi' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into h-hein2	2026-10-21 10:51:51 +09:00
o-matsuda	abb1cda6bf	employeeupdate.html途中	2026-10-21 10:26:08 +09:00
h.hein	3e0be17cef	Employee Update Confirm	2026-10-21 10:22:00 +09:00
t-eguchi	b9036465f2	返却機能	2026-10-21 10:03:06 +09:00
m-shimizu	7362f58c4f	Merge branch 'h-hein2' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into m_shimizu	2026-10-21 10:02:58 +09:00
o-matsuda	9728e2a983	Merge branch 'h-hein2' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into o-matsuda	2026-10-21 10:02:29 +09:00
h.hein	8a0b53522b	Employee Controller	2026-10-21 10:02:14 +09:00
o-matsuda	fecf19636f	Merge branch 'h-hein2' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into o-matsuda	2026-10-21 09:40:01 +09:00
h.hein	b298aa01c3	書き出し中一覧に表示	2026-10-21 09:24:53 +09:00
t-eguchi	e5f3a3774a	お願いします	2026-10-20 16:38:00 +09:00
m-shimizu	9ef18e73ed	Merge branch 'm-ozawa' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into m_shimizu	2026-10-20 16:31:18 +09:00
o-matsuda	a17aa3ae93	Merge branch 'm-ozawa' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into o-matsuda	2026-10-20 16:29:51 +09:00
m_ozawa	879d7235e0	10/20 作業分	2026-10-20 16:10:51 +09:00
o-matsuda	40c08ea6b4	書籍登録のHTML途中	2026-10-20 16:10:36 +09:00
m-shimizu	45eff1634e	FR-09_全体反映なし	2026-10-20 16:10:15 +09:00
m-shimizu	136b18bfc7	FR-01	2026-10-20 16:08:03 +09:00
t-eguchi	3d5653418a	05番完了	2026-10-20 16:04:18 +09:00
o-matsuda	f87e6d60c9	Merge branch 'h-hein2' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into o-matsuda	2026-10-20 15:33:35 +09:00
m_ozawa	0754c4507e	mm	2026-10-20 15:27:39 +09:00
m_ozawa	ef71711641	s3	2026-10-20 15:24:01 +09:00
m_ozawa	6b2c08c031	2	2026-10-20 15:23:08 +09:00
t-eguchi	b6d24a3d05	Merge branch 'h-hein2' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into t-eguchi	2026-10-20 15:22:43 +09:00
h.hein	b128e92598	3 stept done	2026-10-20 15:22:39 +09:00
t-eguchi	6faaedaa95	コンフリクト解消	2026-10-20 15:22:30 +09:00
m_ozawa	1585457395	Merge branch 'h-hein2' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into m-ozawa	2026-10-20 15:03:26 +09:00
h.hein	3e1eb9f6bd	AdminloanController done	2026-10-20 14:59:58 +09:00
t-eguchi	b6ada277a2	途中	2026-10-20 14:59:26 +09:00
o-matsuda	3f304d8e12	Merge branch 'h-hein2' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into o-matsuda # Conflicts: # book-rent/src/main/java/com/example/demo/controller/AdminBookController.java	2026-10-20 14:36:00 +09:00
m-shimizu	9bba174df3	FR-01	2026-10-20 14:26:51 +09:00
o-matsuda	3e0f27f7c0	書籍登録コントローラ作成	2026-10-20 14:26:19 +09:00
m_ozawa	0566219226	Merge branch 'h-hein2' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into m-ozawa	2026-10-20 14:26:13 +09:00
m-shimizu	0bf7852ef9	FR-01	2026-10-20 14:25:38 +09:00
t-eguchi	b58a996e84	Merge branch 'h-hein2' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into t-eguchi	2026-10-20 14:24:38 +09:00
h.hein	a2a406dd8b	login done	2026-10-20 14:23:32 +09:00
m-shimizu	cbb6495741	FR-01	2026-10-20 13:22:30 +09:00
m-shimizu	c612e9dac3	FR-01_全体反映なし	2026-10-20 13:17:15 +09:00
m_ozawa	945d8a465a	Merge branch 'h-hein2' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into m-ozawa	2026-10-20 11:15:26 +09:00
m-shimizu	0d582fee5c	Merge branch 'h-hein2' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into m_shimizu	2026-10-20 11:15:01 +09:00
m-shimizu	4a01b85ae9	全体反映なし_FR-01	2026-10-20 10:44:04 +09:00
m-shimizu	013bb72439	LoginController_途中経過	2026-10-20 09:36:57 +09:00
m-shimizu	f647eb6ef2	Merge branch 'main' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into m_shimizu	2026-10-19 16:23:25 +09:00
m_ozawa	87cdd2ca48	Merge branch 'main' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into m-ozawa	2026-10-19 16:21:22 +09:00
m_ozawa	174f843618	bookList.html　途中	2026-10-19 16:21:10 +09:00
m-shimizu	48477829fd	Merge branch 'h-hein' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into m_shimizu	2026-10-19 15:34:11 +09:00
m-shimizu	44ed4b3120	FR-01_修正・追記①	2026-10-19 15:33:39 +09:00
h.hein	dc5f6494cf	Merge branch 'm_shimizu' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into h-hein	2026-10-19 14:26:11 +09:00
h.hein	67f88c89a1	Merge branch 't-eguchi' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into h-hein	2026-10-19 14:23:12 +09:00
h.hein	e238c6b223	error check	2026-10-19 14:12:31 +09:00
h.hein	63b7aba82a	Setet one	2026-10-19 13:53:05 +09:00