diff --git a/src/main/java/com/example/demo/controller/BookLendController.java b/src/main/java/com/example/demo/controller/BookLendController.java index 21f7693..6683951 100644 --- a/src/main/java/com/example/demo/controller/BookLendController.java +++ b/src/main/java/com/example/demo/controller/BookLendController.java @@ -1,13 +1,30 @@ package com.example.demo.controller; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; import org.springframework.web.bind.annotation.PostMapping; + +import com.example.demo.entity.Employee; +import com.example.demo.repository.EmployeeRepository; + @Controller public class BookLendController { - @PostMapping("/bookLend") - public String welcome() { - return "bookLend"; - } + + @Autowired + private EmployeeRepository employeeRepository; + + @PostMapping("/bookLend") + public String bookLend(Model model) { + return "bookLend"; + } + // 社員IDを取得してプルダウンに表示させる + @PostMapping("/bookLend/employeeId") + public String selectEmployeeId(Employee employee, Model model) { + model.addAttribute("employeeList", employeeRepository.findByEmployeeId(employee.getEmployeeId())); + model.addAttribute("bookLend", employee); + return "bookLend"; + } } diff --git a/src/main/java/com/example/demo/controller/LendListController.java b/src/main/java/com/example/demo/controller/LendListController.java index 7a2cdfe..981e7ac 100644 --- a/src/main/java/com/example/demo/controller/LendListController.java +++ b/src/main/java/com/example/demo/controller/LendListController.java @@ -1,12 +1,30 @@ 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.GetMapping; +import com.example.demo.entity.BookLend; +import com.example.demo.service.BookLendService; + + @Controller public class LendListController { + + @Autowired + private BookLendService lendlistService; + @GetMapping("/lendList") - public String lendList() { + public String list(Model model) { + + List aaa = lendlistService.findAll(); + + // findAllを使って、DBから一覧を取得　でバックで取得したのを確認 + model.addAttribute("list",lendlistService.findAll()); + return "lendList"; } diff --git a/src/main/java/com/example/demo/entity/Book.java b/src/main/java/com/example/demo/entity/Book.java index fab3a3b..9b03577 100644 --- a/src/main/java/com/example/demo/entity/Book.java +++ b/src/main/java/com/example/demo/entity/Book.java @@ -26,7 +26,7 @@ public class Book { private int bookId; // 図書管理ID（BK-1など） - @Column(name = "book_manage_id", nullable = true) + @Column(name = "book_manage_id", nullable = true, unique = true) private String bookManageId; // タイトル @@ -78,7 +78,7 @@ public class Book { // 寄贈者社員ID?? @ManyToOne - @JoinColumn(name = "donor_id", nullable = false) + @JoinColumn(name = "donor_id", nullable = true) private Employee employee; //備考 diff --git a/src/main/java/com/example/demo/entity/BookLend.java b/src/main/java/com/example/demo/entity/BookLend.java index 970526f..539659e 100644 --- a/src/main/java/com/example/demo/entity/BookLend.java +++ b/src/main/java/com/example/demo/entity/BookLend.java @@ -8,6 +8,7 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import jakarta.persistence.OneToOne; import jakarta.persistence.Table; @@ -28,9 +29,9 @@ public class BookLend { @JoinColumn(name = "book_manage_id", referencedColumnName = "book_manage_id",nullable = false) private Book book; - // 図書管理ID（BK-1など） - @Column(name = "employee_id", nullable = false) - private Integer employeeId; + @ManyToOne + @JoinColumn(name = "employee_id", nullable = false) + private Employee employeeBooklend; // 貸出日 @Column(name = "book_lend_date", nullable = false) diff --git a/src/main/java/com/example/demo/entity/Employee.java b/src/main/java/com/example/demo/entity/Employee.java index f5a3fda..5465caa 100644 --- a/src/main/java/com/example/demo/entity/Employee.java +++ b/src/main/java/com/example/demo/entity/Employee.java @@ -34,4 +34,7 @@ public class Employee { @OneToMany(mappedBy = "employee") private List employees = new ArrayList<>(); + @OneToMany(mappedBy = "employeeBooklend") + private List employeesBooklend = new ArrayList<>(); + } diff --git a/src/main/java/com/example/demo/form/BookForm.java b/src/main/java/com/example/demo/form/BookForm.java deleted file mode 100644 index bb2ecf0..0000000 --- a/src/main/java/com/example/demo/form/BookForm.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.example.demo.form; - -public class BookForm { - -} diff --git a/src/main/java/com/example/demo/form/BookLendForm.java b/src/main/java/com/example/demo/form/BookLendForm.java new file mode 100644 index 0000000..ecf8f1f --- /dev/null +++ b/src/main/java/com/example/demo/form/BookLendForm.java @@ -0,0 +1,7 @@ +package com.example.demo.form; + +// 図書の貸出処理に使用予定 + +public class BookLendForm { + +} diff --git a/src/main/java/com/example/demo/repository/BookLendRepository.java b/src/main/java/com/example/demo/repository/BookLendRepository.java new file mode 100644 index 0000000..68d2681 --- /dev/null +++ b/src/main/java/com/example/demo/repository/BookLendRepository.java @@ -0,0 +1,11 @@ +package com.example.demo.repository; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import com.example.demo.entity.BookLend; + +@Repository +public interface BookLendRepository extends JpaRepository { + +} diff --git a/src/main/java/com/example/demo/repository/EmployeeRepository.java b/src/main/java/com/example/demo/repository/EmployeeRepository.java new file mode 100644 index 0000000..12605e9 --- /dev/null +++ b/src/main/java/com/example/demo/repository/EmployeeRepository.java @@ -0,0 +1,12 @@ +package com.example.demo.repository; + +import java.util.List; + +import org.springframework.data.jpa.repository.JpaRepository; + +import com.example.demo.entity.Employee; + +public interface EmployeeRepository extends JpaRepository{ + + List findByEmployeeId(Integer employeeId); +} diff --git a/src/main/java/com/example/demo/service/BookLendService.java b/src/main/java/com/example/demo/service/BookLendService.java new file mode 100644 index 0000000..a416702 --- /dev/null +++ b/src/main/java/com/example/demo/service/BookLendService.java @@ -0,0 +1,21 @@ +package com.example.demo.service; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.example.demo.entity.BookLend; +import com.example.demo.repository.BookLendRepository; + +@Service +public class BookLendService { + + @Autowired + private BookLendRepository bookLendRepository; + + public List findAll() { + return bookLendRepository.findAll(); + } + +} diff --git a/src/main/java/com/example/demo/service/BookService.java b/src/main/java/com/example/demo/service/BookService.java deleted file mode 100644 index 6d92083..0000000 --- a/src/main/java/com/example/demo/service/BookService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.example.demo.service; - -import java.util.List; - -import com.example.demo.entity.Book; - -public interface BookService { - String booklist(Book book); - - List findAll(); -} diff --git a/src/main/resources/templates/book.html b/src/main/resources/templates/book.html index 4063ceb..199aabd 100644 --- a/src/main/resources/templates/book.html +++ b/src/main/resources/templates/book.html @@ -17,7 +17,7 @@ - + @@ -30,14 +30,14 @@ - - + + - - + + @@ -47,52 +47,43 @@ - + - - - - - + + + + +
図書ID図書管理ID ISBN タイトル 著者名登録日時 更新日時 寄贈者貸出状態??操作??貸出状態操作
+ + +
+ + +
+
+ + +
+
+ + +
+
- - - - - - -
- -
diff --git a/src/main/resources/templates/bookLend.html b/src/main/resources/templates/bookLend.html index 5f90131..fe4a3c2 100644 --- a/src/main/resources/templates/bookLend.html +++ b/src/main/resources/templates/bookLend.html @@ -1,32 +1,208 @@ - + + - -図書貸出処理 + + 図書貸出処理 + - 図書貸出処理 -
-
-
- -
-
+

+ 図書貸出処理 +

-
+

+ 以下の図書を貸出します。貸出先と貸出日・返却予定日を入力してください。 +

+ +

+ 図書情報 +

+ +
+ + + + + + + + + + + + + + + + + + + + + + + + +
+ 図書管理ID + + （図書管理IDをここに表示させる） +
+ 図書タイトル + + （タイトルをここに表示させる） +
+ 著者名 + + （著者名をここに表示させる） +
+ ISBN + + （ISBNをここに表示させる） +
+
+ +

+ 社員情報 +

+ +
+ +
+ + + + + + +
+ +
+ + + + +
+ +
+ +

+ 貸出・返却日入力 +

+ +
+ +
+ + + + + +
+ ※ 現在の日付が自動で設定されます。 +
+ +
+ +
+ + + + + +
+ ※ 数値（1以上）で入力してください。 +
+ +
+ +
+ + + + + +
+ ※ カレンダーから日付を選択してください。 +
+ +
+ ※ 現在の日付より前は選択できません。 +
+ +
+ +
+ +
+ + + 注意事項 + + +
    +
  • + 貸出処理を行うと、対象の図書のステータスが「貸出中」に変更されます。 +
    • + +
  • + 返却予定日を必ず指定してください。 +
    • +
+ +
+ +
+
+ +
+ +
+ +
+ +
+ + + \ No newline at end of file diff --git a/src/main/resources/templates/lendList.html b/src/main/resources/templates/lendList.html index 2f9065a..36b7f9d 100644 --- a/src/main/resources/templates/lendList.html +++ b/src/main/resources/templates/lendList.html @@ -1,17 +1,48 @@ - + 貸出中図書一覧 +

貸出中図書一覧

- +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
社員ID社員名管理IDタイトル返却予定日超過日数
+ +