Merge branch 'y-ogawa'

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

@@ -1,6 +1,18 @@
 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;
 
 /**
  * 書籍貸出承認確認用のコントローラ
@@ -8,4 +20,45 @@ import org.springframework.stereotype.Controller;
 @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/form/ApprovalForm.java

@@ -0,0 +1,12 @@
+package com.example.demo.form;
+
+import lombok.Data;
+
+/**
+ * 画面から渡ってきた登録内容をまとめ、再度画面に表示する為のクラス
+ */
+@Data
+
+public class ApprovalForm {
+
+}

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

@@ -3,10 +3,10 @@ package com.example.demo.service.Impl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.example.demo.service.ApprovalBorrowBooks;
+import com.example.demo.service.Request;
 
 @Service
 @Transactional
-public class ApprovalBorrowBooksImpl implements ApprovalBorrowBooks{
+public class RequestImpl implements Request{
 
 }

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

@@ -0,0 +1,18 @@
+package com.example.demo.service;
+
+import java.util.List;
+
+import org.springframework.web.servlet.mvc.condition.RequestCondition;
+
+import com.example.rhizome.app.domain.model.Employee;
+import com.example.rhizome.app.domain.model.LoginUser;
+
+public interface Request {
+		List<Requestinfo> selectAll();
+
+	    List<Requestinfo> searchBy(RequestCondition searchCondition);
+
+	    LoginUser searchLoginUser(String mailAddress);
+
+	    Employee searchEmployeeByIdEmployee(Integer idEmployee);
+}