From da5cc25c341da9365c125889928c5ab9339d9ae9 Mon Sep 17 00:00:00 2001 From: y-kumaki <2026_04_00501@it-college.co.jp> Date: Mon, 28 Sep 2026 10:52:46 +0900 Subject: [PATCH 1/3] =?UTF-8?q?[ADD]=20=E8=B2=B8=E5=87=BA=E4=B8=80?= =?UTF-8?q?=E8=A6=A7=E8=A1=A8=E7=A4=BA=E3=81=AE=E8=B2=B8=E5=87=BA=E4=B8=AD?= =?UTF-8?q?=E3=81=AE=E3=81=BF=E8=A1=A8=E7=A4=BA=E3=81=95=E3=82=8C=E3=82=8B?= =?UTF-8?q?=E5=87=A6=E7=90=86=E3=82=92=E8=BF=BD=E5=8A=A0=E3=81=97=E3=81=BE?= =?UTF-8?q?=E3=81=97=E3=81=9F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/demo/repository/BookLendRepository.java | 4 ++++ src/main/java/com/example/demo/service/BookLendService.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/example/demo/repository/BookLendRepository.java b/src/main/java/com/example/demo/repository/BookLendRepository.java index 68d2681..5c0b5f1 100644 --- a/src/main/java/com/example/demo/repository/BookLendRepository.java +++ b/src/main/java/com/example/demo/repository/BookLendRepository.java @@ -1,5 +1,7 @@ package com.example.demo.repository; +import java.util.List; + import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; @@ -8,4 +10,6 @@ import com.example.demo.entity.BookLend; @Repository public interface BookLendRepository extends JpaRepository { + List findBybookStatus(Integer bookStatus); + } diff --git a/src/main/java/com/example/demo/service/BookLendService.java b/src/main/java/com/example/demo/service/BookLendService.java index 2296807..1188085 100644 --- a/src/main/java/com/example/demo/service/BookLendService.java +++ b/src/main/java/com/example/demo/service/BookLendService.java @@ -15,7 +15,7 @@ public class BookLendService { private BookLendRepository bookLendRepository; public List findAll() { - return bookLendRepository.findAll(); + return bookLendRepository.findBybookStatus(1); } } \ No newline at end of file From 8c633eabf47ce672001c7c7e66ca299876a29846 Mon Sep 17 00:00:00 2001 From: h-seya <2026_04_00278@it-college.co.jp> Date: Mon, 28 Sep 2026 17:01:38 +0900 Subject: [PATCH 2/3] =?UTF-8?q?[EDIT]:=E5=9B=B3=E6=9B=B8=E4=B8=80=E8=A6=A7?= =?UTF-8?q?=E7=94=BB=E9=9D=A2=E3=81=8B=E3=82=89=E8=B2=B8=E5=87=BA=E5=87=A6?= =?UTF-8?q?=E7=90=86=E7=94=BB=E9=9D=A2=E3=81=AB=E9=81=B7=E7=A7=BB=E5=BE=8C?= =?UTF-8?q?=E3=80=81=E5=9B=B3=E6=9B=B8=E6=83=85=E5=A0=B1=E3=82=92=E5=BC=95?= =?UTF-8?q?=E3=81=8D=E7=B6=99=E3=81=90=E5=87=A6=E7=90=86=E3=82=92=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/controller/BookLendController.java | 44 +++++++++++++++++-- .../example/demo/service/BookLendService.java | 2 +- .../example/demo/service/BookServiceImpl.java | 20 ++++++++- src/main/resources/templates/book.html | 5 ++- 4 files changed, 63 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/example/demo/controller/BookLendController.java b/src/main/java/com/example/demo/controller/BookLendController.java index 6683951..9d1b1dc 100644 --- a/src/main/java/com/example/demo/controller/BookLendController.java +++ b/src/main/java/com/example/demo/controller/BookLendController.java @@ -1,24 +1,62 @@ package com.example.demo.controller; +import java.util.List; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import com.example.demo.entity.Employee; import com.example.demo.repository.EmployeeRepository; +import com.example.demo.service.BookServiceImpl; +import com.example.demo.service.EmployeeService; + +import lombok.RequiredArgsConstructor; @Controller +@RequiredArgsConstructor public class BookLendController { + + @Autowired + private final BookServiceImpl bookServiceImpl; @Autowired private EmployeeRepository employeeRepository; + + @Autowired + private EmployeeService employeeService; - @PostMapping("/bookLend") - public String bookLend(Model model) { +// @PostMapping("/bookLend") +// public String bookLend(Model model) { +// return "bookLend"; +// } + +// @PostMapping("/bookLend/{id}") +// public String bookLend(@PathVariable int id, Model model) { +// System.out.println(id); +// model.addAttribute("book", bookServiceImpl.findById(id)); +// return "bookLend"; +// } + + @PostMapping("/bookLend/{id}") + public String bookLend(@PathVariable int id,Employee employee, Model model) { + + // 図書ID取得 + model.addAttribute("book", bookServiceImpl.findById(id)); + + // 社員ID取得（プルダウン用） + List empList = employeeService.findAll(); + + model.addAttribute("bookLend", employeeService.findAll()); + +// model.addAttribute("employeeList", employeeRepository.findByEmployeeId(employee.getEmployeeId())); +// model.addAttribute("bookLend", employee); + return "bookLend"; } - + // 社員IDを取得してプルダウンに表示させる @PostMapping("/bookLend/employeeId") public String selectEmployeeId(Employee employee, Model model) { diff --git a/src/main/java/com/example/demo/service/BookLendService.java b/src/main/java/com/example/demo/service/BookLendService.java index 962345d..a416702 100644 --- a/src/main/java/com/example/demo/service/BookLendService.java +++ b/src/main/java/com/example/demo/service/BookLendService.java @@ -15,7 +15,7 @@ public class BookLendService { private BookLendRepository bookLendRepository; public List findAll() { - return bookLendRepository.findBybookStatus(1); + return bookLendRepository.findAll(); } } diff --git a/src/main/java/com/example/demo/service/BookServiceImpl.java b/src/main/java/com/example/demo/service/BookServiceImpl.java index da7268a..0b6c00d 100644 --- a/src/main/java/com/example/demo/service/BookServiceImpl.java +++ b/src/main/java/com/example/demo/service/BookServiceImpl.java @@ -1,14 +1,20 @@ package com.example.demo.service; import java.util.List; +import java.util.Optional; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; +import org.springframework.web.server.ResponseStatusException; import com.example.demo.entity.Book; import com.example.demo.repository.BookRepository; +import lombok.RequiredArgsConstructor; + @Service +@RequiredArgsConstructor public class BookServiceImpl { @Autowired @@ -17,9 +23,19 @@ public class BookServiceImpl { public List findAll() { return bookRepository.findAll(); } - - public List findBooks(String keyword){ + + public List findBooks(String keyword) { return bookRepository.searchBooks(keyword); } + public Book findById(int bookId) { + Optional book = bookRepository.findById(bookId); + if (book.isEmpty()) { + throw new ResponseStatusException( + HttpStatus.NOT_FOUND, "図書情報が見つかりません"); + } + + return book.get(); + } + } diff --git a/src/main/resources/templates/book.html b/src/main/resources/templates/book.html index 38231ea..dc8d5d0 100644 --- a/src/main/resources/templates/book.html +++ b/src/main/resources/templates/book.html @@ -80,6 +80,7 @@ + @@ -106,8 +107,8 @@ -
- + + - - - +
@@ -201,6 +129,19 @@ } } + // カレンダーを当日以前の日付を入力できないようにする + const today = new Date(); + function dateFormat(today, format) { + format = format.replace("YYYY", today.getFullYear()); + format = format.replace("MM", ("0" + (today.getMonth() + 1)).slice(-2)); + format = format.replace("DD", ("0" + today.getDate()).slice(-2)); + return format; + } + + const data = dateFormat(today, 'YYYY-MM-DD'); + const field = document.getElementById('returnDate'); + field.setAttribute("min", data); +