機能６のHTML（途中）

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

@@ -27,14 +27,14 @@ public class ApprovalConfirmController {
 	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
 
 	HttpSession httpSession;
-	ApprovalForm approvalform;
+	Request request;
 
 	@Autowired
 	public ApprovalConfirmController(
 			HttpSession httpSession,
-			ApprovalForm approvalform) {
+			Request request) {
 		this.httpSession = httpSession;
-		this.approvalform = approvalform;
+		this.request = request;
 	}
 
 	@ModelAttribute
@@ -48,7 +48,7 @@ public class ApprovalConfirmController {
 		try {
 
 			
-			return;
+			return a ;
 		} catch (Exception e) {
 			// ログイン情報の破棄
 			httpSession.invalidate();

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

@@ -0,0 +1,35 @@
+package com.example.demo.controller;
+
+import org.springframework.stereotype.Controller;
+
+@Controller
+public class LendingListController {
+	
+//	@GetMapping("/lendingList")
+//	public String show(Model model) {
+//		List<X> x = xservice.getX();
+//		model.addAttribute("Y", x);
+//		return "Y";
+//	}
+	
+	
+//	HttpSession session;
+//	
+//	@Autowired
+//	public SelectListController(HttpSession session) {
+//		this.session=session;
+//	}
+	
+//	@RequestMapping("/lendingList")
+//	public String lendList() {
+//		return "lendingList";
+//	}
+	
+//	@RequestMapping(value = lendingList, method = RequestMethod.POST)
+//	public String select( , Model model) {
+//		model.addAttribute(
+//				);
+//		return lendingList;
+//		
+//	}
+}

team1/src/main/java/com/example/demo/entity/EmployeeEntity.java

@@ -138,4 +138,4 @@ public class EmployeeEntity {
 //		getIdUpdate(),
 //		getDateUpdate());
 //}
-//}
+//}

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

@@ -0,0 +1,27 @@
+package com.example.demo.service;
+
+import javax.transaction.Transactional;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.example.demo.entity.EmployeeEntity;
+import com.example.demo.repository.Book_CollectionRepository;
+import com.example.demo.repository.Borrow_BooksRepository;
+
+@Service
+@Transactional
+public class LendingListService {
+
+	@Autowired
+	private Book_CollectionRepository collection;
+	@Autowired
+	private Borrow_BooksRepository borrow;
+	@Autowired
+	private EmployeeEntity employee;
+	
+	public List<table> getcollectionWithborrow(){
+		return collection;
+	}
+	
+}

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

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

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

@@ -0,0 +1,15 @@
+<!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>
+
+</body>
+</html>

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

@@ -0,0 +1,15 @@
+<!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>
+
+</body>
+</html>

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

@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+	
+<head>
+<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
+<title>貸出中書籍一覧</title>
+</head>
+
+<body>
+	<h1>
+		<div class="rightSection">
+			<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
+		</div>
+		<a href="menu">メニューに戻る</a>
+		<h1><span>検索結果</span></h1>
+	</h1>
+	<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="">
+			<td th:text="${.idRequest}"></td>
+			<td th:text="${.}"></td>
+			<td th:text="${.}"></td>
+			<td th:text="${.dateRequest}"></td>
+			<td th:text="${.dateBorrow}"></td>
+			<td th:text="${.dateScheduledReturn}"></td>
+			<td>
+				<form action="" method="post" style="display: inline;">
+					<input name="" th:value="${}" type="hidden">
+					<input type="submit" value="返却">
+				</form>
+			</td>
+	</tbody>
+</body>
+</html>