[ADD] 貸出中図書一覧の返却処理を追加しました。

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

@@ -6,55 +6,23 @@ 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
 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,6 +1,14 @@
 package com.example.demo.controller;
 
-//@Controller
+import org.springframework.stereotype.Controller;
-
+import org.springframework.web.bind.annotation.GetMapping;
 
+@Controller
+public class BookInsertConfirmController {
+	@GetMapping("/bookInsertConfirm")
+	public String bookInsertConfirm() {
+		return "bookInsertConfirm";
+		
+	}
 
+}

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

@@ -1,109 +1,13 @@
 package com.example.demo.controller;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.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")
-@Autowired
+		public String bookInsert() {
-private BookInsertService bookInsertService;
+			return "bookInsert";
-
+		
-@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,30 +1,13 @@
 package com.example.demo.controller;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.PostMapping;
-
-import com.example.demo.entity.Employee;
-import com.example.demo.repository.EmployeeRepository;
-
 @Controller
 public class BookLendController {
-
+		@PostMapping("/bookLend")
-	@Autowired
+		public String bookLend() {
-	private EmployeeRepository employeeRepository;
+			return "bookLend";
-
+		}
-	@PostMapping("/bookLend")
-	public String bookLend(Model model) {
-		return "bookLend";
-	}
 	
-	// 社員IDを取得してプルダウンに表示させる
-	@PostMapping("/bookLend/employeeId")
-	public String selectEmployeeId(Employee employee, Model model) {
-		model.addAttribute("employeeList", employeeRepository.findByEmployeeId(employee.getEmployeeId()));
-		model.addAttribute("bookLend", employee);
-		return "bookLend";
-	}
 
 }

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

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

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

@@ -5,8 +5,6 @@ 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;
@@ -30,9 +28,8 @@ public class AccountEntity {
 	@Column(name="login_info_id")
 	private Integer loginInfoId;
 	
-	@ManyToOne
+	@Column(name="employee_id")
-	@JoinColumn(name = "employee_id")
+	private Integer employeeId;
-	private Employee employee;
 	
 	@Column(name="password_hash")
 	private String passwordHash;

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

@@ -1,77 +0,0 @@
-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/form/BookForm.java

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

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

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

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

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

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

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

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

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

@@ -1,5 +1,7 @@
 package com.example.demo.repository;
 
+import java.util.List;
+
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
@@ -8,4 +10,6 @@ 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,20 +1,10 @@
 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

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

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

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

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

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

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

@@ -4,6 +4,7 @@ import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import com.example.demo.entity.BookLend;
 import com.example.demo.repository.BookLendRepository;
@@ -15,7 +16,19 @@ public class BookLendService {
 	private BookLendRepository bookLendRepository;
 
 	public List<BookLend> findAll() {
-		return bookLendRepository.findAll();
+		return bookLendRepository.findBybookStatus(1);
+		
+		
+	}
+	
+	@Transactional
+	public void regist(Integer lendId) {
+	
+		BookLend booklend = bookLendRepository.findById(lendId).orElse(null);
+		
+		booklend.setBookStatus(0); 
+
+		bookLendRepository.save(booklend);
 	}
 
-}
+}

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

@@ -0,0 +1,11 @@
+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,5 +1,6 @@
 package com.example.demo.service;
 
+
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -9,17 +10,26 @@ import com.example.demo.entity.Book;
 import com.example.demo.repository.BookRepository;
 
 @Service
-public class BookServiceImpl {
+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);
-	}
 
 }

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

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

src/main/resources/templates/book.html

@@ -8,58 +8,16 @@
 </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>
@@ -68,18 +26,18 @@
 						<th>カテゴリー名</th>
 						<th>サブカテゴリー名</th>
 						<th>保管場所</th>
-						<th th:if="${session.loginEmployee.adminFlag == 1}">本の状態</th>
+						<th>本の状態</th>
-						<th th:if="${session.loginEmployee.adminFlag == 1}">登録日時</th>
+						<th>登録日時</th>
-						<th th:if="${session.loginEmployee.adminFlag == 1}">更新日時</th>
+						<th>更新日時</th>
-						<th th:if="${session.loginEmployee.adminFlag == 1}">寄贈者</th>
+						<th>寄贈者</th>
-						<th>貸出状態</th>
+						<th>貸出状態??</th>
-						<th th:if="${session.loginEmployee.adminFlag == 1}">操作</th>
+						<th>操作??</th>
 					</tr>
 				</thead>
 
 				<tbody>
-					<tr th:each="book : ${book}" th:if="${book.bookManageId != null}">
+					<tr th:each="book : ${book}">
-
+						
 						<td th:text="*{book.bookManageId}"></td>
 						<td th:text="*{book.isbn}"></td>
 						<td th:text="*{book.title}"></td>
