貸出中書籍一覧
+ + +貸出中の書籍はありません。
+| 申請ID | 申請者名 | 書籍名 | 申請日 | 貸出日 | 返却予定日 | 操作 |
|---|---|---|---|---|---|---|
| + | + | + | + | + | + | 返却 | +
diff --git a/book-rent/src/main/java/com/example/demo/controller/AdminLoanController.java b/book-rent/src/main/java/com/example/demo/controller/AdminLoanController.java index 0c53e5d..1ff68d7 100644 --- a/book-rent/src/main/java/com/example/demo/controller/AdminLoanController.java +++ b/book-rent/src/main/java/com/example/demo/controller/AdminLoanController.java @@ -1,5 +1,4 @@ package com.example.demo.controller; - import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; @@ -37,7 +36,7 @@ public class AdminLoanController { public String approvalConfirm(@PathVariable Integer id, Model model, RedirectAttributes ra) { try { model.addAttribute("r", loanService.getView(id, Const.STATUS_WAITING)); - return "approvalConfirm"; + return "approvalConfilm"; } catch (BusinessException e) { ra.addFlashAttribute("errorMessage", e.getMessage()); return "redirect:/admin/applications"; @@ -50,7 +49,7 @@ public class AdminLoanController { try { loanService.approve(id, admin); ra.addFlashAttribute("message", "書籍貸出申請を承認しました。"); - return "redirect:/admin/approval/complete"; + return "approvalComplete"; } catch (BusinessException e) { ra.addFlashAttribute("errorMessage", e.getMessage()); return "redirect:/admin/applications"; @@ -63,7 +62,7 @@ public class AdminLoanController { try { loanService.reject(id, admin); ra.addFlashAttribute("message", "書籍貸出申請を却下しました。"); - return "redirect:/admin/approval/complete"; + return "approvalRejected"; } catch (BusinessException e) { ra.addFlashAttribute("errorMessage", e.getMessage()); return "redirect:/admin/applications"; @@ -116,3 +115,4 @@ public class AdminLoanController { return "complete"; } } + diff --git a/book-rent/src/main/java/com/example/demo/service/BookAdminService.java b/book-rent/src/main/java/com/example/demo/service/BookAdminService.java index 2988e02..17f56d1 100644 --- a/book-rent/src/main/java/com/example/demo/service/BookAdminService.java +++ b/book-rent/src/main/java/com/example/demo/service/BookAdminService.java @@ -1,8 +1,5 @@ package com.example.demo.service; - - - import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; @@ -18,6 +15,7 @@ import com.example.demo.form.BookForm; import com.example.demo.repository.BookCollectionRepository; /** BOOK-02:書籍登録、BOOK-03:書籍編集 */ + @Service public class BookAdminService { private final BookCollectionRepository bookRepository; @@ -83,6 +81,7 @@ public class BookAdminService { if (!errors.isEmpty()) throw new BusinessException(String.join(" ", errors)); } + private static void apply(BookCollection b, BookForm f) { b.setIsbn(f.getIsbn()); b.setNmBook(f.getNmBook()); @@ -90,4 +89,5 @@ public class BookAdminService { b.setPublisher(f.getPublisher().isEmpty() ? null : f.getPublisher()); b.setNote(f.getNote().isEmpty() ? null : f.getNote()); } + } diff --git a/book-rent/src/main/resources/templates/approvalComplete.html b/book-rent/src/main/resources/templates/approvalComplete.html new file mode 100644 index 0000000..bedbc40 --- /dev/null +++ b/book-rent/src/main/resources/templates/approvalComplete.html @@ -0,0 +1,31 @@ + + + +
+ +| 申請ID | ++ |
|---|---|
| 申請者名 | ++ |
| 申請日 | ++ |
| ISBN | ++ |
| 書籍名 | ++ |
| 出版社 | ++ |
| 特記事項 | ++ |
| 貸出日 | ++ |
| 返却予定日 | ++ |
貸出中の書籍はありません。
+| 申請ID | 申請者名 | 書籍名 | 申請日 | 貸出日 | 返却予定日 | 操作 |
|---|---|---|---|---|---|---|
| + | + | + | + | + | + | 返却 | +