Serviceの追加

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

@@ -1,7 +1,6 @@
 package com.example.demo.controller;
 
-import java.util.Date;
+import org.springframework.beans.factory.annotation.Autowired;
-
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -9,23 +8,32 @@ 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.RerurnService;
 
 @Controller
 public class ReturnConfirmController {
+
+	RerurnService rerurnService;
+
+	@Autowired
+	ReturnConfirmController(RerurnService rerurnService) {
+		this.rerurnService = rerurnService;
+	}
+
 	@ModelAttribute
 	ReturnForm returnForm() {
-		Date date = new Date();
+		return new ReturnForm();
-		return new ReturnForm(1, "テスト名", date, date, date, "ISBN", "書籍名", "出版社", "特記事項");
 	}
 
 	@RequestMapping(value = "/returnConfirm", method = { RequestMethod.POST, RequestMethod.GET })
 	public String returnConfirm(Model model) {
 		try {
+			//仮の値を入れる
+			Integer id = 1;
 			//申請IDを元に取得
 			//returnFormに値をセット
-			//仮の値を入れる
 			// 画面に返す為の情報をセット
-			model.addAttribute("returnForm", returnForm());
+			model.addAttribute("returnForm", rerurnService.getReturnForm(id));
 			return "returnConfirm";
 		} catch (Exception e) {
 			e.printStackTrace();

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

@@ -9,7 +9,7 @@ import com.example.demo.form.ReturnForm;
 
 //返却完了用のコントローラー
 @Controller
-public class returnCompleteController {
+public class ReturnCompleteController {
 
 	@ModelAttribute
 	ReturnForm returnForm() {

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

@@ -0,0 +1,47 @@
+package com.example.demo.service;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.example.demo.form.ReturnForm;
+import com.example.demo.repository.Book_CollectionRepository;
+import com.example.demo.repository.Borrow_BooksRepository;
+import com.example.demo.repository.EmployeeRepository;
+
+@Service
+public class RerurnService {
+
+	Book_CollectionRepository book_CollectionRepository;
+	Borrow_BooksRepository borrowRepository;
+	EmployeeRepository employeeRepository;
+
+	@Autowired
+	public RerurnService(
+			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();
+		var borrow = borrowRepository.findById(id);
+		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;
+	}
+
+}