@@ -89,58 +47,54 @@
 						<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}"
+						<td th:text="*{book.condition}"></td>
-							 th:text="*{book.condition == 0 ? '分からない':
+						<td th:text="*{book.createdAt}"></td>
-									   book.condition == 1 ? '新品':
+						<td th:text="*{book.updatedAt}"></td>
-									   book.condition == 2 ? '良好':
+						<td th:text="*{book.employee != null ? book.employee.employeeId : '-'}"></td>
-									   book.condition == 3 ? '使用感あり':
+						<td th:text="*{book.bookLends != null ? book.bookLends.bookStatus : '-'}"></td>
-									   book.condition == 4 ? '痛みあり':
+						
-								       '不明'}">
+						
-						</td>
-						<td th:if="${session.loginEmployee.adminFlag == 1}" th:text="*{book.createdAt}"></td>
-						<td th:if="${session.loginEmployee.adminFlag == 1}" th:text="*{book.updatedAt}"></td>
-						<td th:if="${session.loginEmployee.adminFlag == 1}" 
-							th:text="*{book.employee != null ? book.employee.employeeName : '-'}"></td>
-						<td th:text="*{book.bookLends != null ? 
-							(book.bookLends.bookStatus == 0 ? '貸出可': '貸出不可') : '貸出可'}"></td>
 						
-						<td th:if="${session.loginEmployee.adminFlag == 1}">
-							
-							<form method="post" action="/bookLend">
-								<input type="hidden" name="bookManageId" th:value="*{book.bookManageId}">
-								<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>
+
+			<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>
+
+		<button type="submit" class="btn-login">
+			<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round"
+				stroke-linejoin="round">
+				<path d="M15 3h4a2 2 0 0 1 2 2v14a2 2 0 0 1-2 2h-4" />
+				<polyline points="10 17 15 12 10 7" />
+				<line x1="15" y1="12" x2="3" y2="12" />
+			</svg>
+			貸出
+		</button>
+		</form>
+
+		<form method="post" action="update">
+			<button type="submit" class="btn-login">
+				<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round"
+					stroke-linejoin="round">
+					<path d="M15 3h4a2 2 0 0 1 2 2v14a2 2 0 0 1-2 2h-4" />
+					<polyline points="10 17 15 12 10 7" />
+					<line x1="15" y1="12" x2="3" y2="12" />
+				</svg>
+				更新
+			</button>
+		</form>
+
+
 </body>
 
 </html>

src/main/resources/templates/bookInsert.html

@@ -8,108 +8,8 @@
 
 <body>
 	<h1>新規図書登録入力</h1>
-	       <br>
+	<form action="/bookInsertConfirm" method="GET">
-	<h4>新しく図書を登録します。必要事項を入力し、「登録」ボタンを押してください。</h4>
+	<input type="submit" value="確認画面へ" class="btn">
-	<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,6 +9,15 @@
 <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">
 
@@ -43,7 +52,6 @@
 					</button>
 
 				</form>
-				
 
 			</div>
 

src/main/resources/templates/bookLend.html

@@ -1,208 +1,32 @@
 <!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
+<html>
-
 <head>
-	<meta charset="UTF-8">
+<meta charset="UTF-8">
-	<title>図書貸出処理</title>
+<title>図書貸出処理</title>
 </head>
-
 <body>
+	図書貸出処理
+	<form id="loanForm"action="bookLendConfirmation" method="post">
+			<div class="button-area">
 
-	<h1>
+						<div class="right-buttons">
-		図書貸出処理
+							<button type="button" class="btn btn-primary"
-	</h1>
+								onclick="submitLoan()">貸出する</button>
+						</div>
+					</div>
 
-	<p>
+				</form>
-		以下の図書を貸出します。貸出先と貸出日・返却予定日を入力してください。
-	</p>
-
-	<h2>
-		図書情報
-	</h2>
-
-	<div class="card-body">
-		<table class="info-table">
-			<tr>
-				<th>
-					図書管理ID
-				</th>
-
-				<td>
-					（図書管理IDをここに表示させる）
-				</td>
-			</tr>
-
-			<tr>
-				<th>
-					図書タイトル
-				</th>
-
-				<td>
-					（タイトルをここに表示させる）
-				</td>
-			</tr>
-
-			<tr>
-				<th>
-					著者名
-				</th>
-
-				<td>
-					（著者名をここに表示させる）
-				</td>
-			</tr>
-
-			<tr>
-				<th>
-					ISBN
-				</th>
-
-				<td>
-					（ISBNをここに表示させる）
-				</td>
-			</tr>
-		</table>
-	</div>
-
-	<h2>
-		社員情報
-	</h2>
-
-	<div class="card">
-
-		<div class="form-row">
-
-			<label for="employeeSelect">
-				社員ID
-			</label>
-
-<!--			<select th:field="*{employeeId}" onchange="this.form.action='/bookLend/employeeId';this.form.submit();">-->
-
-			<select name="employeeId" id="employeeSelect">
 				
