メニュー画面、申請一覧画面（池田さん）、貸出一覧画面

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

@@ -0,0 +1,49 @@
+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.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import com.example.demo.service.ReturnService;
+
+@Controller
+public class ApplicationListController{
+	
+	@Autowired
+	ReturnService returnService;
+	
+	public ApplicationListController(ReturnService returnService) {
+		this.returnService = returnService;
+	}
+	
+	//applicationListにアクセスしたときに実行されるメソッド
+	@RequestMapping(value = "/applicationList", method = RequestMethod.GET)
+	public String index(Model model) {
+		//サービスから一覧を取得し、getAwaitingApprovalListという名前でHTMLに渡す
+		model.addAttribute("applicationList", returnService.getAwaitingApprovalList());
+		return "applicationList";
+	}
+
+	//メニュー画面に戻るURLへMapping
+	@RequestMapping(value = "/menu", method = RequestMethod.GET)
+	public String menu() {
+		return "menu";
+	}
+	
+	//申請承認待ちページに遷移するためのMapping
+	@RequestMapping(value = "/returnApproval", method = RequestMethod.GET)
+	//返却確認ページにアクセスしたときに実行されるメソッド
+	public String returnApproval(
+			//URLから送られた申請IDを受け取る
+			@RequestParam("idRequest") Integer idRequest, Model model) {
+		//受け取った申請IDをidRequestという名前でModelに登録してHTMLに渡す
+		model.addAttribute("idRequest", idRequest);
+		//上記で渡すHTMLのURL
+		return "returnApproval";
+	}
+			
+	
+}
+ 

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

@@ -35,7 +35,7 @@ public class LendingListController {
 	public String menu() {
 		return "menu";
 	}
-
+	
 	//書籍返却ページに遷移
 	@RequestMapping(value = "/returnConfirm", method = RequestMethod.GET)
 	//返却確認ページにアクセスしたときに実行されるメソッド

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

@@ -14,7 +14,7 @@ public class MenuController {
 //	public String showmenu() {
 //		return "menu";
 //	}
-	
+
 	@GetMapping("/menu")
 	public String menu(HttpSession session, Model model) {
 		Character FlgAdmin = (Character) session.getAttribute("FlgAdmin");

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

@@ -38,7 +38,7 @@
 				</tr>
 			</thead>
 			<tbody>
-				<tr th:each="employeeInfoForm : ${employeeInfoFormList}">
+				<tr th:each="employeeInfoForm : ${applicationList}">
 					<td th:text="${employeeInfoForm.idRequest}"></td>
 					<td th:text="${employeeInfoForm.nmApplicant}"></td>
 					<td th:text="${employeeInfoForm.nmBook}"></td>
@@ -59,7 +59,7 @@
 		</table>
 	</th:block>
 
-	<th:block th:if="${employeeInfoFormList == null or employeeInfoFormList.size() == 0}">
+	<th:block th:if="${applicationList == null or borrowList.isEmpty()}">
 		<!-- 検索結果が0件の場合 -->
 		現在書籍貸出の申請はありません。
 	</th:block>

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

@@ -6,7 +6,7 @@
 	<title>貸出中書籍一覧</title>
 </head>
 
-<body>
+<body> 
 	<h1>
 		<div class="rightSection">
 			<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>

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

@@ -43,5 +43,4 @@
 	</div>
 </body>
 
-
 </html>