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 = borrowRepository.findById(id); + // System.out.println(borrow); result.setDateRequest(borrow.get().getDateRequest());//申請日 result.setDateBorrow(borrow.get().getDateBorrow());//貸出日 result.setDateScheduledReturn(borrow.get().getDateScheduledReturn());//返却予定日