diff --git a/team1/src/main/java/com/example/demo/controller/returnCompleteController.java b/team1/src/main/java/com/example/demo/controller/ReturnCompleteController.java similarity index 57% rename from team1/src/main/java/com/example/demo/controller/returnCompleteController.java rename to team1/src/main/java/com/example/demo/controller/ReturnCompleteController.java index 3362541..38ab939 100644 --- a/team1/src/main/java/com/example/demo/controller/returnCompleteController.java +++ b/team1/src/main/java/com/example/demo/controller/ReturnCompleteController.java @@ -1,16 +1,29 @@ 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(); @@ -21,14 +34,13 @@ public class ReturnCompleteController { public String returnComplete(ReturnForm returnForm) { try { - System.out.println(returnForm.getNmBook()); + //セッションからIDを拾いたい + httpSession.getAttribute(""); + //いったん1ということで + int id = 1; + + rerurnService.setReturn(returnForm.getIdRequest(), id); - //各種 必要な値をDBから取得,セッションからログイン者の情報 - //蔵書テーブルの貸出フラグを貸出可、 - //貸出テーブルのステータスを返却済、 - //返却日を当日日付、 - //更新者を更新した人のID、 - //更新日を当日日付に更新する。 return "returnComplete"; } catch (Exception e) { 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..5bc1b5b 100644 --- a/team1/src/main/java/com/example/demo/controller/ReturnConfirmController.java +++ b/team1/src/main/java/com/example/demo/controller/ReturnConfirmController.java @@ -8,15 +8,15 @@ 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; +import com.example.demo.service.ReturnService; @Controller public class ReturnConfirmController { - RerurnService rerurnService; + ReturnService rerurnService; @Autowired - ReturnConfirmController(RerurnService rerurnService) { + ReturnConfirmController(ReturnService rerurnService) { this.rerurnService = rerurnService; } @@ -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/ReturnService.java similarity index 62% rename from team1/src/main/java/com/example/demo/service/RerurnService.java rename to team1/src/main/java/com/example/demo/service/ReturnService.java index 03d1678..dd7e6b9 100644 --- a/team1/src/main/java/com/example/demo/service/RerurnService.java +++ b/team1/src/main/java/com/example/demo/service/ReturnService.java @@ -1,22 +1,26 @@ package com.example.demo.service; +import java.util.Date; +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; import com.example.demo.repository.EmployeeRepository; @Service -public class RerurnService { +public class ReturnService { Book_CollectionRepository book_CollectionRepository; Borrow_BooksRepository borrowRepository; EmployeeRepository employeeRepository; @Autowired - public RerurnService( + public ReturnService( Book_CollectionRepository book_CollectionRepository, Borrow_BooksRepository borrowRepository, EmployeeRepository employeeRepository) { @@ -27,7 +31,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());//返却予定日 @@ -44,4 +49,17 @@ public class RerurnService { 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()); + } + }