エラー修正

team1/pom.xml

@@ -122,3 +122,5 @@
 	</build>
  
 </project>
+ 
+ 

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

@@ -0,0 +1,64 @@
+//package com.example.demo.controller;
+//
+//import java.util.logging.Level;
+//import java.util.logging.Logger;
+//
+//import jakarta.servlet.http.HttpSession;
+//
+//import org.springframework.beans.factory.annotation.Autowired;
+//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/controller/SelectBookController.java

@@ -1,77 +0,0 @@
-package com.example.demo.controller;
-
-
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import jakarta.servlet.http.HttpSession;
-
-import org.springframework.beans.factory.annotation.Autowired;
-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.entity.Book_collectionEntity;
-import com.example.demo.form.SearchConditionBookForm;
-import com.example.demo.service.SearchBook;
-
-
-
-@Controller
-public class SelectBookController {
-	
-	// ログ出力用インスタンス
-	private final static Logger LOGGER = Logger.getLogger(SelectBookController.class.getName());
-	// エラーメッセージ用の定数フィールド
-	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
-	
-	HttpSession httpsession;
-    SearchBook searchBook;
-	
-    @Autowired
-	public SelectBookController(HttpSession httpSession, SearchBook searchBook) {
-		this.httpsession = httpSession;
-		this.searchBook = searchBook;
-	}
-	
-    //空の検索条件Form
-    @ModelAttribute
-    public SearchConditionBookForm searchConditionBookForm() {
-    	return new SearchConditionBookForm();
-    }
-    
-//     ① 書籍一覧の初期表示
-
-    @RequestMapping(value ="/selectBook", method = RequestMethod.GET)
-    public String select(Model model) {
-    	try {
-    		//貸出可能な書籍を全権取得する
-    		List<Book_collectionEntity> books = searchBook.selectAll();
-    		//検索結果をmodelに登録する
-    		model.addAttribute("books" , books);
-    		//書籍一覧画面を表示する
-    		return "book-search";
-    		
-    	}catch(Exception e) {
-    		//httpSessionを破棄
-    		httpsession.invalidate();
-    		//エラー内容を出力
-    		e.printStackTrace();
-    		//ログにエラーを記録
-    		LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-    		//エラー画面へ遷移
-    		return "error";
-    	}		
-    	}
-        // ② 検索ボタン押下時の処理
-
-    	 @RequestMapping(value ="/selectBook", method = RequestMethod.POST)
-    	 public String ) {
-    	 
-    
-
-//      }
-}

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

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

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

@@ -54,7 +54,7 @@ public class Borrow_booksEntity {
 	 * ステータス
 	 * */
 	@Column(name = "status", nullable = false, columnDefinition = "default 1")
-	private char status;
+	private Character status;
 
 	/*
 	 * 承認者

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

@@ -1,5 +1,141 @@
 package com.example.demo.entity;
 
-public class EmployeeEntity {
+import java.security.Timestamp;
 
+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 org.springframework.data.annotation.LastModifiedDate;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * EmployeeテーブルのEntity
+ */
+
+@Entity
+@Table(name = "employee")
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+
+public class EmployeeEntity {
+	/**
+	 * 社員ID
+	 */
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "id_employee", nullable = false)
+	private Integer idEmployee;
+
+	/**
+	 * 社員名
+	 */
+	@Column(name = "nm_employee", nullable = false, length = 50)
+	private String nmEmployee;
+
+	/**
+	 * 社員よみ
+	 */
+	@Column(name = "kn_employee", nullable = false, length = 100)
+	private String knEmployee;
+
+	/**
+	 * メールアドレス
+	 */
+	@Column(name = "mail_address", nullable = false, length = 256)
+	private String MailAddress;
+
+	/**
+	 * パスワード
+	 */
+	@Column(name = "password", nullable = false, length = 256)
+	private String Password;
+
+	/**
+	 * 管理者フラグ
+	 */
+	@Column(name = "flg_admin", nullable = false)
+	private Character FlgAdmin;
+
+	/**
+	 * 退職者フラグ
+	 */
+	@Column(name = "flg_retirement", nullable = false)
+	private Character FlgRetirement;
+
+	/**
+	 * 更新者
+	 */
+	@Column(name = "id_update", nullable = false)
+	private Integer idUpdate;
+
+	/**
+	 * 更新日
+	 */
+	@Column(name = "date_update", nullable = false)
+	@LastModifiedDate
+	private Timestamp dateUpdate;
 }
