From 53fd6ae2dbeb50ee400fec193ae3cb818bceb767 Mon Sep 17 00:00:00 2001
From: s-sakiyama <26-m-s-stella-tecnica@it-college.jp>
Date: Wed, 21 Oct 2026 14:10:37 +0900
Subject: [PATCH] =?UTF-8?q?service=E3=81=AE=E4=BD=9C=E6=88=90=E5=8F=8A?=
 =?UTF-8?q?=E3=81=B3=E4=BB=95=E6=A7=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../example/demo/controller/ReturnConfirmController.java    | 5 ++++-
 .../main/java/com/example/demo/service/RerurnService.java   | 6 +++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/team1/src/main/java/com/example/demo/controller/ReturnConfirmController.java b/team1/src/main/java/com/example/demo/controller/ReturnConfirmController.java
index f2669a8..eef5e7e 100644
--- a/team1/src/main/java/com/example/demo/controller/ReturnConfirmController.java
+++ b/team1/src/main/java/com/example/demo/controller/ReturnConfirmController.java
@@ -31,9 +31,12 @@ public class ReturnConfirmController {
 			//仮の値を入れる
 			Integer id = 1;
 			//申請IDを元に取得
+			ReturnForm resultForm = rerurnService.getReturnForm(id);
+			resultForm.setIdRequest(id);
+
 			//returnFormに値をセット
 			// 画面に返す為の情報をセット
-			model.addAttribute("returnForm", rerurnService.getReturnForm(id));
+			model.addAttribute("returnForm", resultForm);
 			return "returnConfirm";
 		} catch (Exception e) {
 			e.printStackTrace();
diff --git a/team1/src/main/java/com/example/demo/service/RerurnService.java b/team1/src/main/java/com/example/demo/service/RerurnService.java
index 03d1678..a39f7e3 100644
--- a/team1/src/main/java/com/example/demo/service/RerurnService.java
+++ b/team1/src/main/java/com/example/demo/service/RerurnService.java
@@ -1,8 +1,11 @@
 package com.example.demo.service;
 
+import java.util.Optional;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.example.demo.entity.Borrow_booksEntity;
 import com.example.demo.form.ReturnForm;
 import com.example.demo.repository.Book_CollectionRepository;
 import com.example.demo.repository.Borrow_BooksRepository;
@@ -27,7 +30,8 @@ public class RerurnService {
 
 	public ReturnForm getReturnForm(int id) {
 		ReturnForm result = new ReturnForm();
-		var borrow = borrowRepository.findById(id);
+		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());//返却予定日