エラー修正

team1/pom.xml

@@ -43,7 +43,7 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-webmvc</artifactId>
 		</dependency>
-
+ 
 		<dependency>
 			<groupId>com.mysql</groupId>
 			<artifactId>mysql-connector-j</artifactId>
@@ -74,13 +74,8 @@
 			<artifactId>spring-boot-starter-webmvc-test</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>com.example</groupId>
-			<artifactId>HelloSpring</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
-		</dependency>
 	</dependencies>
-
+ 
 	<build>
 		<plugins>
 			<plugin>
@@ -125,5 +120,7 @@
 			</plugin>
 		</plugins>
 	</build>
-
+ 
 </project>
+ 
+ 

team1/src/main/java/com/example/demo/controller/ApprovalConfirmController.java

@@ -1,11 +1,64 @@
-package com.example.demo.controller;
+//package com.example.demo.controller;
-
+//
-import org.springframework.stereotype.Controller;
+//import java.util.logging.Level;
-
+//import java.util.logging.Logger;
-/**
+//
- * 書籍貸出承認確認用のコントローラ
+//import jakarta.servlet.http.HttpSession;
- */
+//
-@Controller
+//import org.springframework.beans.factory.annotation.Autowired;
-public class ApprovalConfirmController {
+//import org.springframework.stereotype.Controller;
-
+//import org.springframework.ui.Model;
-}
+//import org.springframework.web.bind.annotation.ModelAttribute;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RequestMethod;
+//
+//import com.example.demo.form.ApprovalForm;
+//
+///**
+// * 書籍貸出承認確認用のコントローラ
+// */
+//@Controller
+//public class ApprovalConfirmController {
+//
+//	// ログ出力用インスタンス
+//	private final static Logger LOGGER = Logger.getLogger(ApprovalConfirmController.class.getName());
+//
+//	// エラーメッセージ用の定数フィールド
+//	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
+//
+//	HttpSession httpSession;
+//	ApprovalForm approvalform;
+//
+//	@Autowired
+//	public ApprovalConfirmController(
+//			HttpSession httpSession,
+//			ApprovalForm approvalform) {
+//		this.httpSession = httpSession;
+//		this.approvalform = approvalform;
+//	}
+//
+//	@ModelAttribute
+//	public ApprovalForm approvalForm() {
+//		return new ApprovalForm();
+//	}
+//
+//	@RequestMapping(value = "/ApprovalConfirm", method = RequestMethod.POST)
+//	public String AprrvalForm(ApprovalForm ApprovalForm, Model model) {
+//		
+//		try {
+//
+//			
+//			return;
+//		} catch (Exception e) {
+//			// ログイン情報の破棄
+//			httpSession.invalidate();
+//
+//			e.printStackTrace();
+//
+//			// エラーログ出力
+//			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
+//			// エラー画面遷移
+//			return "error";
+//		}
+//	}
+//}

team1/src/main/java/com/example/demo/repository/Borrow_BooksRepository.java

@@ -1,5 +1,7 @@
 package com.example.demo.repository;
 
+import java.util.Optional;
+
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
@@ -8,4 +10,9 @@ import com.example.demo.entity.Borrow_booksEntity;
 @Repository
 public interface Borrow_BooksRepository extends JpaRepository<Borrow_booksEntity, Integer> {
 
+	/*
+	* 申請者IDで検索
+	* */
+	Optional<Borrow_booksEntity> findByIdApplicant(Integer idApplicant);
+
 }

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

@@ -1,5 +1,7 @@
 package com.example.demo.repository;
 
+import java.util.Optional;
+
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
@@ -7,5 +9,6 @@ import com.example.demo.entity.EmployeeEntity;
 
 @Repository
 public interface EmployeeRepository extends JpaRepository<EmployeeEntity, Integer> {
+	Optional<EmployeeEntity> findByMailAddressAndPassword(String mailAddress, String password);
 
 }

team1/src/main/java/com/example/demo/service/ApprovalBorrowBooks.java

@@ -1,5 +0,0 @@
-package com.example.demo.service;
-
-public interface ApprovalBorrowBooks {
-
-}

team1/src/main/java/com/example/demo/service/Impl/ApprovalBorrowBooksImpl.java

