LoginControllerとlogin.html 修正しました

# Conflicts:
#	team1/src/main/java/com/example/demo/controller/LoginController.java
#	team1/src/main/java/com/example/demo/controller/LogoutController.java
#	team1/src/main/java/com/example/demo/form/LoginUserForm.java
#	team1/src/main/java/com/example/demo/service/impl/Login.java

team1/pom.xml

@@ -74,6 +74,7 @@
 			<artifactId>spring-boot-starter-webmvc-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		
 	</dependencies>
  
 	<build>
@@ -122,3 +123,5 @@
 	</build>
  
 </project>
+ 
+ 

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

@@ -0,0 +1,56 @@
+package com.example.demo.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+/**
+ * 書籍貸出承認確認用のコントローラ
+ */
+@Controller
+public class ApprovalConfirmController {
+
+	// ログ出力用インスタンス
+//	private final static Logger LOGGER = Logger.getLogger(ApprovalConfirmController.class.getName());
+
+	// エラーメッセージ用の定数フィールド
+//	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
+
+//	HttpSession httpSession;
+//	Request request;
+//
+//	@Autowired
+//	public ApprovalConfirmController(
+//			HttpSession httpSession,
+//			Request request) {
+//		this.httpSession = httpSession;
+//		this.request = request;
+//	}
+//
+//	@ModelAttribute
+//	public ApprovalForm approvalForm() {
+//		return new ApprovalForm();
+//	}
+
+	@RequestMapping(value = "/approvalConfirm", method = RequestMethod.POST)
+	public String AprrvalForm() {
+		
+		System.out.println("a");
+		return "bookList";
+//		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/ApprovalConfirmResultController.java

@@ -0,0 +1,11 @@
+package com.example.demo.controller;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * 書籍貸出完了・却下処理用のコントローラ
+ */
+@Controller
+public class ApprovalConfirmResultController {
+
+}

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

@@ -0,0 +1,161 @@
+package com.example.demo.controller;
+
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.validation.BindingResult;
+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.form.LendingForm;
+
+@Controller
+public class LendingController {
+
+	//(仮記入)まとめられたserviceクラスを入れる準備
+	//private final LendingService lendingService;
+
+	//(仮記入)アノテーションを使用してコンストラクタにインスタンスを代入する
+	//@Autowired
+	//public LendingController(LendingService lendingService) {
+	//this.LendingService lendingService;
+	//}
+
+	/**
+	 * 【画面1】書籍貸出申請入力画面を表示する
+	 */
+	@GetMapping("/requestLending")
+	public String showLendingForm(Model model) {
+		LendingForm form = new LendingForm();
+
+		//以下ダミーデータを挿入中
+		form.setId_book(1);
+		form.setNm_book("これからはじめるJava言語");
+		model.addAttribute("lendingForm", form);
+		return "application";
+
+		//(仮記入)書籍一覧画面(bookList.html)からの情報取得の処理
+
+		//@GetMapping("/requestLending")
+		//		public String showLendingForm(
+		// 書籍一覧から送られてくる蔵書ID
+		// @RequestParam("idBook") int idBook,      
+		// 書籍一覧から送られてくる書籍名			
+		//@RequestParam("nmBook") String nmBook, 
+		//				Model model) {
+		//			
+		//			LendingForm form = new LendingForm();
+		//			
+		//前の画面（bookList）から貰ったデータの移し替え
+		//			form.setIdBook(idBook);
+		//			form.setNmBook(nmBook);
+		//			
+		//次の画面（application.html）へ渡す
+		//			model.addAttribute("lendingForm", form);
+		//			return "application";
+	}
+
+	/**
+	 * 申請画面から確認画面へ進む
+	 */
+	//@PostMappingでデータを送信(POST)
+	@PostMapping("/confirmLending")
+	public String confirmLending(@ModelAttribute("lendingForm") LendingForm form,
+			//インタフェースBindingResultにて入力結果を表す
+			BindingResult result,
+			Model model) {
+
+		//日付チェック
+		List<String> errorList = validateParameter(form);
+
+		// エラーが1つでもある場合入力画面に戻す
+		if (!errorList.isEmpty()) {
+			model.addAttribute("errors", errorList);
+			return "application"; // 入力画面に戻す
+		}
+
+		return "applicationConfirm";
+	}
+
+	/**
+	 * 
+	 * 確認画面の「申請情報入力に戻る」文字を押すとリンクさせた入力画面へ戻る処理
+	 */
+	//@PostMappingで確認画面のデータ（hidden）を持ったまま送信(POST)
+	@PostMapping("/backToRequest")
+	public String backToRequest(@ModelAttribute("lendingForm") LendingForm form, Model model) {
+		// 確認画面に隠されていたデータを、もう一度トレイ（Model）に載せて引き継ぐ
+		model.addAttribute("lendingForm", form);
+		// 1番目の入力画面「application.html」を表示して戻す（日付が残る！）
+		return "application";
+	}
+
+	/**
+	 * 確認画面の「申請」ボタンを押して完了画面へ遷移
+	 */
+	//@PostMappingでデータを送信(POST)
+	@PostMapping("/executeLending")
+	public String executeLending(@ModelAttribute("lendingForm") LendingForm form) {
+		//redirect記載で完了画面のURLへ接続し直す
+		return "redirect:/lendingComplete";
+	}
+
+	//（仮記入）まとめられたserviceクラスの呼び出し
+	//lendingService.executeLending(form);
+	//redirectメソッドにて次画面である完了画面のURLへ接続し直す
+	//return "redirect:/lendingComplete";
+
+	/**
+	 * 書籍貸出申請完了画面を表示する
+	 */
+	//@GetMappingでデータをもらう
+	@GetMapping("/lendingComplete")
+	public String showCompletePage() {
+		return "applicationComplete";
+	}
+
+	//isNullメソッドを作り、未入力になってないか入力チェックを行う
+	/**
+	 * 日付用の null 判定メソッド
+	 */
+	private static boolean isNull(LocalDate date) {
+		return null == date;
+	}
+
+	//画面でエラーが出た場合の表示
+	//エラーが出た場合、リストに文言を追加する
+	public List<String> validateParameter(LendingForm form) {
+		final String DATE_BORROW_NULL = "貸出日 が未入力です。";
+		final String DATE_RETURN_NULL = "返却予定日 が未入力です。";
+		final String DATE_ORDER_ERROR = "返却予定日 には、貸出日以降の日付を選択してください。";
+
+		List<String> error = new ArrayList<>();
+
+		// 1.「貸出日」が未入力（null）かどうかをチェックする
+		if (form.getDate_borrow() == null) {
+			//errorリストの中にメッセージ"貸出日が未入力です"を入れる
+			error.add(DATE_BORROW_NULL);
+		}
+
+		// 2.「返却予定日」が未入力（null）かどうかをチェック
+		if (form.getDate_scheduled_return() == null) {
+			//errorリストの中にメッセージ"返却予定日 が未入力です。"を入れる
+			error.add(DATE_RETURN_NULL);
+		}
+
+		// 3「両方ともnullではない（入力されている）」ときのみ日付の前後を比較する
+		if (form.getDate_borrow() != null && form.getDate_scheduled_return() != null) {
+			// 返却予定日が貸出日より過去の場合のエラー
+			if (form.getDate_scheduled_return().isBefore(form.getDate_borrow())) {
+				//errorリストの中にメッセージ"返却予定日 には、貸出日以降の日付を選択してください。"を入れる
+				error.add(DATE_ORDER_ERROR);
+			}
+		}
+
+		return error;
+	}
+}

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

@@ -0,0 +1,64 @@
+package com.example.demo.controller;
+
+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.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+
+import com.example.demo.form.LoginInfoForm;
+import com.example.demo.form.LoginUserForm;
+import com.example.demo.form.MessageForm;
+import com.example.demo.service.ReturnService;
+
+@Controller
+public class LoginController {
+
+	// // ログ出力用インスタンス
+	private static final Logger LOGGER = Logger.getLogger(LoginController.class.getName());
+
+	@Autowired
+	ReturnService service;
+
+	@GetMapping("/login")
+	public String view(Model model) {
+		model.addAttribute("loginInfoForm",new LoginInfoForm());
+		return "login";
+	}
+
+	// ログインボタンが押されたときの処理
+	@PostMapping("/doLogin")
+	public String doLogin(LoginInfoForm form, HttpSession session, Model model) {
+
+		// 入力チェック（メールアドレスやパスワードの形が正しいか）
+		if (!LoginUserForm.checkParameter(form)) {
+			// エラーメッセージと、入力されたデータを画面に返す
+			model.addAttribute("messageError", new MessageForm("メールアドレス、パスワードの入力内容に誤りがあります"));
+			model.addAttribute("loginInfoForm", form);
+			return "login"; // login.html を表示
+		}
+
+		// 認証チェック（メールアドレスとパスワードが一致するか）
+		if (service.canlogin(form.getMailAddress(), form.getPassword()) == false) {
+			// 間違っている場合のメッセージを画面に返す
+			model.addAttribute("messageError", new MessageForm("IDまたはパスワードが間違っています"));
+			model.addAttribute("loginInfoForm", form);
+			return "login"; // login.html を表示
+		}
+
+		int userId = service.getUserID(form);
+		session.setAttribute("loginUser", userId);//  セッションにユーザー情報を保存 = 「ログイン中」の状態
+
+		//管理者チェック
+		Character adminFlg = service.getUserFlg(form);
+		if (adminFlg != null && adminFlg == '1') {
+			return "admin_menu";//admin_menuを表示
+		}
+		// 成功したらメニュー画面へ進む
+		return "menu"; // menu.html を表示
+	}
+}

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

@@ -0,0 +1,20 @@
+package com.example.demo.controller;
+
+import jakarta.servlet.http.HttpSession;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
+
+@Controller
+public class LogoutController {
+	@Autowired
+	HttpSession session;
+
+	@PostMapping("/doLogout")
+	public String doLogout() {
+		//セッションをすべて破棄
+		session.invalidate();
+		return "login";
+	}
+}

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

@@ -0,0 +1,52 @@
+package com.example.demo.controller;
+
+import jakarta.servlet.http.HttpSession;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+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.ReturnForm;
+import com.example.demo.service.ReturnService;
+
+//返却完了用のコントローラー
+@Controller
+public class ReturnCompleteController {
+
+	HttpSession httpSession;
+	ReturnService rerurnService;
+
+	@Autowired
+	public ReturnCompleteController(HttpSession httpSession, ReturnService rerurnService) {
+		this.httpSession = httpSession;
+		this.rerurnService = rerurnService;
+	}
+
+	@ModelAttribute
+	ReturnForm returnForm() {
+		return new ReturnForm();
+	}
+
+	//返却完了画面表示処理
+	@RequestMapping(value = "/returnComplete", method = RequestMethod.POST)
+	public String returnComplete(ReturnForm returnForm) {
+
+		try {
+			//セッションからIDを拾いたい
+			httpSession.getAttribute("");
+			//いったん1ということで
+			int id = 1;
+
+			rerurnService.setReturn(returnForm.getIdRequest(), id);
+
+			return "returnComplete";
+
+		} catch (Exception e) {
+			e.printStackTrace();
+			return "エラー画面";
+		}
+
+	}
+}

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

@@ -0,0 +1,46 @@
+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.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import com.example.demo.form.ReturnForm;
+import com.example.demo.service.ReturnService;
+
+@Controller
+public class ReturnConfirmController {
+
+	ReturnService rerurnService;
+
+	@Autowired
+	ReturnConfirmController(ReturnService rerurnService) {
+		this.rerurnService = rerurnService;
+	}
+
+	@ModelAttribute
+	ReturnForm returnForm() {
+		return new ReturnForm();
+	}
+
+	@RequestMapping(value = "/returnConfirm", method = { RequestMethod.POST, RequestMethod.GET })
+	public String returnConfirm(Model model) {
+		try {
+			//仮の値を入れる
+			Integer id = 1;
+			//申請IDを元に取得
+			ReturnForm resultForm = rerurnService.getReturnForm(id);
+			resultForm.setIdRequest(id);
+
+			//returnFormに値をセット
+			// 画面に返す為の情報をセット
+			model.addAttribute("returnForm", resultForm);
+			return "returnConfirm";
+		} catch (Exception e) {
+			e.printStackTrace();
+			return "エラー画面";
+		}
+	}
+}

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

@@ -1,4 +1,4 @@
-package com.example.demo.controller;
+/*package com.example.demo.controller;
 
 
 import java.util.List;
@@ -75,3 +75,4 @@ public class SelectBookController {
 
 //      }
 }
+*/

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/Book_collectionEntity.java

@@ -1,6 +1,6 @@
 package com.example.demo.entity;
 
-import java.sql.Timestamp;
+import java.util.Date;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -23,7 +23,6 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 public class Book_collectionEntity {
 
-	
 	//蔵書ID
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -36,88 +35,87 @@ public class Book_collectionEntity {
 
 	//書籍名
 	@Column(name = "nm_book", nullable = false, length = 50)
-    private String nmBook;
+	private String nmBook;
 
 	//書籍名よみ
 	@Column(name = "kn_book", nullable = true, length = 100)
-    private String knBook;
+	private String knBook;
 
 	//出版社
 	@Column(name = "publisher", nullable = true, length = 50)
-    private String pubLisher;
+	private String pubLisher;
 
 	//特記事項
-	@Column(name = "note text", nullable = true)
-    private String noteText;
+	@Column(name = "note", nullable = true)
+	private String noteText;
 
 	//貸出フラグ   -> charに変更する
 	@Column(name = "flg_lending", nullable = false, columnDefinition = "default 0")
-    private Character flgLending;
+	private Character flgLending;
 
 	//更新者
 	@Column(name = "id_update", nullable = false)
-    private Integer idUpdate;
+	private Integer idUpdate;
 
 	//更新日
-    @Column(name = "date_update", nullable = false)
-    @LastModifiedDate
-    private Timestamp dateUpdate;
+	@Column(name = "date_update", nullable = false)
+	@LastModifiedDate
+	private Date dateUpdate;
 
-//	public static Book_collection convertFrom(Book_collection book_collection) {
-//    // 値を既に持ったインスタンスの生成に、コンストラクタを使用するとこうなります。
-//    return new Book_collection Entity(
-//            book_colletion.getIdBook(),
-//            book_colletion.getisBn(),
-//            book_colletion.getnmBook(),
-//            book_colletion..getknBook(),
-//            book_colletion.getpublisher(),
-//            book_colletion.getnoteText(),
-//            book_colletion.getflgLending(),
-//            book_colletion.getidUpdate(),
-//            book_colletion.getdateUupdate()
-//    );
-//
-//}
-//public static EmployeeEntity convertFrom(SearchConditionEmployee searchConditionEmployee) {
-//    EmployeeEntity employeeEntity = new EmployeeEntity();
-//
-//    employeeEntity.setIdBook(searchConditionEmployee.getIdBook());
-//    employeeEntity.setisBn(searchConditionEmployee.getisBn());
-//    employeeEntity.setnmBook(searchConditionEmployee.getnmBook());
+	//	public static Book_collection convertFrom(Book_collection book_collection) {
+	//    // 値を既に持ったインスタンスの生成に、コンストラクタを使用するとこうなります。
+	//    return new Book_collection Entity(
+	//            book_colletion.getIdBook(),
+	//            book_colletion.getisBn(),
+	//            book_colletion.getnmBook(),
+	//            book_colletion..getknBook(),
+	//            book_colletion.getpublisher(),
+	//            book_colletion.getnoteText(),
+	//            book_colletion.getflgLending(),
+	//            book_colletion.getidUpdate(),
+	//            book_colletion.getdateUupdate()
+	//    );
+	//
+	//}
+	//public static EmployeeEntity convertFrom(SearchConditionEmployee searchConditionEmployee) {
+	//    EmployeeEntity employeeEntity = new EmployeeEntity();
+	//
+	//    employeeEntity.setIdBook(searchConditionEmployee.getIdBook());
+	//    employeeEntity.setisBn(searchConditionEmployee.getisBn());
+	//    employeeEntity.setnmBook(searchConditionEmployee.getnmBook());
 
-//    employeeEntity.setknBook(searchConditionEmployee.knBook());
-//    employeeEntity.setpublisher(searchConditionEmployee.getpublisher());
-//    employeeEntity.setnoteText(searchConditionEmployee.getnoteText());
-//    employeeEntity.setflgLending(searchConditionEmployee.getflgLending());
-//    employeeEntity.setidUpdate(searchConditionEmployee.getidUpdate());
-//  employeeEntity.setdateUpdate(searchConditionEmployee.getdateUupdate());
+	//    employeeEntity.setknBook(searchConditionEmployee.knBook());
+	//    employeeEntity.setpublisher(searchConditionEmployee.getpublisher());
+	//    employeeEntity.setnoteText(searchConditionEmployee.getnoteText());
+	//    employeeEntity.setflgLending(searchConditionEmployee.getflgLending());
+	//    employeeEntity.setidUpdate(searchConditionEmployee.getidUpdate());
+	//  employeeEntity.setdateUpdate(searchConditionEmployee.getdateUupdate());
 
-    
-//    
-////    public static List<book_collection> createbook_collectionList(List<EmployeeEntity> employeeEntityList) {
-////        return employeeEntityList.stream().map(EmployeeEntity::createbook_collection).toList();
-////    }
-//    
-//    List<book_collection> book_collectionList = new ArrayList<>();
-//    for(book_collectionEntity book_collectionEntity:employeeEntityList){
-//    	book_collection employee = book_collectionEntity.createbook_collection(book_collectionEntity);
-//    	book_collectionList.add(employee);
-//    }
-//    return employeeList;
-//    
-//    
-//    public LoginUser createLoginUser() {
-//        // 値を既に持ったインスタンスの生成に、コンストラクタを使用するとこうなります。
-//        return new LoginUser(
-//                getidBook(),
-//                getisBn(),
-//                getnmBook(),
-//                getknBook(),
-//                getpublisher(),
-//                getnoteText(),
-//                getflgLending(),
-//                getidUpdate(),
-//                getdateUpdate()
-//        );
-//    }
+	//    
+	////    public static List<book_collection> createbook_collectionList(List<EmployeeEntity> employeeEntityList) {
+	////        return employeeEntityList.stream().map(EmployeeEntity::createbook_collection).toList();
+	////    }
+	//    
+	//    List<book_collection> book_collectionList = new ArrayList<>();
+	//    for(book_collectionEntity book_collectionEntity:employeeEntityList){
+	//    	book_collection employee = book_collectionEntity.createbook_collection(book_collectionEntity);
+	//    	book_collectionList.add(employee);
+	//    }
+	//    return employeeList;
+	//    
+	//    
+	//    public LoginUser createLoginUser() {
+	//        // 値を既に持ったインスタンスの生成に、コンストラクタを使用するとこうなります。
+	//        return new LoginUser(
+	//                getidBook(),
+	//                getisBn(),
+	//                getnmBook(),
+	//                getknBook(),
+	//                getpublisher(),
+	//                getnoteText(),
+	//                getflgLending(),
+	//                getidUpdate(),
+	//                getdateUpdate()
+	//        );
+	//    }
 }

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

@@ -1,6 +1,5 @@
 package com.example.demo.entity;
 
-import java.security.Timestamp;
 import java.util.Date;
 
 import jakarta.persistence.Column;
@@ -8,8 +7,9 @@ import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
-import org.hibernate.annotations.Audited.Table;
+//import org.hibernate.annotations.Audited.Table;
 import org.springframework.data.annotation.LastModifiedDate;
 
 import lombok.AllArgsConstructor;
@@ -54,7 +54,7 @@ public class Borrow_booksEntity {
 	 * ステータス
 	 * */
 	@Column(name = "status", nullable = false, columnDefinition = "default 1")
-	private char status;
+	private Character status;
 
 	/*
 	 * 承認者
@@ -97,5 +97,5 @@ public class Borrow_booksEntity {
 	 * */
 	@Column(name = "date_update", nullable = false)
 	@LastModifiedDate
-	private Timestamp dateUpdate;
+	private Date dateUpdate;
 }

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

@@ -1,5 +1,141 @@
 package com.example.demo.entity;
 
-public class EmployeeEntity {
+import java.util.Date;
 
+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 Date 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/LendingForm.java

@@ -0,0 +1,53 @@
+package com.example.demo.form;
+
+import java.time.LocalDate;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LendingForm {
+	/**
+	 * 蔵書ID
+	 */
+	private int id_book;
+	/**
+	 * 書籍名
+	 */
+	private String nm_book;
+
+	//貸出日と返却予定日にアノテーションで日付や時刻の表示形式を指定
+
+	/**
+	 * 貸出日
+	 */
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	//LocalDate型にて日付（年・月・日）を取り扱う
+	private LocalDate date_borrow;
+
+	/**
+	 * 返却予定日
+	 */
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	private LocalDate date_scheduled_return;
+
+	/**
+	 * 貸出日を取得するメソッド
+	 */
+	public LocalDate getDate_borrow() {
+		return this.date_borrow;
+	}
+
+	/**
+	 * 返却予定日を取得するメソッド
+	 */
+	public LocalDate getDate_scheduled_return() {
+		return this.date_scheduled_return;
+
+	}
+}

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

@@ -0,0 +1,22 @@
+package com.example.demo.form;
+
+//ログイン情報
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+
+public class LoginInfoForm {
+	/**
+	* メールアドレス
+	*/
+	private String mailAddress;
+	/**
+	 * パスワード
+	 */
+	private String password;
+
+}

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

@@ -0,0 +1,94 @@
+package com.example.demo.form;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+//ログインをする人
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LoginUserForm {
+	/**
+     * 社員ID
+     */
+    private Integer idEmployee;
+    /**
+     * 社員名
+     */
+    private String nmEmployee;
+    /**
+     * 社員名よみ
+     */
+    private String knEmployee;
+    /**
+     * メールアドレス
+     */
+    private String mailAddress;
+    /**
+     * パスワード
+     */
+    private String password;
+
+    /**
+     * 管理者フラグ
+     */
+    private Integer flgadmin;
+
+    /**
+     * business 層の LoginUser クラスから画面用（presentation 層）の LoginUserForm に
+     * 変換します。
+     *
+     * @param loginUser business 層の LoginUser インスタンス
+     * @return クラスから画面用（presentation 層）の LoginUserForm
+     */
+    public static LoginUserForm convertFrom(LoginUserForm loginUser) {
+        return new LoginUserForm(
+                loginUser.getIdEmployee(),
+                loginUser.getNmEmployee(),
+                loginUser.getKnEmployee(),
+                loginUser.getMailAddress(),
+                loginUser.getPassword(),
+                loginUser.getFlgadmin()
+        );
+    }
+
+   
+    public static LoginUserForm convertTo(LoginUserForm loginUserForm) {
+        return new LoginUserForm(
+                loginUserForm.getIdEmployee(),
+                loginUserForm.getNmEmployee(),
+                loginUserForm.getKnEmployee(),
+                loginUserForm.getMailAddress(),
+                loginUserForm.getPassword(),
+                loginUserForm.getFlgadmin()
+        );
+    }
+
+
+    public static boolean checkParameter(LoginInfoForm loginInfoForm) {
+        if (null == loginInfoForm.getMailAddress()) {
+            return false;
+        }
+
+        if (loginInfoForm.getMailAddress().isBlank()) {
+            return false;
+        }
+
+        if (null == loginInfoForm.getPassword()) {
+            return false;
+        }
+
+        return !loginInfoForm.getPassword().isBlank();
+
+    }
+
+    /**
+     * 管理者権限を持っているか確認
+     *
+     * @return true:管理者権限を持っている , false:管理者権限を持っていない
+     */
+    public boolean isAdminUser() {
+        return getFlgadmin() == 1;
+    }
+}

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

@@ -0,0 +1,15 @@
+package com.example.demo.form;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 画面に表示するエラーメッセージを管理するクラスです。
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class MessageForm {
+	private String message;
+}

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

@@ -0,0 +1,36 @@
+package com.example.demo.form;
+
+import java.util.Date;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ReturnForm {
+	//申請ID
+	private Integer idRequest;
+	//申請者名//社員名
+	private String nmEmployee;
+	//申請日
+	@DateTimeFormat(pattern = "yyyy-mm-dd")
+	private Date dateRequest;
+	//貸出日
+	@DateTimeFormat(pattern = "yyyy-mm-dd")
+	private Date dateBorrow;
+	//返却予定日
+	@DateTimeFormat(pattern = "yyyy-mm-dd")
+	private Date dateScheduledReturn;
+	//ISBN
+	private String isBn;
+	//書籍名
+	private String nmBook;
+	//出版社
+	private String pubLisher;
+	//特記事項
+	private String noteText;
+}

team1/src/main/java/com/example/demo/model/LeadingListModel.java

@@ -0,0 +1,18 @@
+package com.example.demo.model;
+
+import java.util.Date;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class LeadingListModel {
+	//データの保持
+	private final Integer idRequest;
+	private final String nmBook;
+	private final String nmEmployee;
+	private final Date dateRequest;
+	private final Date dateBorrow;
+	private final Date dateScheduledReturn;
+}

team1/src/main/java/com/example/demo/model/LoginInfo.java

@@ -0,0 +1,13 @@
+package com.example.demo.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+//ログインを試みる
+@Getter
+@AllArgsConstructor
+public class LoginInfo {
+	private String maillAddress;
+	private String password;
+
+}

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

@@ -1,11 +1,28 @@
 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 org.springframework.stereotype.Repository;
 
 import com.example.demo.entity.Book_collectionEntity;
 
 @Repository
 public interface Book_CollectionRepository extends JpaRepository<Book_collectionEntity, Integer> {
+	List<Book_collectionEntity> findByFlgLending(Character flgLending);
 
+	@Query("""
+			SELECT b FROM Book_collectionEntity b
+			WHERE b.flgLending='0'
+			AND (:nmBook = '' OR b.nmBook LIKE CONCAT('%', :nmBook,'%'))
+			AND (:pubLisher = '' OR b.pubLisher LIKE CONCAT('%', :pubLisher,'%'))
+			AND (:noteText = '' OR b.noteText LIKE CONCAT('%',:noteText,'%'))
+			ORDER BY b.idBook
+			""")
+	List<Book_collectionEntity> searchBooks(
+			@Param("nmBook") String nmBook,
+			@Param("pubLisher") String pubLisher,
+			@Param(" noteText") 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.List;
+
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
@@ -7,5 +9,5 @@ import com.example.demo.entity.Borrow_booksEntity;
 
 @Repository
 public interface Borrow_BooksRepository extends JpaRepository<Borrow_booksEntity, Integer> {
-
+	List<Borrow_booksEntity> findByStatus(Character status);
 }

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;
 
@@ -8,4 +10,7 @@ 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

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

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

@@ -0,0 +1,15 @@
+package com.example.demo.service;
+
+import com.example.demo.form.LendingForm;
+
+/**
+ * 書籍貸出申請の業務処理を定義するインターフェース
+ */
+public interface LendingService {
+
+	/**
+	 * 貸出申請の登録処理と、蔵書のステータス更新を行う
+	 *
+	 */
+	void executeLending(LendingForm form);
+}

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

@@ -0,0 +1,199 @@
+package com.example.demo.service;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.example.demo.entity.Book_collectionEntity;
+import com.example.demo.entity.Borrow_booksEntity;
+import com.example.demo.form.LendingForm;
+import com.example.demo.form.LoginInfoForm;
+import com.example.demo.form.ReturnForm;
+import com.example.demo.form.SearchConditionBookForm;
+import com.example.demo.model.LeadingListModel;
+import com.example.demo.repository.Book_CollectionRepository;
+import com.example.demo.repository.Borrow_BooksRepository;
+import com.example.demo.repository.EmployeeRepository;
+
+@Service
+public class ReturnService {
+
+	Book_CollectionRepository book_CollectionRepository;
+	Borrow_BooksRepository borrowRepository;
+	EmployeeRepository employeeRepository;
+
+	@Autowired
+	public ReturnService(
+			Book_CollectionRepository book_CollectionRepository,
+			Borrow_BooksRepository borrowRepository,
+			EmployeeRepository employeeRepository) {
+		this.book_CollectionRepository = book_CollectionRepository;
+		this.borrowRepository = borrowRepository;
+		this.employeeRepository = employeeRepository;
+	}
+
+	public ReturnForm getReturnForm(int id) {
+		ReturnForm result = new ReturnForm();
+		Optional<Borrow_booksEntity> borrow = borrowRepository.findById(id);
+		//		System.out.println(borrow);
+		result.setDateRequest(borrow.get().getDateRequest());//申請日
+		result.setDateBorrow(borrow.get().getDateBorrow());//貸出日
+		result.setDateScheduledReturn(borrow.get().getDateScheduledReturn());//返却予定日
+
+		var emp = employeeRepository.findById(borrow.get().getIdApplicant());
+		result.setNmEmployee(emp.get().getNmEmployee());//申請者名、社員名
+
+		var book = book_CollectionRepository.findById(borrow.get().getIdBook());
+		result.setIsBn(book.get().getIsBn());//ISBN
+		result.setNmBook(book.get().getNmBook());//書籍名
+		result.setPubLisher(book.get().getPubLisher());//出版社
+		result.setNoteText(book.get().getNoteText());
+
+		return result;
+	}
+
+	public void setReturn(int id_request, int id_employee) {
+		var borrow = borrowRepository.findById(id_request);
+		var book = book_CollectionRepository.findById(borrow.get().getIdBook());
+		book.get().setFlgLending('0');//「貸出フラグ」を【貸出可】
+		borrow.get().setStatus('0');//貸出テーブルの「ステータス」を【返却済
+		borrow.get().setDateReturn(new Date());//「返却日」を当日日付
+		borrow.get().setIdUpdate(id_employee);//「更新者」を更新した人のID
+		borrow.get().setDateUpdate(new Date());//「更新日」を当日日付に更新する。
+
+		borrowRepository.save(borrow.get());
+		book_CollectionRepository.save(book.get());
+	}
+
+	//貸出承認
+	public void setReturnComplete(int id_request, int id_employee) {
+		var borrow = borrowRepository.findById(id_request);
+		var book = book_CollectionRepository.findById(borrow.get().getIdBook());
+
+		borrow.get().setStatus('2');//貸出テーブルの「ステータス」を【貸出中】
+		borrow.get().setDateApproval(new Date());//「承認日」を当日日付
+		borrow.get().setIdUpdate(id_employee);//「更新者」を更新した人のID
+		borrow.get().setDateUpdate(new Date());//「更新日」を当日日付に更新する。
+
+		borrowRepository.save(borrow.get());
+		book_CollectionRepository.save(book.get());
+
+	}
+
+	//却下
+	//貸出テーブルの「ステータス」を【却下】、「更新者」を却下した人のID、「更新日」を当日日付に更新する。
+	//また、蔵書テーブルの「貸出フラグ」を【貸出可】に更新する。
+	public void setReturnRejected(int id_request, int id_employee) {
+
+		var borrow = borrowRepository.findById(id_request);
+		var book = book_CollectionRepository.findById(borrow.get().getIdBook());
+
+		book.get().setFlgLending('0');//「貸出フラグ」を【貸出可】
+		borrow.get().setStatus('9');//貸出テーブルの「ステータス」を【却下】
+		borrow.get().setIdUpdate(id_employee);//「更新者」を却下した人のID
+		borrow.get().setDateUpdate(new Date());//「更新日」を当日日付に更新する。
+
+		borrowRepository.save(borrow.get());
+		book_CollectionRepository.save(book.get());
+	}
+
+	//貸し出し可能な書籍の全権取得
+	public List<Book_collectionEntity> availableSelectAll() {
+		return book_CollectionRepository.findByFlgLending('0');
+	}
+
+	//書籍名・出版社・特記事項の部分一致検索
+	public List<Book_collectionEntity> searchByWithLike(
+			SearchConditionBookForm form) {
+		String nmBook = form.getNmBook();
+		String pubLisher = form.getPubLisher();
+		String noteText = form.getNoteText();
+		nmBook = nmBook == null ? "" : nmBook;
+		pubLisher = pubLisher == null ? "" : pubLisher;
+		noteText = noteText == null ? "" : noteText;
+		return book_CollectionRepository.searchBooks(
+				nmBook,
+				pubLisher,
+				noteText);
+	}
+
+	public List<LeadingListModel> getBorrowList() {
+		List<LeadingListModel> result = new ArrayList<LeadingListModel>();
+
+		List<Borrow_booksEntity> borrow = borrowRepository.findByStatus('2');
+		for (Borrow_booksEntity borrow_booksEntity : borrow) {
+			String nmEmployee = employeeRepository.findById(borrow_booksEntity.getIdApplicant()).get().getNmEmployee();
+			String nmBook = book_CollectionRepository.findById(borrow_booksEntity.getIdBook()).get().getNmBook();
+			LeadingListModel a = new LeadingListModel(borrow_booksEntity.getIdRequest(),
+					nmEmployee,
+					nmBook,
+					borrow_booksEntity.getDateRequest(),
+					borrow_booksEntity.getDateBorrow(),
+					borrow_booksEntity.getDateScheduledReturn());
+			result.add(a);
+		}
+		return result;
+
+	}
+
+	//書籍貸出申請機能
+	public void executeLending(LendingForm form, int idEmployee) {
+		var book_collection = book_CollectionRepository.findById(form.getId_book());//更新したい本のEntityを取得
+		book_collection.get().setFlgLending('1');//フラグだけ書き換え
+		book_CollectionRepository.save(book_collection.get());
+
+		Borrow_booksEntity borrow = new Borrow_booksEntity();//空の申請レコード
+		borrow.setIdApproval(idEmployee);//申請者ID
+		borrow.setIdBook(form.getId_book());//蔵書ID
+		borrow.setDateRequest(new Date());//申請日	
+		borrow.setStatus('1');//ステータスを承認待ちに
+		borrow.setIdUpdate(idEmployee);//更新者ID
+		borrow.setDateUpdate(new Date());//更新日
+
+		borrowRepository.save(borrow);
+	}
+
+	//貸出テーブルの「ステータス」が「1:承認待」の情報を全件取得
+	public List<LeadingListModel> getAwaitingApprovalList() {
+		List<LeadingListModel> result = new ArrayList<LeadingListModel>();
+
+		List<Borrow_booksEntity> borrow = borrowRepository.findByStatus('1');
+		for (Borrow_booksEntity borrow_booksEntity : borrow) {
+			String nmEmployee = employeeRepository.findById(borrow_booksEntity.getIdApplicant()).get().getNmEmployee();
+			String nmBook = book_CollectionRepository.findById(borrow_booksEntity.getIdBook()).get().getNmBook();
+			LeadingListModel a = new LeadingListModel(borrow_booksEntity.getIdRequest(),
+					nmEmployee,
+					nmBook,
+					borrow_booksEntity.getDateRequest(),
+					borrow_booksEntity.getDateBorrow(),
+					borrow_booksEntity.getDateScheduledReturn());
+			result.add(a);
+		}
+		return result;
+
+	}
+
+	//メアドとパスワードが合っていればtureで返す
+	public boolean canlogin(String mail, String pass) {
+		if (mail == null || mail.isEmpty() || pass == null || pass.isEmpty()) {
+			return false;
+		}
+		return employeeRepository.findByMailAddressAndPassword(mail, pass).isPresent();
+	}
+
+	//LoginInfoFormの情報からidEmployeeを返す
+	public int getUserID(LoginInfoForm form) {
+		return employeeRepository.findByMailAddressAndPassword(form.getMailAddress(), form.getPassword()).get()
+				.getIdEmployee();
+	}
+
+	//LoginInfoFormの情報からFlgを返す　0なら一般,1なら管理
+	public Character getUserFlg(LoginInfoForm form) {
+		return employeeRepository.findByMailAddressAndPassword(form.getMailAddress(), form.getPassword()).get()
+				.getFlgAdmin();
+	}
+}

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

@@ -0,0 +1,34 @@
+/*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());
+	//}
+	
+	
+//}
+//package com;
+
+

team1/src/main/java/com/example/demo/service/impl/LendingServiceImpl.java

@@ -0,0 +1,44 @@
+package com.example.demo.service.Impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.example.demo.form.LendingForm;
+import com.example.demo.repository.Book_CollectionRepository;
+import com.example.demo.repository.Borrow_BooksRepository;
+import com.example.demo.repository.EmployeeRepository;
+import com.example.demo.service.LendingService;
+
+/**
+ * 書籍貸出申請の処理をまとめたサービスクラス
+ */
+
+@Service
+@Transactional
+public class LendingServiceImpl implements LendingService {
+	//3つリポジトリクラス記載
+	private final Book_CollectionRepository bookCollectionRepository;
+	private final Borrow_BooksRepository borrowBooksRepository;
+	private final EmployeeRepository employeeRepository;
+
+	//@Autwiredでリポジトリを自動で接続
+	@Autowired
+	public LendingServiceImpl(Book_CollectionRepository bookCollectionRepository,
+			Borrow_BooksRepository borrowBooksRepository, EmployeeRepository employeeRepository) {
+		this.bookCollectionRepository = bookCollectionRepository;
+		this.borrowBooksRepository = borrowBooksRepository;
+		this.employeeRepository = employeeRepository;
+	}
+
+	/**
+	 * 【本番処理】貸出申請データを組み立ててデータベースへ保存
+	 */
+
+	@Override
+	public void executeLending(LendingForm form) {
+
+		//画面の蔵書IDをEntityに合わせるために変換
+		//Integer bookId = Integer.parseUnsignedInt(form.getId_book());
+	}
+}

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

@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+
+<!--書籍貸出申請画面-->
+
+<head>
+	<meta charset="UTF-8">
+	<title>書籍貸出申請</title>
+</head>
+
+<body>
+	<!--右上にログイン者名、ログアウトボタン配置-->
+	<!--現在ダミー配置-->
+	<div class="rightSection">
+		<span class="loginInfo">ログイン者名：<span>テスト太郎（ダミー）</span></span>
+		<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
+	</div>
+	<!--本来配置予定の記述-->
+	<!--	<div class="rightSection">
+		    <span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
+		    <button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
+		</div>
+	-->
+
+	<!--クラス名確認すること（現在仮入力）-->
+	<form th:action="@{/confirmLending}" id="lendingForm" method="post" th:object="${lendingForm}">
+		<table>
+			<!--蔵書ID、書籍名はreadonlyにて固定-->
+			<tr>
+				<th class="header">蔵書ID</th>
+				<td><input type="text" th:field="*{id_book}" readonly="readonly"></td>
+			</tr>
+			<tr>
+				<th class="header">書籍名</th>
+				<td><input type="text" th:field="*{nm_book}" readonly="readonly"></td>
+			</tr>
+			<tr>
+				<!--input type ="date"にてカレンダー入力表示-->
+				<!--required属性を追加、未入力をブラウザ側ではじく-->
+				<!--Thymeleafにてエラー表示エリアを作成-->
+				<th class="header">貸出日</th>
+				<td><input type="date" th:field="*{date_borrow}" required></td>
+				<span th:if="${#fields.hasErrors('date_borrow')}" th:errors="*{date_borrow}" style="color:red;"></span>
+			</tr>
+			<tr>
+				<th class="header">返却予定日</th>
+				<td><input type="date" th:field="*{date_scheduled_return}" required></td>
+				<span th:if="${#fields.hasErrors('date_scheduled_return')}" th:errors="*{date_scheduled_return}"
+					style="color:red;"></span>
+			</tr>
+			<tr>
+				<td class="btnArea" colspan="2">
+					<input type="submit" value="申請確認" />
+				</td>
+			</tr>
+		</table>
+	</form>
+
+	<!--書籍一覧に戻る処理、URL確認を行う-->
+	<a th:href="@{/bookList}"> 書籍一覧に戻る</a>
+</body>
+
+</html>

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

@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+
+<!--書籍貸出申請完了画面-->
+
+<head>
+	<meta charset="UTF-8">
+	<title>書籍貸出申請完了</title>
+</head>
+
+<body>
+	<!--右上にログイン者名、ログアウトボタン配置-->
+	<!--現在ダミー配置-->
+	<div class="rightSection">
+		<span class="loginInfo">ログイン者名：<span>テスト太郎（ダミー）</span></span>
+		<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
+	</div>
+	<!--本来配置予定の記述-->
+	<!--	<div class="rightSection">
+		    <span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
+		    <button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
+		</div>
+	-->
+
+
+	<!--見出し表示-->
+	<h1>書籍貸出申請完了しました</h1>
+
+	<div class="navigation-links">
+		<!--書籍一覧に戻る処理、URL確認を行う-->
+		<a th:href="@{/bookList}"> 書籍一覧に戻る</a>
+
+		<!--メニュー画面に戻る処理、URL確認を行う-->
+		<a th:href="@{/menu}">メニューに戻る</a>
+	</div>
+</body>
+
+</html>

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

@@ -0,0 +1,68 @@
+<!--書籍貸出申請確認画面-->
+
+<head>
+	<meta charset="UTF-8">
+	<title>書籍貸出申請確認</title>
+</head>
+
+<body>
+	<!--右上にログイン者名、ログアウトボタン配置-->
+	<!--現在ダミー配置-->
+	<div class="rightSection">
+		<span class="loginInfo">ログイン者名：<span>テスト太郎（ダミー）</span></span>
+		<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
+	</div>
+	<!--本来配置予定の記述-->
+	<!--	<div class="rightSection">
+		    <span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
+		    <button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
+		</div>
+	-->
+	<form th:action="@{/executeLending}" id="lendingConfirmForm" method="post" th:object="${lendingForm}">
+
+		<!--Java側へデータを引き継ぐための隠しフィールド（必須） -->
+		<input type="hidden" th:field="*{id_book}" />
+		<input type="hidden" th:field="*{nm_book}" />
+		<input type="hidden" th:field="*{date_borrow}" />
+		<input type="hidden" th:field="*{date_scheduled_return}" />
+
+		<table>
+			<tr>
+				<!-- 以下4項目<span>タグを用いてテキスト表示として画面に固定表示 -->
+				<th class="header">蔵書ID</th>
+				<td><span th:text="*{id_book}"></span></td>
+			</tr>
+			<tr>
+				<th class="header">書籍名</th>
+				<td><span th:text="*{nm_book}"></span></td>
+			</tr>
+			<tr>
+				<th class="header">貸出日</th>
+				<td><span
+						th:text="*{date_borrow} != null ? ${#temporals.format(lendingForm.date_borrow, 'yyyy/MM/dd')} : ''"></span>
+				</td>
+			</tr>
+			<tr>
+				<th class="header">返却予定日</th>
+				<td><span
+						th:text="*{date_scheduled_return} != null ? ${#temporals.format(lendingForm.date_scheduled_return, 'yyyy/MM/dd')} : ''"></span>
+				</td>
+			</tr>
+			<tr>
+				<td class="btnArea" colspan="2">
+					<!-- 申請確定 -->
+					<input type="submit" value="申請" />
+				</td>
+			</tr>
+		</table>
+	</form>
+	<!--申請情報入力(一つ前の画面)に戻る処理-->
+	<div class="link-return-area">
+		<a class="back-link" href="javascript:void(0);"
+			onclick="const form = document.getElementById('lendingConfirmForm'); form.action='/backToRequest'; form.submit();">
+			申請情報入力に戻る
+		</a>
+	</div>
+</body>
+
+</html>

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

@@ -0,0 +1,40 @@
+<!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>
+<h2>書籍貸出申請を承認しました。</h2>
+<br/>
+<a href="javascript:insertSubmit()">承認待ち一覧に戻る</a>　|　<a href="showMenu">メニューに戻る</a>
+</body>
+<script type="text/javascript">
+    function insertSubmit() {
+        const form = document.createElement('form');
+        form.setAttribute('method', 'post');
+        form.setAttribute('action', 'approvalConfirm');
+
+        // 動的送信用のHidden
+        // 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
+        const inputField = document.createElement("input");
+        inputField.setAttribute("type", "hidden");
+        inputField.setAttribute("value", "select");
+
+        form.appendChild(inputField);
+
+        // フォームをDOMに追加
+        document.body.appendChild(form);
+
+        form.submit();
+    }
+</script>
+</html>

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

@@ -0,0 +1,152 @@
+<!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="approvalConfirm"
+	      method="post">
+
+	    <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>
+				<tr>
+				    <td class="btnArea" colspan="2">
+				        <input type="submit" value="承認"/>
+				    </td>
+				</tr>
+				<tr>
+				    <td class="btnArea" colspan="2">
+				        <input type="submit" value="却下"/>
+				    </td>
+				</tr>
+			</table>	
+			<br/>
+			<a href="javascript:insertSubmit()">承認待ち一覧に戻る</a>	
+	</form>
+	
+</body>
+</html>

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

@@ -0,0 +1,40 @@
+<!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>
+<h2>書籍貸出申請を却下しました。</h2>
+<br/>
+<a href="javascript:insertSubmit()">承認待ち一覧に戻る</a>　|　<a href="showMenu">メニューに戻る</a>
+</body>
+<script type="text/javascript">
+    function insertSubmit() {
+        const form = document.createElement('form');
+        form.setAttribute('method', 'post');
+        form.setAttribute('action', 'approvalConfirm');
+
+        // 動的送信用のHidden
+        // 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
+        const inputField = document.createElement("input");
+        inputField.setAttribute("type", "hidden");
+        inputField.setAttribute("value", "select");
+
+        form.appendChild(inputField);
+
+        // フォームをDOMに追加
+        document.body.appendChild(form);
+
+        form.submit();
+    }
+</script>
+</html>

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

@@ -0,0 +1,66 @@
+<!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>ログイン</h1>
+<form id="loginForm"
+	th:action="@{/doLogin}"
+      method="post"
+      th:object="${loginInfoForm}">
+
+    <div class="msgBox error" th:if="${messageError} != null">
+        <span class="error" th:text="${messageError.message}"></span>
+    </div>
+
+    <table>
+        <tr>
+			<!-- メアド記入欄 -->
+            <th class="header">メールアドレス</th>
+            <td style="width: 250px;">
+                <input placeholder="メールアドレス"
+                       required="required"
+                       style="width: 100%;"
+                       th:field="*{mailAddress}"
+                       type="text"/>
+            </td>
+        </tr>
+        <tr>
+			<!-- パスワード記入欄 -->
+            <th style="text-align: right;">パスワード</th>
+            <td>
+                <input placeholder="パスワード"
+                       required="required"
+                       style="width: 100%;"
+                       th:field="*{password}"
+                       type="password"/>
+            </td>
+        </tr>
+        <tr>
+            <td class="btnArea" colspan="2">
+                <input type="submit" value="ログイン"/>
+                <button onclick="clearInput()">リセット</button>
+            </td>
+        </tr>
+    </table>
+</form>
+</body>
+<!-- 入力を消去 -->
+<script type="text/javascript">
+    function clearInput() {
+        document.getElementById('mailAddress').value = '';
+        document.getElementById('password').value = '';
+    }
+
+</script>
+</html>

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

@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+
+<head>
+	<meta charset="UTF-8">
+	<title>書籍返却完了</title>
+</head>
+
+
+<div style="text-align: right;">
+	<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
+</div>
+<h2 style="text-align: center;">書籍の返却が完了しました</h2>
+
+
+<div style="text-align: center;">
+<!--	コントローラーのメソッド名-->
+<a href="lendingList">貸出中書籍一覧に戻る</a>　|　<a href="showMenu">メニューに戻る</a>
+</div>
+</body>
+
+</html>

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

@@ -0,0 +1,137 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+
+<head>
+	<meta charset="UTF-8">
+	<title>書籍返却確認</title>
+</head>
+<body>
+		<div style="text-align: right;">
+			<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
+		</div>
+	
+
+	<form action ="returnComplete"
+	method="post"
+	th:object="${returnForm}">
+	<table style="margin:auto">
+		<tr>
+			<th class="header">申請ID</th>
+			<td>
+				<label>
+					<input class="readOnly"
+					 name="idRequest"
+					  readonly="readonly"
+					   th:field="*{idRequest}"
+					    type="text" />
+				</label>
+			</td>
+		</tr>
+		<tr>
+			<th class="header">申請者名</th>
+			<td>
+				<label>
+					<input class="readOnly"
+					 name="nmEmployee"
+					  readonly="readonly"
+					   th:field="*{nmEmployee}"
+					    type="text" />
+				</label>
+			</td>
+		</tr>
+		<tr>
+			<th class="header">申請日</th>
+			<td>
+				<label>
+					<input class="readOnly"
+					 name="dateRequest"
+					  readonly="readonly"
+					   th:field="*{dateRequest}"
+					    type="text" />
+				</label>
+			</td>
+		</tr>
+		<tr>
+			<th class="header">ISBN</th>
+			<td>
+				<label>
+					<input class="readOnly"
+					 name="isBn"
+					  readonly="readonly"
+					   th:field="*{isBn}"
+					    type="text" />
+				</label>
+			</td>
+		</tr>
+		<tr>
+			<th class="header">書籍名</th>
+			<td>
+				<label>
+					<input class="readOnly"
+					 name="nmBook"
+					  readonly="readonly"
+					   th:field="*{nmBook}"
+					    type="text" />
+				</label>
+			</td>
+		</tr>
+		<tr>
+			<th class="header">出版社</th>
+			<td>
+				<label>
+					<input class="readOnly"
+					 name="pubLisher"
+					  readonly="readonly"
+					   th:field="*{pubLisher}"
+					    type="text" />
+				</label>
+			</td>
+		</tr>
+		<tr>
+			<th class="header">特記事項</th>
+			<td>
+				<label>
+					<input class="readOnly"
+					 name="noteText"
+					  readonly="readonly"
+					   th:field="*{noteText}"
+					    type="text" />
+				</label>
+			</td>
+		</tr>
+		<tr>
+			<th class="header">貸出日</th>
+			<td>
+				<label>
+					<input class="readOnly"
+					 name="dateBorrow"
+					  readonly="readonly"
+					   th:field="*{dateBorrow}"
+					    type="text" />
+				</label>
+			</td>
+		</tr>
+		<tr>
+			<th class="header">返却予定日</th>
+			<td>
+				<label>
+					<input class="readOnly"
+					 name="dateScheduledReturn"
+					  readonly="readonly"
+					   th:field="*{dateScheduledReturn}"
+					    type="text" />
+				</label>
+			</td>
+		</tr>
+		<tr style="text-align: right;">
+            <td>
+                <input type="submit" value="返却"/>
+            </td>
+        </tr>
+	</table>
+<!--	コントローラーのメソッド名-->
+	<a href="lendingList">貸出中書籍一覧に戻る</a>
+	</form>
+	</body>
+
+</html>