diff --git a/team1/src/main/java/com/example/demo/controller/LendingListController.java b/team1/src/main/java/com/example/demo/controller/LendingListController.java new file mode 100644 index 0000000..3f9c2bc --- /dev/null +++ b/team1/src/main/java/com/example/demo/controller/LendingListController.java @@ -0,0 +1,35 @@ +package com.example.demo.controller; + +import org.springframework.stereotype.Controller; + +@Controller +public class LendingListController { + +// @GetMapping("/lendingList") +// public String show(Model model) { +// List x = xservice.getX(); +// model.addAttribute("Y", x); +// return "Y"; +// } + + +// HttpSession session; +// +// @Autowired +// public SelectListController(HttpSession session) { +// this.session=session; +// } + +// @RequestMapping("/lendingList") +// public String lendList() { +// return "lendingList"; +// } + +// @RequestMapping(value = lendingList, method = RequestMethod.POST) +// public String select( , Model model) { +// model.addAttribute( +// ); +// return lendingList; +// +// } +} diff --git a/team1/src/main/java/com/example/demo/entity/Book_collectionEntity.java b/team1/src/main/java/com/example/demo/entity/Book_collectionEntity.java index bbedd27..8bda2d8 100644 --- a/team1/src/main/java/com/example/demo/entity/Book_collectionEntity.java +++ b/team1/src/main/java/com/example/demo/entity/Book_collectionEntity.java @@ -1,6 +1,6 @@ package com.example.demo.entity; - -import java.sql.Date; + +import java.sql.Timestamp; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -9,10 +9,13 @@ import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.Table; +import org.springframework.data.annotation.LastModifiedDate; + import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; - + +//テーブル名 @Table(name = "book_collection") @Entity @Data @@ -28,28 +31,28 @@ public class Book_collectionEntity { private Integer idBook; //ISBN - @Column(name = "isbn", nullable = false) + @Column(name = "isbn", nullable = false, length = 13) private String isBn; //書籍名 - @Column(name = "nm_book", nullable = false) + @Column(name = "nm_book", nullable = false, length = 50) private String nmBook; //書籍名よみ - @Column(name = "kn_book", nullable = true) + @Column(name = "kn_book", nullable = true, length = 100) private String knBook; //出版社 - @Column(name = "publisher", nullable = true) + @Column(name = "publisher", nullable = true, length = 50) private String pubLisher; //特記事項 @Column(name = "note text", nullable = true) private String noteText; - //貸出フラグ - @Column(name = "flg_lending", length = 1, nullable = false) - private String flgLending; + //貸出フラグ -> charに変更する + @Column(name = "flg_lending", nullable = false, columnDefinition = "default 0") + private Character flgLending; //更新者 @Column(name = "id_update", nullable = false) @@ -57,7 +60,8 @@ public class Book_collectionEntity { //更新日 @Column(name = "date_update", nullable = false) - private Date dateUpdate; + @LastModifiedDate + private Timestamp dateUpdate; // public static Book_collection convertFrom(Book_collection book_collection) { // // 値を既に持ったインスタンスの生成に、コンストラクタを使用するとこうなります。 @@ -80,7 +84,7 @@ public class Book_collectionEntity { // employeeEntity.setIdBook(searchConditionEmployee.getIdBook()); // employeeEntity.setisBn(searchConditionEmployee.getisBn()); // employeeEntity.setnmBook(searchConditionEmployee.getnmBook()); - + // employeeEntity.setknBook(searchConditionEmployee.knBook()); // employeeEntity.setpublisher(searchConditionEmployee.getpublisher()); // employeeEntity.setnoteText(searchConditionEmployee.getnoteText()); diff --git a/team1/src/main/java/com/example/demo/entity/Borrow_booksEntity.java b/team1/src/main/java/com/example/demo/entity/Borrow_booksEntity.java index 7c6339a..84cbce4 100644 --- a/team1/src/main/java/com/example/demo/entity/Borrow_booksEntity.java +++ b/team1/src/main/java/com/example/demo/entity/Borrow_booksEntity.java @@ -10,6 +10,7 @@ import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import org.hibernate.annotations.Audited.Table; +import org.springframework.data.annotation.LastModifiedDate; import lombok.AllArgsConstructor; import lombok.Data; @@ -53,7 +54,7 @@ public class Borrow_booksEntity { * ステータス * */ @Column(name = "status", nullable = false, columnDefinition = "default 1") - private char status; + private Character status; /* * 承認者 @@ -95,5 +96,6 @@ public class Borrow_booksEntity { * 更新日 * */ @Column(name = "date_update", nullable = false) + @LastModifiedDate private Timestamp dateUpdate; } diff --git a/team1/src/main/java/com/example/demo/entity/EmployeeEntity.java b/team1/src/main/java/com/example/demo/entity/EmployeeEntity.java index 6b61a8b..107738a 100644 --- a/team1/src/main/java/com/example/demo/entity/EmployeeEntity.java +++ b/team1/src/main/java/com/example/demo/entity/EmployeeEntity.java @@ -1,5 +1,7 @@ package com.example.demo.entity; +import java.security.Timestamp; + import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; @@ -35,25 +37,25 @@ public class EmployeeEntity { /** * 社員名 */ - @Column(name = "nm_employee", nullable = false) + @Column(name = "nm_employee", nullable = false, length = 50) private String nmEmployee; /** * 社員よみ */ - @Column(name = "kn_employee", nullable = false) + @Column(name = "kn_employee", nullable = false, length = 100) private String knEmployee; /** * メールアドレス */ - @Column(name = "mail_address", nullable = false) + @Column(name = "mail_address", nullable = false, length = 256) private String MailAddress; /** * パスワード */ - @Column(name = "password", nullable = false) + @Column(name = "password", nullable = false, length = 256) private String Password; /** @@ -72,15 +74,14 @@ public class EmployeeEntity { * 更新者 */ @Column(name = "id_update", nullable = false) - private Integer IdUpdate; + private Integer idUpdate; /** * 更新日 */ @Column(name = "date_update", nullable = false) @LastModifiedDate - private Integer DateUpdate; - + private Timestamp dateUpdate; } // public static EmployeeEntity convertForm(Employee employee) { @@ -137,4 +138,4 @@ public class EmployeeEntity { // getIdUpdate(), // getDateUpdate()); //} -//} +//} \ No newline at end of file diff --git a/team1/src/main/java/com/example/demo/service/LendingListService.java b/team1/src/main/java/com/example/demo/service/LendingListService.java new file mode 100644 index 0000000..7251871 --- /dev/null +++ b/team1/src/main/java/com/example/demo/service/LendingListService.java @@ -0,0 +1,27 @@ +package com.example.demo.service; + +import javax.transaction.Transactional; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.example.demo.entity.EmployeeEntity; +import com.example.demo.repository.Book_CollectionRepository; +import com.example.demo.repository.Borrow_BooksRepository; + +@Service +@Transactional +public class LendingListService { + + @Autowired + private Book_CollectionRepository collection; + @Autowired + private Borrow_BooksRepository borrow; + @Autowired + private EmployeeEntity employee; + + public List getcollectionWithborrow(){ + return collection; + } + +} diff --git a/team1/src/main/java/com/example/demo/service/S.java b/team1/src/main/java/com/example/demo/service/S.java new file mode 100644 index 0000000..3380be8 --- /dev/null +++ b/team1/src/main/java/com/example/demo/service/S.java @@ -0,0 +1,5 @@ +package com.example.demo.service; + +public class S { + +} diff --git a/team1/src/main/resources/templates/lendingList.html b/team1/src/main/resources/templates/lendingList.html new file mode 100644 index 0000000..288c27f --- /dev/null +++ b/team1/src/main/resources/templates/lendingList.html @@ -0,0 +1,45 @@ + + + + + +貸出中書籍一覧 + + + +

+
+ +
+ メニューに戻る +

検索結果

+ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file
申請ID申請者名書籍名申請日貸出日返却予定日操作
+
+ + +
+