+
+//	public static EmployeeEntity convertForm(Employee employee) {
+//		return new EmployeeEntity(
+//				employee.getIdEmployee(),
+//				employee.getnmEmployee(),
+//				employee.getknEmployee(),
+//				employee.getMailAddress(),
+//				employee.getPassword(),
+//				employee.getFlgAdmin(),
+//				employee.getFlgRetirement(),
+//				employee.getIdUpdate(),
+//				employee.getDateUpdate());
+//
+//	}
+//
+//	public static EmployeeEntity convertFrom(SearchConditionEmployee searchConditionEmployee) {
+//		EmployeeEntity employeeEntity = new EmployeeEntity();
+//
+//		employeeEntity.setIdEmployee(searchConditionEmployee.getIdEmployee());
+//		employeeEntity.setNmEmployee(searchConditionEmployee.getNmEmployee());
+//		employeeEntity.setKnEmployee(searchConditionEmployee.getKnEmployee());
+//		employeeEntity.setMailAddress(searchConditionEmployee.getMailAddress());
+//
+//		return employeeEntity;
+//
+//	}
+//
+//	public static Employee createEmployee(EmployeeEntity employeeEntity) {
+//		return new Employee(
+//				employeeEntity.getIdEmployee(),
+//				employeeEntity.getNmEmployee(),
+//				employeeEntity.getKnEmployee(),
+//				employeeEntity.getMailAddress(),
+//				employeeEntity.getPassword(),
+//				employeeEntity.getFlgAdmin(),
+//				employeeEntity.getFlgRetirement(),
+//				employeeEntity.getIdUpdate(),
+//				employeeEntity.getDateUpdate());
+//	}
+//
+//	public static List<Employee> createEmployeeList(List<EmployeeEntity> employeeEntityList) {
+//		return employeeEntityList.stream().map(EmployeeEntity::createEmployee).toList();
+//	}
+//
+//	public LoginUser createLoginUser() {
+//		getIdEmployee(),
+//		getNmEmployee(),
+//		getKnEmployee(),
+//		getMailAddress(),
+//		getPassword(),
+//		getFlgAdmin(),
+//		getFlgRetirement(),
+//		getIdUpdate(),
+//		getDateUpdate());
+//}
+//}

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

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

team1/src/main/java/com/example/demo/form/SearchConditionBookForm.java

@@ -1,18 +0,0 @@
-package com.example.demo.form;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class SearchConditionBookForm {
-	//書籍名
-	private String nmBook;
-	//出版社
-	private String pubLisher;
-	//特記事項
-	private String noteText;
-
-}

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/Impl/ApprovalBorrowBooksImpl.java

@@ -0,0 +1,31 @@
+//package com.example.demo.service.Impl;
+//
+//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.repository.Borrow_BooksRepository;
+//import com.example.demo.service.ApprovalBorrowBooks;
+//
+//@Service
+//@Transactional
+//public class ApprovalBorrowBooksImpl implements ApprovalBorrowBooks {
+//
+//	Borrow_BooksRepository borrowbooksRepository;
+//
+//	@Autowired
+//	public ApprovalBorrowBooksImpl(Borrow_BooksRepository borrowbooksRepository) {
+//		this.borrowbooksRepository = borrowbooksRepository;
+//	}
+//	
+//	/* 申請情報から全件取得
+//	 * @return 取得した情報すべて
+//	 */
+//	public List<???> selectAll() {
+//		return ???Entity.create???List(???Repository.findAll());
+//	}
+//	
+//	
+//}

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

@@ -1,16 +0,0 @@
-package com.example.demo.service;
-
-import java.util.List;
-
-import com.example.demo.entity.Book_collectionEntity;
-import com.example.demo.form.SearchConditionBookForm;
-
-public interface SearchBook {
-	
-	//貸出可能な書籍を全件取得する
-	List<Book_collectionEntity> selectAll();
-	
-	//書籍名・出版社・特記事項を条件に検索する
-	List<Book_collectionEntity> searchByWithLike(SearchConditionBookForm form);
-
-}

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>

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