-				<option value="">
+				<script>
-					社員IDを選択してください
-				</option>
-
-<!--				<option th:each="employee : ${employeeList}" th:value="${employee.employeeId}">-->
-<!--				</option>-->
-
-				<option value="1">1</option>
-				<option value="2">2</option>
-				<option value="3">3</option>
-				<option value="4">4</option>
 				
-			</select>
+				function submitLoan() {
-		</div>
 
-		<div class="form-row">
+							if (confirm('この図書を貸出しますか？')) {
-			<label for="employeeName">
+								// OK選択時にフォーム送信を実行し、BookLendReturnControllerに処理を投げる
-				社員名
+								document.getElementById('loanForm').submit();
-			</label>
+							}
-
+						}
-			<input type="text" id="employeeName" value="" placeholder="社員名が表示されます" readonly>
+		</script>
-
-		</div>
-
-	</div>
-
-	<h2>
-		貸出・返却日入力
-	</h2>
-
-	<div class="date-section">
-
-		<div class="date-box">
-
-			<label>
-				貸出日(自動取得)
-			</label>
-
-			<input type="date" id="loanDate" name="loanDate" value="">
-
-			<div class="note">
-				※ 現在の日付が自動で設定されます。
-			</div>
-
-		</div>
-
-		<div class="date-box">
-
-			<label>
-				貸出期間日数
-			</label>
-
-			<input type="text" id="loanDays" placeholder="日数を入力してください">
-
-			<div class="note">
-				※ 数値（1以上）で入力してください。
-			</div>
-
-		</div>
-
-		<div class="date-box">
-
-			<label>
-				返却予定日（必須）
-			</label>
-
-			<input type="date" id="returnDate" name="returnDate">
-
-			<div class="note">
-				※ カレンダーから日付を選択してください。
-			</div>
-
-			<div class="error">
-				※ 現在の日付より前は選択できません。
-			</div>
-
-		</div>
-
-	</div>
-
-	<div class="warning-area">
-
-		<strong>
-			注意事項
-		</strong>
-
-		<ul>
-			<li>
-				貸出処理を行うと、対象の図書のステータスが「貸出中」に変更されます。
-			</li>
-
-			<li>
-				返却予定日を必ず指定してください。
-			</li>
-		</ul>
-
-	</div>
-
-	<form id="lendForm" action="bookLendConfirmation" method="post">
-		<div class="button-area">
-
-			<div class="right-buttons">
-				<button type="button" class="btn btn-primary" onclick="submitLend()">
-					貸出する
-				</button>
-			</div>
-
-		</div>
-
-	</form>
-
-	<script>
-
-		function submitLend() {
-
-			if (confirm('この図書を貸出しますか？')) {
-				// OK選択時にフォーム送信を実行し、BookLendReturnControllerに処理を投げる
-				document.getElementById('lendForm').submit();
-			}
-		}
-
-	</script>
 
 </body>
-
 </html>

src/main/resources/templates/bookLendResult.html

@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+
+<head>
+	<meta charset="UTF-8">
+	<title>貸出中図書、返却処理結果画面</title>
+	<link rel="stylesheet" th:href="@{/css/style.css}">
+</head>
+
+<body>
+	<h1>返却処理が完了しました。</h1>
+
+	<td>
+		<form th:action="@{/lendList}" method="get">
+			<button type="submit" th:value="貸出">貸出中図書一覧に戻る</button>
+	</td>
+	
+</body>
+
+</html>

src/main/resources/templates/lendList.html

@@ -10,69 +10,53 @@
 <body>
 	<h1>貸出中図書一覧</h1>
 
-	<!-- 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>
+
+				</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>
+						<form th:action="@{/return-book}" method="get">
+							<button type="submit" name="lendId" th:value="${booklist.lendId}"
+								onclick="return MoveCheck();">返却
+							</button>
+						</form>
+					</td>
+
+				</tr>
+				
+			</tbody>
 			
-		<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>
-
-	<!-- 以下ポップアップ -->
-	<div id="registerModal" class="modal-overlay">
-
-		<div class="modal">
-
-			<div class="modal-message">
-				返却処理が完了しました！
-			</div>
-
-			<div class="modal-buttons">
-
-				<!-- OK -->
-				<form method="get" action="/lendList">
-
-					<button type="submit" class="modal-btn">
-						OK
-					</button>
-
-				</form>
 
 
+		<script>
 
-			</div>
+			function MoveCheck() {
-
+				return window.confirm("返却処理を実行します。よろしいですか？");
-		</div>
+			}
-
-	</div>
 
+		</script>
 
 </body>