From 3576a7613759dfb052516b073c567c2c3359f8d4 Mon Sep 17 00:00:00 2001 From: s-sakiyama <26-m-s-stella-tecnica@it-college.jp> Date: Wed, 21 Oct 2026 15:36:24 +0900 Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=8D=B4=E3=81=AE=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E9=83=A8=E5=88=86=E3=82=92service=E3=81=AB=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ler.java => ReturnCompleteController.java} | 26 ++++++++++++++----- .../controller/ReturnConfirmController.java | 6 ++--- ...{RerurnService.java => ReturnService.java} | 18 +++++++++++-- 3 files changed, 38 insertions(+), 12 deletions(-) rename team1/src/main/java/com/example/demo/controller/{returnCompleteController.java => ReturnCompleteController.java} (57%) rename team1/src/main/java/com/example/demo/service/{RerurnService.java => ReturnService.java} (69%) 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 eef5e7e..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; } 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 69% 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 a39f7e3..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,5 +1,6 @@ package com.example.demo.service; +import java.util.Date; import java.util.Optional; import org.springframework.beans.factory.annotation.Autowired; @@ -12,14 +13,14 @@ 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) { @@ -48,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()); + } + }