@@ -0,0 +1,141 @@
+<!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>
+	<h1>登録内容確認　　　
+	    <div class="rightSection">
+	        <span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
+	        <button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
+	    </div>
+	</h1>
+	<!-- 変数名は変更したが、中身は変更していない -->
+	<!-- ボタンや遷移も手を付けていない -->
+	<form action="insertEmployee"
+	      id="insertForm"
+	      method="post"
+	      th:object="${insertEmployeeForm}">
+
+	    <div class="msgBox error" th:if="${messageError != null}">
+	        <span class="error" th:each="message : ${messageError.message}" th:text="${message}"></span>
+	    </div>
+	    <table>
+	        <tr>
+	            <th class="header">申請ID</th>
+	            <td>
+	                <label>
+	                    <input class="readOnly"
+	                           name="idRquest"
+	                           readonly="readonly"
+	                           type="text"
+	                           value="自動で設定されます"/>
+	                </label>
+	            </td>
+	        </tr>
+	        <tr>
+	            <th class="header">申請者名</th>
+	            <td>
+	                <label>
+	                    <input class="readOnly"
+	                           name="nmEmployee"
+	                           readonly="readonly"
+	                           th:value="*{nmEmployee}"
+	                           type="text"/>
+	                </label>
+	            </td>
+	        </tr>
+	        <tr>
+	            <th class="header">申請日</th>
+	            <td>
+	                <label>
+	                    <input class="readOnly"
+	                           name="dataRequest"
+	                           readonly="readonly"
+	                           th:value="*{dataRequest}"
+	                           type="text"/>
+	                </label>
+	            </td>
+	        </tr>
+	        <tr>
+	            <th class="header">ISBN</th>
+	            <td>
+	                <label>
+	                    <input class="readOnly"
+	                           name="isBn"
+	                           readonly="readonly"
+	                           th:value="*{isBn}"
+	                           type="text"/>
+	                </label>
+	            </td>
+	        </tr>
+	        <tr>
+	            <th class="header">書籍名</th>
+	            <td>
+	                <label>
+	                    <input class="readOnly"
+	                           name="nmBook"
+	                           readonly="readonly"
+	                           th:value="*{nmBook}"
+	                           type="text"/>
+	                </label>
+	            </td>
+	        </tr>
+			<tr>
+	            <th class="header">出版社</th>
+	            <td>
+	                <label>
+	                    <input class="readOnly"
+	                           name="publisher"
+	                           readonly="readonly"
+	                           th:value="*{publisher}"
+		                          type="text"/>
+		               </label>
+		           </td>
+		       </tr>
+			   <tr>
+	               <th class="header">特記事項</th>
+	               <td>
+	                  <label>
+		                 <input class="readOnly"
+		                         name="note"
+	                         readonly="readonly"
+	                         th:value="*{note}"
+	                             type="text"/>
+	                   </label>
+	               </td>
+	           </tr>
+			   <tr>
+			        <th class="header">貸出日</th>
+			             <td>
+							<label>
+			              <input class="readOnly"
+			                      name="dateBorrow"
+			                  readonly="readonly"
+							  th:value="*{dateBorrow}"
+			                       type="text"/>
+			               </label>
+			             </td>
+			    </tr>
+			    <tr>
+			        <th class="header">返却予定日</th>
+			            <td>
+			                <label>
+			                       <input class="readOnly"
+			                              name="dateScheduledReturn"
+			                              readonly="readonly"
+			                              th:value="*{date_scheduled_return}"
+			                              type="text"/>
+			                 </label>
+			           </td>
+			    </tr>
+			</table>
+	</form>
+</body>
+</html>

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

@@ -1,72 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-	
-<head>
-     <meta charset="UTF-8">
-     <title>書籍一覧・検索</title>
-</head>
-
-<body>
-<!--ログアウトボタン-->
-<a href="@{/logout}">ログアウト</a>
-<h2>書籍一覧・検索</h2>
-<!--Controllerと@{/selectBook}合わせる-->
-     <form th:action ="@{/selectBook}" th:object = "${}"method="post">
-     
-	 <table>
-		        <!--	書籍名-->
-	 			<tr>
-	 				<th class="header">書籍名</th>
-	 				<td><input type="text" th:field="*{nmBook}"/></td>
-	 			</tr>
-				<!--	出版社-->
-	 			<tr>
-	 				<th class="header">出版社</th>
-	 				<td><input type="text" th:field="*{pubLisher}"></td>
-	 			</tr>
-				<!--	特記事項-->
-				<tr>
-					<th class="header">特記事項</th>
-   	 				<td><input type="text" th:field="*{noteText}"></td>
-				</tr>
-			
-	 				<button type="submit">検索</button>
-					</form>
-<!--					メニュー画面へ戻る-->
-                    <a th:href = "@{/menu}">メニューに戻る </a>
-	 				<h3>検索結果</h3>
-<!--					検索結果一覧-->
-	 			<table border="1">
-				<thead>
-				<tr>
-					<th>ISBN</th>
-					<th>書籍名</th>
-					<th>書籍名よみ</th>
-					<th>出版社</th>
-					<th>特記事項</th>
-					<th style="width: 150px;">操作</th">
-				</tr>
-				</thead>
-<!--				検索結果を表示-->
-            <tbody>
-<!--		booksのデータを1件ずつ取り出す-->
-             <td th:each="{book : ${books}}"></td>
-             <!--ISBN-->
-             <td th:each="{book.isbn}"></td>
-             <!--書籍名-->
-             <td th:each="{book.nmBook}"></td>
-             <!--書籍名よみ-->
-             <td th:each="{book.kmBook}"></td>
-             <!--出版社-->
-             <td th:each="{book.pubLisher}"></td>
-             <!--特記事項-->
-             <td th:each="{book.noteText}"></td>
-			 <td>
-<!--			管理者の場合は編集ボタン-->
-<!--一般ユーザーの場合は申請ボタン-->
-			 </td>
-			
-	 		</table>
-       </form>
-</body>
-</html>