@@ -1,31 +1,31 @@
-package com.example.demo.service.Impl;
+//package com.example.demo.service.Impl;
-
+//
-import java.util.List;
+//import java.util.List;
-
+//
-import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
+//import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+//import org.springframework.transaction.annotation.Transactional;
-
+//
-import com.example.demo.repository.Borrow_BooksRepository;
+//import com.example.demo.repository.Borrow_BooksRepository;
-import com.example.demo.service.ApprovalBorrowBooks;
+//import com.example.demo.service.ApprovalBorrowBooks;
-
+//
-@Service
+//@Service
-@Transactional
+//@Transactional
-public class ApprovalBorrowBooksImpl implements ApprovalBorrowBooks {
+//public class ApprovalBorrowBooksImpl implements ApprovalBorrowBooks {
-
+//
-	Borrow_BooksRepository borrowbooksRepository;
+//	Borrow_BooksRepository borrowbooksRepository;
-
+//
-	@Autowired
+//	@Autowired
-	public ApprovalBorrowBooksImpl(Borrow_BooksRepository borrowbooksRepository) {
+//	public ApprovalBorrowBooksImpl(Borrow_BooksRepository borrowbooksRepository) {
-		this.borrowbooksRepository = borrowbooksRepository;
+//		this.borrowbooksRepository = borrowbooksRepository;
-	}
+//	}
-	
+//	
-	/* 申請情報から全件取得
+//	/* 申請情報から全件取得
-	 * @return 取得した情報すべて
+//	 * @return 取得した情報すべて
-	 */
+//	 */
-	public List<???> selectAll() {
+//	public List<???> selectAll() {
-		return ???Entity.create???List(???Repository.findAll());
+//		return ???Entity.create???List(???Repository.findAll());
-	}
+//	}
-	
+//	
-	
+//	
-}
+//}

team1/src/main/resources/templates/applicationList.html

@@ -0,0 +1,69 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+
+<head>
+    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
+    <!-- 外部のスクリプトファイルを読み込む -->
+    <script th:src="@{/js/common.js}"></script>
+    <!-- CSSの読み込み -->
+    <link rel="stylesheet" th:href="@{/css/all.css}">
+    <link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
+    <title>検索</title>
+</head>
+
+<body>
+    <div class="rightSection">
+        <button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
+    </div>
+
+<div class="header-spacing"></div>
+<a href="showMenu">メニューに戻る</a>
+
+<div class="header-spacing"></div>
+<h1><span>検索結果</span></h1>
+
+<div class="header-spacing"></div>
+<th:block th:if="${employeeInfoFormList != null and employeeInfoFormList.size() > 0}">
+    <!-- 検索結果が1件以上ある場合 -->
+    <table class="table-grid table-striped table-hover">
+        <thead>
+        <tr>
+            <th style="width: 100px;">申請ID</th>
+            <th style="width: 100px;">申請者名</th>
+            <th style="width: 100px;">書籍名</th>
+            <th style="width: 100px;">申請日</th>
+            <th style="width: 100px;">貸出日</th>
+            <th style="width: 100px;">返却予定日</th>
+            <th style="width: 100px;">操作</th>
+        </tr>
+        </thead>
+        <tbody>
+        <tr th:each="employeeInfoForm : ${employeeInfoFormList}">
+            <td th:text="${employeeInfoForm.idRequest}"></td>
+            <td th:text="${employeeInfoForm.nmApplicant}"></td>
+            <td th:text="${employeeInfoForm.nmBook}"></td>
+            <td th:text="${employeeInfoForm.dateRequest}"></td>
+            <td th:text="${employeeInfoForm.dateBorrow}"></td>
+            <td th:text="${employeeInfoForm.dateReturn}"></td>
+            <td th:text="${employeeInfoForm.dateRequest}"></td>
+			
+			
+						<td>
+							<form action="/approve" method="get">
+								<input name="idRequest" th:value="${employeeInfoForm.idRequest}" type="hidden">
+								<input type="submit" value="承認">
+							</form>
+						</td>
+        </tr>
+        </tbody>
+    </table>
+</th:block>
+
+<th:block th:if="${employeeInfoFormList == null or employeeInfoFormList.size() == 0}">
+    <!-- 検索結果が0件の場合 -->
+    現在書籍貸出の申請はありません。
+</th:block>
+
+</body>
+
+</html>