[EDIT]:図書貸出機能実装

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

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

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

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

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

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

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

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

@@ -1,13 +1,52 @@
 package com.example.demo.controller;
 
+import java.time.LocalDate;
+
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import com.example.demo.service.BookLendService;
+import com.example.demo.service.BookServiceImpl;
+
+import lombok.RequiredArgsConstructor;
+
 @Controller
+@RequiredArgsConstructor
 public class BookLendController {
+
+	@Autowired
+	private final BookServiceImpl bookServiceImpl;
+	
+	@Autowired
+	private final BookLendService bookLendService;
+
 	@PostMapping("/bookLend")
-		public String welcome() {
+	public String bookLend(Model model) {
 		return "bookLend";
 	}
 
+	@PostMapping("/bookLend/{id}")
+	public String bookLend(@PathVariable int id, Model model) {
+		model.addAttribute("book", bookServiceImpl.findById(id));
+		return "bookLend";
+	}
+
+	// 貸出処理
+	@PostMapping("/bookLend/confirm")
+	public String bookLendConfirm(
+			@RequestParam(name = "bookId") int bookId,
+			@RequestParam(name = "bookManageId") String bookManageId,
+			@RequestParam(name = "employeeId") int employeeId,
+			@RequestParam(name = "returnDate") LocalDate bookReturnDate,
+			Model model) {
+
+		bookLendService.save(bookId,bookManageId,employeeId,bookReturnDate);
+		
+		return "redirect:/book";
+	}
 
 }

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

@@ -0,0 +1,13 @@
+package com.example.demo.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
+
+@Controller
+public class BookUpdateConfirmController {
+	
+	@PostMapping("/updateconfirm")
+	public String updateConfirm() {
+		return "updateconfirm";
+	}
+}

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

@@ -0,0 +1,19 @@
+package com.example.demo.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
+
+@Controller
+public class BookUpdateController {
+
+	@PostMapping("/update")
+	public String update() {
+		return "update";
+	}
+	
+	@PostMapping("/bookUpdate")
+	public String bookUpdate() {
+		return "book";
+	}
+	
+}

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

@@ -1,12 +1,30 @@
 package com.example.demo.controller;
 
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 
+import com.example.demo.entity.BookLend;
+import com.example.demo.service.BookLendService;
+
+
 @Controller
 public class LendListController {
+	
+	@Autowired
+	private BookLendService lendlistService;
+	
 	@GetMapping("/lendList")
-	public String lendList() {
+	public String list(Model model) {
+		
+		List<BookLend> aaa = lendlistService.findAll();
+		
+ 		// findAllを使って、DBから一覧を取得　でバックで取得したのを確認
+		model.addAttribute("list",lendlistService.findAll());
+		
 		return "lendList";
 		
 	}

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

@@ -1,22 +1,77 @@
 package com.example.demo.controller;
 
+import jakarta.servlet.http.HttpSession;
+import jakarta.validation.Valid;
+
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
 
+import com.example.demo.entity.AccountEntity;
+import com.example.demo.form.LoginForm;
+import com.example.demo.service.LoginService;
+
+import lombok.RequiredArgsConstructor;
+
 @Controller
+@RequiredArgsConstructor
 public class LoginController {
 
-    @GetMapping("/login")
-    public String showLogin() {
-        return "login";
+	private final LoginService loginService;
+
+	// Boot起動直後にログイン画面に移動する用のメソッド
+	@GetMapping("/")
+	public String index(HttpSession session) {
+		if (session.getAttribute("loginEmployee") != null) {
+			return "redirect:/topmenu";
+		}
+		return "redirect:/login";
 	}
 
-    @PostMapping("/doLogin")
-    public String doLogin() {
+	@GetMapping("/login")
+	public String loginForm(Model model, HttpSession session) {
+		if (session.getAttribute("loginEmployee") != null) {
 			return "redirect:/topmenu";
 		}
 
+		model.addAttribute("loginForm", new LoginForm());
+		return "login";
+	}
+
+	// 実際のログイン処理
+	@PostMapping("/login")
+	public String doLogin(
+			@Valid @ModelAttribute LoginForm loginForm,
+			BindingResult bindingResult,
+			Model model,
+			HttpSession session) {
+
+		if (bindingResult.hasErrors()) {
+			return "login";
+		}
+
+		AccountEntity accountEntity = loginService.login(loginForm);
+		if (accountEntity == null) {
+			model.addAttribute("loginError",
+					"ログインIDまたはパスワードが正しくありません");
+			return "login";
+		}
+
+		session.setAttribute("loginEmployee", accountEntity);
+		return "redirect:/topmenu";
+	}
+	
+	// ログアウト処理
+	@GetMapping("/logout")
+	public String logout(HttpSession session) {
+		session.invalidate();
+		return "redirect:/login";
+	}
+
+	// 各画面からトップメニューへの遷移用
 	@GetMapping("/topmenu")
 	public String showTopMenu() {
 		return "topmenu";

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

@@ -0,0 +1,43 @@
+package com.example.demo.entity;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+/*
+ * accountテーブル用のEntityクラス
+ * ログイン時やセッションでの管理者判別に使う
+ */
+
+@Entity
+@Table(name = "account")
+@Getter
+@Setter
+@NoArgsConstructor
+public class AccountEntity {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name="login_info_id")
+	private Integer loginInfoId;
+	
+	@ManyToOne
+	@JoinColumn(name = "employee_id")
+	private Employee employee;
+	
+	@Column(name="password_hash")
+	private String passwordHash;
+	
+	@Column(name="admin_flag")
+	private int adminFlag;
+	
+}

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

@@ -7,6 +7,9 @@ import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToOne;
 import jakarta.persistence.Table;
 
 import lombok.Data;
@@ -19,11 +22,11 @@ public class Book {
 	//図書ID
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
-	@Column(name = "book_Id", nullable = false)
+	@Column(name = "book_id", nullable = false)
 	private int bookId;
 
 	// 図書管理ID（BK-1など）
-	@Column(name = "book_manage_id", nullable = true)
+	@Column(name = "book_manage_id", nullable = true, unique = true)
 	private String bookManageId;
 
 	// タイトル
@@ -46,29 +49,16 @@ public class Book {
 	@Column(name = "publication_date", nullable = true)
 	private Date publicationDate;
 
-	// サブカテゴリーID
-	@Column(name = "book_subcategory_id", nullable = false)
-	private Integer subcategoryId;
+	// サブカテゴリーID!!
+	@ManyToOne
+	@JoinColumn(name = "book_subcategory_id", nullable = false)
+	private BookSubcategory bookSubcategory;
 
-	//	// カテゴリー名
-	//	@Column(name = "category_name", nullable = false)
-	//	private String categoryName;
-	//	
-	//	// サブカテゴリー名
-	//	@Column(name = "subcategory_name", nullable = false)
-	//	private String subcategoryName;
+	// 保管場所
+	@ManyToOne
+	@JoinColumn(name = "location_id", nullable = false)
+	private StorageLocation storageLocation;
 
-	// 保管場所ID
-	@Column(name = "location_id", nullable = false)
-	private Integer locationId;
-
-	//	// 保管場所
-	//	@Column(name = "location_name", nullable = false)
-	//	private String locationName;
-
-	//	// 貸出状態
-	//	@Column(name = "book_Id", nullable = false)
-	//	private int bookStatus;
 
 	// 本の状態
 	@Column(name = "condition_s", nullable = false)
@@ -86,17 +76,10 @@ public class Book {
 	@Column(name = "is_deleted", nullable = false)
 	private Integer isDeleted;
 
-	// 寄贈者社員ID
-	@Column(name = "donor_id", nullable = true)
-	private String donorId;
-
-	//	// 寄贈者社員名
-	//	@Column(name = "donor_name", nullable = true)
-	//	private String donorName;
-
-	//	//返却予定日
-	//	@Column(name = "return_date", nullable = false)
-	//	private Date returnDate;
+	// 寄贈者社員ID??
+	@ManyToOne
+	@JoinColumn(name = "donor_id", nullable = true)
+	private Employee employee;
 
 	//備考
 	@Column(name = "description", nullable = true)
@@ -106,4 +89,7 @@ public class Book {
 	@Column(name = "book_approval", nullable = false)
 	private Integer bookApproval;
 	
+	@OneToOne(mappedBy = "book")
+	private BookLend bookLends;
+	
 }

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

@@ -0,0 +1,80 @@
+package com.example.demo.entity;
+
+import java.time.LocalDate;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+
+import lombok.Data;
+
+/*
+ * 【JPAエンティティ】department テーブルの「1行」を表すJavaオブジェクト。
+ * JDBCではSQL結果を手動で詰め替えていたが、JPAは
+ * 「クラス⇔テーブル」「フィールド⇔カラム」の対応を書いておけば自動でやってくれる。
+ */
+
+@Data
+@Entity
+@Table(name = "book") // DBのテーブルに対応するエンティティであることを宣言
+public class BookApproval { // 対応テーブル名（クラス名と違うので明示）
+
+	/*
+	 * @Id             … 主キー（エンティティに必須）
+	 * @GeneratedValue … DB側で自動採番。IDENTITY = MySQLのAUTO_INCREMENTを使う
+	 * @Column(name)   … カラム名。フィールド名と違うので明示
+	 */
+	
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "book_id")
+    private Integer bookId;
+
+    @Column(name = "book_manage_id")
+    private String bookManageId;
+
+    @Column(name = "title")
+    private String title;
+
+    @Column(name = "isbn")
+    private String isbn;
+
+    @Column(name = "author")
+    private String author;
+
+    @Column(name = "publisher")
+    private String publisher;
+
+    @Column(name = "publication_date")
+    private LocalDate publicationDate;
+
+    @Column(name = "book_subcategory_id")
+    private Integer bookSubcategoryId;
+
+    @Column(name = "location_id")
+    private Integer locationId;
+
+    @Column(name = "condition_s")
+    private Integer conditionS;
+
+    @Column(name = "created_at")
+    private LocalDate createdAt;
+
+    @Column(name = "updated_at")
+    private LocalDate updatedAt;
+
+    @Column(name = "is_deleted")
+    private Integer isDeleted;
+
+    @Column(name = "donor_id")
+    private Integer donorId;
+
+    @Column(name = "description")
+    private String description;
+
+    @Column(name = "book_approval")
+    private Integer bookApproval;
+}

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

@@ -0,0 +1,28 @@
+package com.example.demo.entity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+
+import lombok.Data;
+
+@Entity
+@Data
+@Table(name="book_category")
+public class BookCategory {
+
+    @Id
+    @Column(name = "book_category_id")
+    private Integer bookCategoryId;
+
+    @Column(name = "book_category_name")
+    private String bookCategoryName;
+    
+    @OneToMany(mappedBy = "bookCategory")
+	private List<BookSubcategory> BookSubcategories = new ArrayList<>();
+}

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

@@ -0,0 +1,77 @@
+package com.example.demo.entity;
+import java.time.LocalDate;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
+import jakarta.validation.constraints.Pattern;
+
+import lombok.Data;
+
+@Entity  // このクラスがDBのテーブルに対応することを表す
+@Table(name = "book")
+@Data
+public class BookInsert {
+
+    @Id  // 主キー
+    @GeneratedValue(strategy = GenerationType.IDENTITY)  // 自動採番
+    @Column(name = "book_id")
+    private Integer bookId;
+    
+    @Column(name = "book_manage_id")
+    private String bookManageId;
+
+    @Column(name = "title")
+    private String title;
+    
+    @Pattern(regexp = "^(?=(?:.*-){4})[0-9-]{17}$",message = "ISBNは半角数字(13文字)とハイフン(4つ)を含めて入力してください")
+    @Column(name = "isbn")
+    private String isbn;
+    
+    @Column(name = "author")
+    private String author;
+    
+    @Column(name = "book_subcategory_id")
+    private Integer subcategory;
+    
+    @Column(name = "publisher")
+    private String publisher;
+    
+    @Column(name = "publication_date")
+    private LocalDate publicationDate;
+    
+    @Column(name = "location_id")
+    private Integer location;
+    
+    @Column(name = "condition_s")
+    private Integer condition;
+    
+    @Column(name = "donor_id")
+    private Integer donor;
+    
+    @Column(name = "description")
+    private String description;
+    
+    @Column(name = "created_at")
+    private LocalDate createdAt;
+
+    @Column(name = "updated_at")
+    private LocalDate updatedAt;
+
+    @Column(name = "is_deleted")
+    private Integer isDeleted;
+    
+    @Column(name = "book_approval")
+    private Integer bookApproval;
+  
+    @Transient 
+    private Integer bookCategoryId;
+    
+    
+    
+ 
+}

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

@@ -1,12 +1,15 @@
 package com.example.demo.entity;
 
-import java.sql.Date;
+import java.time.LocalDate;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToOne;
 import jakarta.persistence.Table;
 
 import lombok.Data;
@@ -22,20 +25,21 @@ public class BookLend {
 	private int lendId;
 
 	// 図書管理ID（BK-1など）
-	@Column(name = "book_manage_id", nullable = false)
-	private String bookManageId;
+	@OneToOne
+	@JoinColumn(name = "book_manage_id", referencedColumnName = "book_manage_id",nullable = false)
+	private Book book;
 
-	// 図書管理ID（BK-1など）
-	@Column(name = "employee_id", nullable = false)
-	private Integer employeeId;
+	@ManyToOne
+	@JoinColumn(name = "employee_id", nullable = false)
+	private Employee employeeBooklend;
 
 	// 貸出日
 	@Column(name = "book_lend_date", nullable = false)
-	private Date bookLendDate;
+	private LocalDate bookLendDate;
 
 	// 返却日
 	@Column(name = "book_return_date", nullable = false)
-	private Date bookReturnDate;
+	private LocalDate bookReturnDate;
 
 	// 貸出状態
 	@Column(name = "book_status", nullable = false)

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

@@ -0,0 +1,34 @@
+package com.example.demo.entity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+
+import lombok.Data;
+
+@Entity
+@Data
+@Table(name = "book_subcategory")
+public class BookSubcategory {
+	@Id
+	@Column(name = "book_subcategory_id")
+	private Integer bookSubcategoryId;
+
+	@ManyToOne
+	@JoinColumn(name = "book_category_id", nullable = false)
+	private BookCategory bookCategory;
+
+	@Column(name = "book_subcategory_name")
+	private String bookSubcategoryName;
+
+	@OneToMany(mappedBy = "bookSubcategory")
+	private List<Book> Books = new ArrayList<>();
+	
+}

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

@@ -1,10 +1,14 @@
 package com.example.demo.entity;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
 import jakarta.persistence.Table;
 
 import lombok.Data;
@@ -26,4 +30,11 @@ public class Employee {
 	//部署ID
 	@Column(name = "department_id", nullable = false)
 	private Integer departmentId;
+	
+	@OneToMany(mappedBy = "employee")
+	private List<Book> employees = new ArrayList<>();
+	
+	@OneToMany(mappedBy = "employeeBooklend")
+	private List<BookLend> employeesBooklend = new ArrayList<>();
+	
 }

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

@@ -0,0 +1,34 @@
+package com.example.demo.entity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+
+import lombok.Data;
+
+@Entity // このクラスがDBのテーブルに対応することを表す
+@Data
+@Table(name = "storage_location")
+public class StorageLocation {
+	//保管場所ID
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "location_id", nullable = false)
+	private int locationId;
+
+	// 保管場所名
+	@Column(name = "location_name", nullable = false)
+	private String locationName;
+	
+	@OneToMany(mappedBy = "storageLocation")
+	private List<Book> Location = new ArrayList<>();
+	
+
+}

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

@@ -0,0 +1,51 @@
+package com.example.demo.form;
+
+import java.time.LocalDate;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor //全フィールドを初期化するコンストラクタが生成
+@NoArgsConstructor //デフォルトコンストラクタを自動で生成
+public class BookApprovalForm {
+	
+	//社員ID
+	private String employeeId;
+	
+	//社員名
+	private String employeeName;
+	
+	//タイトル（必須）
+	@NotBlank(message = "タイトルは必須です")
+    private String title;
+
+	//著者名（必須）
+    @NotBlank(message = "著者名は必須です")
+    private String author;
+
+    //本の状態（必須）
+    @NotBlank(message = "本の状態は必須です")
+    private String bookCondition;
+    
+    //出版社（任意）
+    private String publisher;
+
+    //ISBN（任意）
+    private String isbn;
+
+    //出版日（任意）
+    private LocalDate publishDate;
+
+    //備考（任意）
+    //最大400文字
+    @Size(max = 400, message = "備考は400文字以内で入力してください")
+    private String remarks;
+
+}
+
+

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

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

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

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

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

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

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

@@ -0,0 +1,17 @@
+package com.example.demo.form;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+
+import lombok.Data;
+
+@Data
+public class LoginForm {
+
+	@NotNull(message = "社員IDを入力してください")
+	private Integer employeeId;
+
+	@NotBlank(message = "パスワードを入力してください")
+	private String passwordHash;
+
+}

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

@@ -0,0 +1,11 @@
+package com.example.demo.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import com.example.demo.entity.AccountEntity;
+
+public interface AccountRepository extends JpaRepository<AccountEntity,Integer>{
+	
+	AccountEntity findByEmployee_EmployeeId (Integer employeeId);
+
+}

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

@@ -0,0 +1,12 @@
+package com.example.demo.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import com.example.demo.entity.BookApproval;
+
+
+	@Repository
+	public interface BookApprovalRepository extends JpaRepository<BookApproval, Integer>{
+	}
+

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

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

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

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

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

@@ -0,0 +1,15 @@
+package com.example.demo.repository;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import com.example.demo.entity.BookLend;
+
+@Repository
+public interface BookLendRepository extends JpaRepository<BookLend, Integer> {
+
+	List<BookLend> findBybookStatus(Integer bookStatus);
+	
+}

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,61 @@
+package com.example.demo.service;
+
+import java.time.LocalDate;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.example.demo.entity.BookApproval;
+import com.example.demo.form.BookApprovalForm;
+import com.example.demo.repository.BookApprovalRepository;
+
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class BookApprovalService {
+
+	private final BookApprovalRepository bookApprovalRepository;
+
+	/*
+	 * 【登録(regist)】
+	 * @Transactional … このメソッドを1トランザクションで実行。途中で例外が出れば全ロールバック。
+	 *
+	 * Controllerから来る employee.department は new して departmentId だけ入れた「仮」オブジェクト。
+	 * JPAから見ると管理下にない(detached)状態なので、そのまま保存すると
+	 * 部署まで新規INSERTしようとするなど事故のもと。
+	 * → findById で「管理下(managed)の本物のDepartment」を取り直し、紐付けてから save する。
+	 *
+	 * save()：主キー(employeeId)がnullなのでINSERTになり、AUTO_INCREMENTのIDが採番される。
+	 */
+
+@Transactional
+ public void regist(BookApprovalForm bookApprovalForm) {
+
+	        BookApproval entity = new BookApproval();
+
+	        //必須こうもく
+	        entity.setTitle(bookApprovalForm.getTitle());
+	        entity.setAuthor(bookApprovalForm.getAuthor());
+
+	        //任意
+	        entity.setPublisher(bookApprovalForm.getPublisher());
+	        entity.setIsbn(bookApprovalForm.getIsbn());
+	        entity.setPublicationDate(bookApprovalForm.getPublishDate());
+	        entity.setDescription(bookApprovalForm.getRemarks());
+
+	        //本の状態
+	        entity.setConditionS(Integer.parseInt(bookApprovalForm.getBookCondition()));
+
+	        //寄贈者
+	        entity.setDonorId(Integer.parseInt(bookApprovalForm.getEmployeeId()));
+
+	       
+
+	        //登録日時
+	        entity.setCreatedAt(LocalDate.now());
+	        entity.setUpdatedAt(LocalDate.now());
+
+	        bookApprovalRepository.save(entity);
+	    }
+	}

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

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

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

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

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

@@ -0,0 +1,55 @@
+package com.example.demo.service;
+
+import java.time.LocalDate;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.example.demo.entity.Book;
+import com.example.demo.entity.BookLend;
+import com.example.demo.entity.Employee;
+import com.example.demo.repository.BookLendRepository;
+import com.example.demo.repository.BookRepository;
+import com.example.demo.repository.EmployeeRepository;
+
+@Service
+public class BookLendService {
+
+	@Autowired
+	private BookLendRepository bookLendRepository;
+	
+	@Autowired
+	private BookRepository bookRepository;
+	
+	@Autowired
+	private EmployeeRepository employeeRepository;
+
+	public List<BookLend> findAll() {
+		return bookLendRepository.findAll();
+	}
+
+	public void save(int bookId, String bookManageId, int employeeId,
+			LocalDate bookReturnDate) {
+
+		BookLend bookLend = new BookLend();
+		
+		
+		Book book = bookRepository.findById(bookId)
+		        .orElseThrow(
+		                () -> new IllegalArgumentException("対象の本が見つかりません"));
+		
+		Employee employee = employeeRepository.findById(employeeId)
+		        .orElseThrow(
+		                () -> new IllegalArgumentException("対象のが見つかりません"));
+
+		bookLend.setBook(book);
+		bookLend.setEmployeeBooklend(employee);
+		bookLend.setBookLendDate(LocalDate.now());
+		bookLend.setBookReturnDate(bookReturnDate);
+		bookLend.setBookStatus(1);
+
+		bookLendRepository.save(bookLend);
+	}
+
+}

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

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

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

@@ -1,35 +1,41 @@
 package com.example.demo.service;
 
-
 import java.util.List;
+import java.util.Optional;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
+import org.springframework.web.server.ResponseStatusException;
 
 import com.example.demo.entity.Book;
 import com.example.demo.repository.BookRepository;
 
+import lombok.RequiredArgsConstructor;
+
 @Service
-public class BookServiceImpl{
+@RequiredArgsConstructor
+public class BookServiceImpl {
 
 	@Autowired
 	private BookRepository bookRepository;
 
-//	@Override
-//	public String booklist(com.example.demo.entity.Book book) {
-//		Book booklist = new Book();
-//		booklist.setBookId(book.getBookId());
-//		
-//		return null;
-//	}
-	
-	
-
 	public List<Book> findAll() {
 		return bookRepository.findAll();
 	}
 
+	public List<Book> findBooks(String keyword) {
+		return bookRepository.searchBooks(keyword);
+	}
 
+	public Book findById(int bookId) {
+		Optional<Book> book = bookRepository.findById(bookId);
+		if (book.isEmpty()) {
+			throw new ResponseStatusException(
+					HttpStatus.NOT_FOUND, "図書情報が見つかりません");
+		}
 
+		return book.get();
+	}
 
 }

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

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

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

@@ -0,0 +1,31 @@
+package com.example.demo.service;
+
+import org.springframework.stereotype.Service;
+
+import com.example.demo.entity.AccountEntity;
+import com.example.demo.form.LoginForm;
+import com.example.demo.repository.AccountRepository;
+
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class LoginService {
+	
+	private final AccountRepository accountRepository;
+	
+	public AccountEntity login(LoginForm form) {
+		AccountEntity accountEntity = 
+				accountRepository.findByEmployee_EmployeeId(form.getEmployeeId());
+		
+		if(accountEntity == null) {
+			return null;
+		}
+		
+		if(!accountEntity.getPasswordHash().equals(form.getPasswordHash()))
+			return null;
+		
+		return accountEntity;
+	}
+
+}

src/main/resources/templates/book.html

@@ -8,69 +8,140 @@
 </head>
 
 <body>
+	
+	<div class="header-bar">
+
+			<div class="header-left">
+				ShareBooks
+			</div>
+
+			<div class="header-right">
+
+				<span class="user">
+					<span th:text="${session.loginEmployee.employee.employeeName}"></span>
+					(<span th:text="${session.loginEmployee.adminFlag == 1 ? '管理者' : '一般'}"></span>)
+				</span>
+
+				<a class="button-link" th:href="@{/logout}">
+					ログアウト
+				</a>
+
+			</div>
+
+		</div>
+		
 	<div class="container">
 		<h1>社内図書一覧</h1>
+
 		<div class="float-end">
+			<a th:href="@{/topmenu}">トップメニューへ</a>
 		</div>
-		<form method="get" action="bookLend">
+
+		<form class="input-group" th:action="@{/searchBooks}" th:object="${bookSearchForm}" method="get">
+
+			<input type="text" th:field="*{keyword}" class="form-control" placeholder="キーワードを入力">
+
+			<button class="btn btn-outline-success" type="submit">
+				検索
+			</button>
+
+		</form>
+
+		<form method="post" th:action="@{/clearBookList}">
+			<button class="button button-secondary" type="submit">
+				クリア
+			</button>
+		</form>
+
+		<p>※「タイトル」「出版社」「著者名」で検索</p>
+
 
 			<table class="table table-striped">
 				<thead>
 					<tr>
-						<th>図書ID</th>
+						<th>図書管理ID</th>
 						<th>ISBN</th>
-						<th>書籍名</th>
+						<th>タイトル</th>
 						<th>著者名</th>
 						<th>出版社</th>
 						<th>出版日</th>
 						<th>カテゴリー名</th>
 						<th>サブカテゴリー名</th>
 						<th>保管場所</th>
+						<th th:if="${session.loginEmployee.adminFlag == 1}">本の状態</th>
+						<th th:if="${session.loginEmployee.adminFlag == 1}">登録日時</th>
+						<th th:if="${session.loginEmployee.adminFlag == 1}">更新日時</th>
+						<th th:if="${session.loginEmployee.adminFlag == 1}">寄贈者</th>
 						<th>貸出状態</th>
-						<th>本の状態</th>
-						<th>備考</th>
-						<th>登録日時</th>
-						<th>更新日時</th>
-						<th>寄贈者</th>
-						<th>寄贈者</th>
-						<th>操作</th>
+						<th th:if="${session.loginEmployee.adminFlag == 1}">操作</th>
 					</tr>
 				</thead>
 
 				<tbody>
-					<tr th:each="b : ${book}">
-						<td th:text="*{b.bookId}"></td>
-						<td th:text="*{b.bookManageId}"></td>
-						<td th:text="*{b.title}"></td>
-						<td th:text="*{b.isbn}"></td>
-						<td th:text="*{b.author}"></td>
-						<td th:text="*{b.publisher}"></td>
-						<td th:text="*{b.publicationDate}"></td>
-						<td th:text="*{b.subcategoryId}"></td>
-						<td th:text="*{b.locationId}"></td>
-						<td th:text="*{b.condition}"></td>
-						<td th:text="*{b.createdAt}"></td>
-						<td th:text="*{b.updatedAt}"></td>
-						<td th:text="*{b.isDeleted}"></td>
-						<td th:text="*{b.donorId}"></td>
-						<td th:text="*{b.description}"></td>
-						<td th:text="*{b.bookApproval}"></td>
-					</tr>
-				</tbody>
-			</table>
+					<tr th:each="book : ${book}" th:if="${book.bookManageId != null}">
 
+						<td th:hidden="*{book.bookId}"></td>
+						<td th:text="*{book.bookManageId}"></td>
+						<td th:text="*{book.isbn}"></td>
+						<td th:text="*{book.title}"></td>
+						<td th:text="*{book.author}"></td>
+						<td th:text="*{book.publisher}"></td>
+						<td th:text="*{book.publicationDate}"></td>
+						<td th:text="*{book.bookSubcategory.bookCategory.bookCategoryName}"></td>
+						<td th:text="*{book.bookSubcategory.bookSubcategoryName}"></td>
+						<td th:text="*{book.storageLocation.locationName}"></td>
+						<td th:if="${session.loginEmployee.adminFlag == 1}"
+							 th:text="*{book.condition == 0 ? '分からない':
+									   book.condition == 1 ? '新品':
+									   book.condition == 2 ? '良好':
+									   book.condition == 3 ? '使用感あり':
+									   book.condition == 4 ? '痛みあり':
+								       '不明'}">
+						</td>
+						<td th:if="${session.loginEmployee.adminFlag == 1}" th:text="*{book.createdAt}"></td>
+						<td th:if="${session.loginEmployee.adminFlag == 1}" th:text="*{book.updatedAt}"></td>
+						<td th:if="${session.loginEmployee.adminFlag == 1}" 
+							th:text="*{book.employee != null ? book.employee.employeeName : '-'}"></td>
+						<td th:text="*{book.bookLends != null ? 
+							(book.bookLends.bookStatus == 0 ? '貸出可': '貸出不可') : '貸出可'}"></td>
 						
-			<button type="submit" class="btn-login">
-				<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round"
-					stroke-linejoin="round">
-					<path d="M15 3h4a2 2 0 0 1 2 2v14a2 2 0 0 1-2 2h-4" />
-					<polyline points="10 17 15 12 10 7" />
-					<line x1="15" y1="12" x2="3" y2="12" />
-				</svg>
+						<td th:if="${session.loginEmployee.adminFlag == 1}">
+							
+							<form method="post" th:action="@{/bookLend/{id}(id=${book.bookId})}">
+								<input type="hidden" name="id" th:value="*{book.bookId}">
+								<button type="submit"
+									th:disabled="*{book.bookLends != null && book.bookLends.bookStatus == 1}">
 									貸出
 								</button>
 							</form>
 							
+							<form method="post" action="/updateconfirm">
+								<input type="hidden" name="bookManageId" th:value="*{book.bookManageId}">
+								<button type="submit">
+									更新
+								</button>
+							</form>
+							
+							<form method="get" action="/delete">
+								<input type="hidden" name="bookManageId" th:value="*{book.bookManageId}">
+								<button type="submit">
+									削除
+								</button>
+							</form>
+							
+						</td>
+					</tr>
+
+					<tr th:if="${#lists.isEmpty(book)}">
+						<td colspan="15">
+							該当する図書がありません
+						</td>
+					</tr>
+					
+				</tbody>
+			</table>
+
+	</div>
 </body>
 
 </html>

src/main/resources/templates/bookApproval.html

@@ -7,638 +7,8 @@
 
 	<title>寄贈申請フォーム</title>
 
-	<style>
-		/* =========================
-   共通
-   ========================= */
-
-		* {
-			margin: 0;
-			padding: 0;
-			box-sizing: border-box;
-			font-family: "Yu Gothic", "Meiryo", sans-serif;
-		}
-
-		body {
-			background: #f5f7fa;
-			color: #333;
-		}
-
-
-		/* =========================
-   ヘッダー
-   ========================= */
-
-		.header {
-			height: 60px;
-			background: #fff;
-			border-bottom: 1px solid #e5e7eb;
-
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-
-			padding: 0 20px;
-		}
-
-		.logo {
-			font-size: 20px;
-			font-weight: bold;
-			color: #1b3768;
-		}
-
-		.header-right {
-			display: flex;
-			align-items: center;
-			gap: 8px;
-		}
-
-
-		/* =========================
-   通知
-   ========================= */
-
-		.notification {
-			position: relative;
-
-			display: flex;
-			align-items: center;
-			justify-content: center;
-
-			width: 36px;
-			height: 36px;
-
-			font-size: 18px;
-
-			cursor: pointer;
-			border-radius: 4px;
-
-			transition:
-				background-color 0.2s ease,
-				transform 0.2s ease;
-		}
-
-		.notification:hover {
-			background: #f0f4fa;
-			transform: translateY(-1px);
-		}
-
-		.notification-badge {
-			position: absolute;
-
-			top: 4px;
-			right: 4px;
-
-			width: 7px;
-			height: 7px;
-
-			background: #dc2626;
-			border-radius: 50%;
-
-			border: 1px solid #fff;
-		}
-
-
-		/* =========================
-   サインイン中アカウント
-   ========================= */
-
-		.account {
-			display: inline-flex;
-			align-items: center;
-
-			min-height: 36px;
-
-			padding: 8px 12px;
-
-			border-radius: 4px;
-
-			cursor: pointer;
-
-			color: #333;
-			background: transparent;
-
-			transition:
-				background-color 0.2s ease,
-				color 0.2s ease,
-				box-shadow 0.2s ease;
-		}
-
-		.account:hover {
-			background: #f0f4fa;
-			color: #1659d4;
-
-			box-shadow:
-				0 1px 4px rgba(0, 0, 0, 0.08);
-		}
-
-
-		/* =========================
-   ログアウト
-   ========================= */
-
-		.logout-btn {
-			padding: 8px 15px;
-
-			background: #fff;
-
-			border: 1px solid #d1d5db;
-			border-radius: 4px;
-
-			cursor: pointer;
-
-			color: #333;
-
-			transition:
-				background-color 0.2s ease,
-				border-color 0.2s ease,
-				color 0.2s ease,
-				box-shadow 0.2s ease;
-		}
-
-		.logout-btn:hover {
-			background: #f0f4fa;
-			border-color: #1659d4;
-			color: #1659d4;
-
-			box-shadow:
-				0 1px 4px rgba(22, 89, 212, 0.15);
-		}
-
-
-		/* =========================
-   レイアウト
-   ========================= */
-
-		.wrapper {
-			display: flex;
-			min-height: calc(100vh - 60px);
-		}
-
-
-		/* =========================
-   サイドメニュー
-   ========================= */
-
-		.sidebar {
-			width: 220px;
-
-			background: #002b66;
-			color: #fff;
-		}
-
-		.sidebar-title {
-			padding: 18px;
-
-			font-size: 13px;
-
-			border-bottom:
-				1px solid rgba(255, 255, 255, 0.1);
-		}
-
-		.menu {
-			list-style: none;
-		}
-
-		.menu li {
-			padding: 16px 20px;
-
-			cursor: pointer;
-
-			transition:
-				background-color 0.2s ease,
-				padding-left 0.2s ease;
-		}
-
-		.menu li:hover {
-			background: #0d477f;
-			padding-left: 24px;
-		}
-
-		.menu li.active {
-			background: #1158d8;
-
-			border-radius: 4px;
-
-			margin: 8px;
-		}
-
-		.menu li.active:hover {
-			background: #0d47b5;
-		}
-
-
-		/* =========================
-   メイン
-   ========================= */
-
-		.main {
-			flex: 1;
-			padding: 24px;
-
-			min-width: 0;
-		}
-
-		.breadcrumb {
-			font-size: 12px;
-			color: #64748b;
-
-			margin-bottom: 15px;
-		}
-
-		.page-title {
-			font-size: 38px;
-			color: #173a70;
-
-			margin-bottom: 10px;
-		}
-
-		.description {
-			font-size: 14px;
-
-			margin-bottom: 4px;
-		}
-
-		.required-note {
-			color: #d9534f;
-
-			font-size: 12px;
-
-			margin-bottom: 18px;
-		}
-
-
-		/* =========================
-   カード
-   ========================= */
-
-		.card {
-			background: #fff;
-
-			border: 1px solid #e5e7eb;
-
-			border-radius: 4px;
-		}
-
-		.card-body {
-			padding: 25px;
-		}
-
-		.section-title {
-			font-weight: bold;
-
-			margin-bottom: 15px;
-
-			color: #1f3a64;
-		}
-
-
-		/* =========================
-   フォーム
-   ========================= */
-
-		.form-grid {
-			display: flex;
-			flex-direction: column;
-
-			gap: 18px;
-		}
-
-		.form-group {
-			display: flex;
-			align-items: flex-start;
-		}
-
-		.form-group label {
-			width: 140px;
-
-			flex-shrink: 0;
-
-			font-size: 13px;
-			font-weight: bold;
-
-			padding-top: 10px;
-		}
-
-		.input-area {
-			flex: 1;
-
-			max-width: 700px;
-		}
-
-
-		/* =========================
-   必須・任意
-   ========================= */
-
-		.required {
-			color: #d9534f;
-			font-size: 11px;
-		}
-
-		.optional {
-			color: #555;
-			font-size: 11px;
-		}
-
-
-		/* =========================
-   入力欄
-   ========================= */
-
-		input[type="text"],
-		input[type="date"],
-		select,
-		textarea {
-			width: 100%;
-
-			border: 1px solid #d6dbe3;
-			border-radius: 4px;
-
-			padding: 10px;
-
-			font-size: 13px;
-
-			background: #fff;
-
-			transition:
-				border-color 0.2s ease,
-				box-shadow 0.2s ease;
-		}
-
-		input[type="text"]:focus,
-		input[type="date"]:focus,
-		select:focus,
-		textarea:focus {
-			outline: none;
-
-			border-color: #1659d4;
-
-			box-shadow:
-				0 0 0 2px rgba(22, 89, 212, 0.1);
-		}
-
-		input[readonly] {
-			background: #f3f4f6;
-		}
-
-		textarea {
-			resize: none;
-
-			height: 90px;
-		}
-
-
-		/* =========================
-   補足説明
-   ========================= */
-
-		.help {
-			font-size: 11px;
-
-			color: #6b7280;
-
-			margin-top: 4px;
-		}
-
-		.counter {
-			text-align: right;
-
-			font-size: 11px;
-
-			color: #888;
-
-			margin-top: 3px;
-		}
-
-
-		/* =========================
-   必須・任意項目の区切り
-   ========================= */
-
-		.optional-section {
-			margin-top: 25px;
-
-			padding-top: 22px;
-
-			border-top:
-				1px solid #e5e7eb;
-		}
-
-		.optional-section-title {
-			font-weight: bold;
-
-			color: #1f3a64;
-
-			margin-bottom: 15px;
-		}
-
-
-		/* =========================
-   ボタン
-   ========================= */
-
-		.button-area {
-			display: flex;
-
-			justify-content: space-between;
-			align-items: center;
-
-			margin-top: 20px;
-		}
-
-		.btn {
-			min-width: 120px;
-
-			padding: 10px 20px;
-
-			border-radius: 4px;
-
-			border: 1px solid #d1d5db;
-
-			background: #fff;
-			color: #333;
-
-			cursor: pointer;
-
-			font-weight: bold;
-
-			transition:
-				background-color 0.2s ease,
-				border-color 0.2s ease,
-				color 0.2s ease,
-				box-shadow 0.2s ease,
-				transform 0.2s ease;
-		}
-
-		.btn:hover {
-			background: #f0f4fa;
-
-			border-color: #1659d4;
-
-			color: #1659d4;
-
-			box-shadow:
-				0 2px 5px rgba(0, 0, 0, 0.08);
-
-			transform: translateY(-1px);
-		}
-
-		.btn:active {
-			transform: translateY(0);
-
-			box-shadow: none;
-		}
-
-
-		/* =========================
-   確認ボタン
-   ========================= */
-
-		.btn-primary {
-			background: #1158d8;
-
-			border: 1px solid #1158d8;
-
-			color: #fff;
-		}
-
-		.btn-primary:hover {
-			background: #0d47b5;
-
-			border-color: #0d47b5;
-
-			color: #fff;
-
-			box-shadow:
-				0 2px 6px rgba(17, 88, 216, 0.3);
-
-			transform: translateY(-1px);
-		}
-
-		.btn-primary:active {
-			background: #0b3d9c;
-
-			border-color: #0b3d9c;
-
-			transform: translateY(0);
-
-			box-shadow: none;
-		}
-
-		.right-btns {
-			display: flex;
-
-			gap: 12px;
-		}
-
-
-		/* =========================
-   フッター
-   ========================= */
-
-		.footer {
-			text-align: center;
-
-			margin-top: 25px;
-
-			font-size: 12px;
-
-			color: #666;
-		}
-
-
-		/* =========================
-   レスポンシブ
-   ========================= */
-
-		@media (max-width: 700px) {
-
-			.header {
-				padding: 0 12px;
-			}
-
-			.logo {
-				font-size: 16px;
-			}
-
-			.account {
-				display: none;
-			}
-
-			.sidebar {
-				width: 180px;
-			}
-
-			.main {
-				padding: 18px;
-			}
-
-			.page-title {
-				font-size: 30px;
-			}
-
-			.form-group {
-				flex-direction: column;
-			}
-
-			.form-group label {
-				width: 100%;
-
-				padding-top: 0;
-
-				margin-bottom: 6px;
-			}
-
-			.input-area {
-				width: 100%;
-
-				max-width: none;
-			}
-
-			.button-area {
-				flex-direction: column;
-
-				gap: 12px;
-
-				align-items: stretch;
-			}
-
-			.right-btns {
-				justify-content: flex-end;
-			}
-		}
-
-
-		@media (max-width: 480px) {
-
-			.sidebar {
-				display: none;
-			}
-
-			.main {
-				padding: 15px;
-			}
-
-			.page-title {
-				font-size: 25px;
-			}
-
-			.card-body {
-				padding: 18px;
-			}
-
-			.right-btns {
-				flex-direction: column;
-			}
-
-			.btn {
-				width: 100%;
-			}
-		}
-	</style>
-</head>
 	
+	</head>
 
 <body>
 

src/main/resources/templates/bookApprovalConfirm.html

@@ -822,20 +822,18 @@ textarea {
                 <div class="right-btns">
 
 					<button
-                        type="reset"
-                        class="btn">
+					    type="button"
+					    class="btn"
+					    onclick="location.href='/bookApproval'">
 
 					    修正
 
 					</button>
 
                     <button
-                        type="submit"
-                        class="btn btn-primary">
-
-                        確定
-
-                    </button>
+                        type="button"
+                        class="btn btn-primary"
+						onclick="CompleteModal()">申請送信</button>
 
                 </div>
 
@@ -852,5 +850,15 @@ textarea {
 
 </div>
 
+
+<script>
+
+function CompleteModal() { //関数定義
+    alert("申請が完了しました。");
+    location.href = "/bookApproval";
+}
+
+</script>
+
 </body>
 </html>

src/main/resources/templates/bookInsert.html

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

src/main/resources/templates/bookInsertConfirm.html

@@ -9,15 +9,6 @@
 <body>
 	<h1>登録内容確認</h1>
 
-	<!-- 戻る -->
-	<form action="/bookInsert" method="GET">
-		<input type="submit" value="戻る" class="btn">
-	</form>
-	<!-- 完了 -->
-	<form action="/book" method="GET">
-		<input type="submit" value="完了" class="btn">
-	</form>
-	<div id="registerModal" class="modal-overlay">
 
 		<div class="modal">
 
@@ -53,6 +44,7 @@
 
 				</form>
 				
+
 			</div>
 
 		</div>

src/main/resources/templates/bookLend.html

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

src/main/resources/templates/lendList.html

@@ -1,9 +1,10 @@
 <!DOCTYPE html>
-<html>
+<html xmlns:th="http://www.thymeleaf.org">
 
 <head>
 	<meta charset="UTF-8">
 	<title>貸出中図書一覧</title>
+	<link rel="stylesheet" th:href="@{/css/style.css}">
 </head>
 
 <body>
@@ -12,6 +13,36 @@
 	<!-- action先要修正 -->
 	<form action="/lendList" method="GET">
 		<input type="submit" value="返却" class="btn">
+
+
+		<table>
+			
+		<thead>
+			<tr>
+				<th>社員ID</th>
+				<th>社員名</th>
+				<th>管理ID</th>
+				<th>タイトル</th>
+				<th>返却予定日</th>
+				<th>超過日数</th>
+			</tr>
+		</thead>
+
+
+		<tbody>
+			<tr th:each="booklist : ${list}">
+
+				<td th:text="*{booklist.employeeBooklend.employeeId}"></td>
+				<td th:text="*{booklist.employeeBooklend.employeeName}"></td>
+				<td th:text="*{booklist.book.bookManageId}"></td>
+				<td th:text="*{booklist.book.title}"></td>
+				<td th:text="*{booklist.bookReturnDate}"></td>
+<!--				<td th:text="*{booklist.}"></td>-->
+			</tr>
+		</tbody>
+		</table>
+		
+		
 	</form>
 
 	<!-- 以下ポップアップ -->

src/main/resources/templates/login.html

@@ -1,29 +1,35 @@
 <!DOCTYPE html>
-<html>
+<html xmlns:th="http://www.thymeleaf.org">
+
 <head>
-<meta charset="UTF-8">
-<title>ログイン</title>
+	<meta charset="UTF-8">
+	<title>ログイン</title>
 </head>
+
 <body>
 
 	<h1>ログイン</h1>
-	<form action="doLogin"
-	      method="post"
-	      th:object="${loginInfoForm}">
 
-	    <div class="msgBox error" th:if="${messageError} != null">
-	        <span class="error" th:text="${messageError.message}"></span>
+	<p class="message message-error" th:if="${loginError}" th:text="${loginError}">
+	</p>
+
+	<form th:action="@{/login}" th:object="${loginForm}" method="post">
+		<div class="form-group">
+			<label for="employeeId">社員ID</label>
+			<input id="employeeId" type="text" th:field="*{employeeId}">
+			<p class="field-error" th:errors="*{employeeId}"></p>
 		</div>
 
-	    <table>
-	            <tr>
-	            <td class="btnArea" colspan="2">
-	                <input type="submit" value="ログイン"/>
-	                <button onclick="clearInput()">リセット</button>
-	            </td>
-	        </tr>
-	    </table>
+		<div class="form-group">
+			<label for="passwordHash">パスワード</label>
+			<input id="passwordHash" type="password" th:field="*{passwordHash}">
+			<p class="field-error" th:errors="*{passwordHash}"></p>
+		</div>
+
+		<input type="submit" value="ログイン">
+		<input type="reset" value="リセット">
 	</form>
 
 </body>
+
 </html>

src/main/resources/templates/topmenu.html

@@ -1,27 +1,50 @@
 <!DOCTYPE html>
 <html>
+
 <head>
-<meta charset="UTF-8">
-<title>トップメニュー</title>
+	<meta charset="UTF-8">
+	<title>トップメニュー</title>
 </head>
+
 <body>
+
+	<div class="header-bar">
+
+		<div class="header-left">
+			ShareBooks
+		</div>
+
+		<div class="header-right">
+
+			<span class="user">
+				テストユーザー（一般）
+			</span>
+
+			<a class="button-link" th:href="@{/logout}">
+				ログアウト
+			</a>
+
+		</div>
+
+
+	</div>
+
 	<h1>
 		メインメニュー
 	</h1>
 
 
 	<!-- ===== 共通：社内図書一覧 ===== -->
-		<form method="post" name="社内図書一覧" action="book">
-		    <a href="javascript:form1.submit()">リンク名</a>
-				<button type="submit" class="btn-book">
+
+	<a class="card" href="/book">
 
 		<h3>社内図書一覧</h3>
 
 		<p>
 			登録されている図書の<br> 一覧を表示します。
 		</p>
-				</button>
-		</form>
+	</a>
+
 	<hr> <!--区切り線-->
 
 	<!-- ===== 共通：寄贈申請 ===== -->
@@ -82,4 +105,5 @@
 	</a>
 
 </body>
+
 </html>

src/main/resources/templates/update.html

@@ -5,6 +5,13 @@
 <title>図書情報更新入力</title>
 </head>
 <body>
+	更新入力画面
 	
+	<form method="post" action="updateconfirm">
+		<button type="submit" class="btn-login">
+			 <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M15 3h4a2 2 0 0 1 2 2v14a2 2 0 0 1-2 2h-4"/><polyline points="10 17 15 12 10 7"/><line x1="15" y1="12" x2="3" y2="12"/></svg>
+				  更新内容確認
+		 </button>
+	</form>
 </body>
 </html>

src/main/resources/templates/updateConfirm.html

@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>更新内容確認</title>
+</head>
+<body>
+更新内容確認画面
+
+      <form method="post" action="update">
+		   <button type="submit" class="btn-login">
+               <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M15 3h4a2 2 0 0 1 2 2v14a2 2 0 0 1-2 2h-4"/><polyline points="10 17 15 12 10 7"/><line x1="15" y1="12" x2="3" y2="12"/></svg>
+				    戻る
+		   </button>
+	  </form>
+	  
+	  <form method="post" action="bookUpdate">
+	  	   <button type="submit" class="btn-login">
+	                <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M15 3h4a2 2 0 0 1 2 2v14a2 2 0 0 1-2 2h-4"/><polyline points="10 17 15 12 10 7"/><line x1="15" y1="12" x2="3" y2="12"/></svg>
+	  			    更新完了
+	  	   </button>
+	    </form>
+</body>
+</html>