diff --git a/team1/src/main/java/com/example/demo/model/LeadingListModel.java b/team1/src/main/java/com/example/demo/model/LeadingListModel.java new file mode 100644 index 0000000..09a2fa4 --- /dev/null +++ b/team1/src/main/java/com/example/demo/model/LeadingListModel.java @@ -0,0 +1,18 @@ +package com.example.demo.model; + +import java.util.Date; + +import lombok.AllArgsConstructor; +import lombok.Data; + +@Data +@AllArgsConstructor +public class LeadingListModel { + //データの保持 + private final Integer idRequest; + private final String nmBook; + private final String nmEmployee; + private final Date dateRequest; + private final Date dateBorrow; + private final Date dateScheduledReturn; +} diff --git a/team1/src/main/java/com/example/demo/repository/Borrow_BooksRepository.java b/team1/src/main/java/com/example/demo/repository/Borrow_BooksRepository.java index a1595fc..865b052 100644 --- a/team1/src/main/java/com/example/demo/repository/Borrow_BooksRepository.java +++ b/team1/src/main/java/com/example/demo/repository/Borrow_BooksRepository.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; @@ -7,5 +9,5 @@ import com.example.demo.entity.Borrow_booksEntity; @Repository public interface Borrow_BooksRepository extends JpaRepository { - + List findByStatus(Character status); } diff --git a/team1/src/main/java/com/example/demo/service/ReturnService.java b/team1/src/main/java/com/example/demo/service/ReturnService.java index 7821f1c..abefb36 100644 --- a/team1/src/main/java/com/example/demo/service/ReturnService.java +++ b/team1/src/main/java/com/example/demo/service/ReturnService.java @@ -1,5 +1,6 @@ package com.example.demo.service; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Optional; @@ -11,6 +12,7 @@ import com.example.demo.entity.Book_collectionEntity; import com.example.demo.entity.Borrow_booksEntity; import com.example.demo.form.ReturnForm; import com.example.demo.form.SearchConditionBookForm; +import com.example.demo.model.LeadingListModel; import com.example.demo.repository.Book_CollectionRepository; import com.example.demo.repository.Borrow_BooksRepository; import com.example.demo.repository.EmployeeRepository; @@ -117,4 +119,23 @@ public class ReturnService { noteText); } + public List getBorrowList() { + List result = new ArrayList(); + + List borrow = borrowRepository.findByStatus('2'); + for (Borrow_booksEntity borrow_booksEntity : borrow) { + String nmEmployee = employeeRepository.findById(borrow_booksEntity.getIdApplicant()).get().getNmEmployee(); + String nmBook = book_CollectionRepository.findById(borrow_booksEntity.getIdBook()).get().getNmBook(); + LeadingListModel a = new LeadingListModel(borrow_booksEntity.getIdRequest(), + nmEmployee, + nmBook, + borrow_booksEntity.getDateRequest(), + borrow_booksEntity.getDateBorrow(), + borrow_booksEntity.getDateScheduledReturn()); + result.add(a); + } + return result; + + } + }