From a3f2c47f898e3600aba7f17e8f580cde8bfbf246 Mon Sep 17 00:00:00 2001 From: a-takayama <26-a-takayama-scm@it-college.co.jp> Date: Mon, 19 Oct 2026 15:35:57 +0900 Subject: [PATCH 1/5] Book_collectionentity --- .project | 11 ++ .../demo/entity/Book_collectionEntity.java | 116 +++++++++++++++++- 2 files changed, 126 insertions(+), 1 deletion(-) create mode 100644 .project diff --git a/.project b/.project new file mode 100644 index 0000000..a59a30a --- /dev/null +++ b/.project @@ -0,0 +1,11 @@ + + + last-group-delevelopment-team1 + + + + + + + + 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 c755eb6..b761192 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,5 +1,119 @@ package com.example.demo.entity; + +import java.sql.Date; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Table(name = "book_collection") +@Entity +@Data +@NoArgsConstructor +@AllArgsConstructor public class Book_collectionEntity { - + + + //蔵書ID + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "id_book", nullable = false) + private Integer idBook; + + //ISBN + @Column(name = "isbn", nullable = false) + private String isBn; + + //書籍名 + @Column(name = "nm_book", nullable = false) + private String nmBook; + + //書籍名よみ + @Column(name = "kn_book", nullable = true) + private String knBook; + + //出版社 + @Column(name = "publisher", nullable = true) + private String pubLisher; + + //特記事項 + @Column(name = "note text", nullable = true) + private String noteText; + + //貸出フラグ + @Column(name = "flg_lending", length = 1, nullable = false) + private String flgLending; + + //更新者 + @Column(name = "id_update", nullable = false) + private Integer idUpdate; + + //更新日 + @Column(name = "date_update", nullable = false) + private Date dateUpdate; + +// public static Book_collection convertFrom(Book_collection book_collection) { +// // 値を既に持ったインスタンスの生成に、コンストラクタを使用するとこうなります。 +// return new Book_collection Entity( +// book_colletion.getIdBook(), +// book_colletion.getisBn(), +// book_colletion.getnmBook(), +// book_colletion..getknBook(), +// book_colletion.getpublisher(), +// book_colletion.getnoteText(), +// book_colletion.getflgLending(), +// book_colletion.getidUpdate(), +// book_colletion.getdateUupdate() +// ); +// +//} +//public static EmployeeEntity convertFrom(SearchConditionEmployee searchConditionEmployee) { +// EmployeeEntity employeeEntity = new EmployeeEntity(); +// +// employeeEntity.setIdBook(searchConditionEmployee.getIdBook()); +// employeeEntity.setisBn(searchConditionEmployee.getisBn()); +// employeeEntity.setnmBook(searchConditionEmployee.getnmBook()); + +// employeeEntity.setknBook(searchConditionEmployee.knBook()); +// employeeEntity.setpublisher(searchConditionEmployee.getpublisher()); +// employeeEntity.setnoteText(searchConditionEmployee.getnoteText()); +// employeeEntity.setflgLending(searchConditionEmployee.getflgLending()); +// employeeEntity.setidUpdate(searchConditionEmployee.getidUpdate()); +// employeeEntity.setdateUpdate(searchConditionEmployee.getdateUupdate()); + + +// +//// public static List createbook_collectionList(List employeeEntityList) { +//// return employeeEntityList.stream().map(EmployeeEntity::createbook_collection).toList(); +//// } +// +// List book_collectionList = new ArrayList<>(); +// for(book_collectionEntity book_collectionEntity:employeeEntityList){ +// book_collection employee = book_collectionEntity.createbook_collection(book_collectionEntity); +// book_collectionList.add(employee); +// } +// return employeeList; +// +// +// public LoginUser createLoginUser() { +// // 値を既に持ったインスタンスの生成に、コンストラクタを使用するとこうなります。 +// return new LoginUser( +// getidBook(), +// getisBn(), +// getnmBook(), +// getknBook(), +// getpublisher(), +// getnoteText(), +// getflgLending(), +// getidUpdate(), +// getdateUpdate() +// ); +// } } From 1b26da2ed4a9d6858f360cafa0a8cc27e6a0e78d Mon Sep 17 00:00:00 2001 From: y-ogawa <26-y-ogawa-tmn@it-college.co.jp> Date: Mon, 19 Oct 2026 16:45:55 +0900 Subject: [PATCH 2/5] =?UTF-8?q?book=5Fcollection=E3=81=A8borrow=5Fbook?= =?UTF-8?q?=E3=81=AEentity=E4=BF=AE=E6=AD=A3=E3=81=A7=E3=81=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/example/demo/entity/Book_collectionEntity.java | 7 +++++-- .../java/com/example/demo/entity/Borrow_booksEntity.java | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) 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 b761192..6ad4464 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,6 +9,8 @@ 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; @@ -57,7 +59,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) { // // 値を既に持ったインスタンスの生成に、コンストラクタを使用するとこうなります。 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 221eb02..d19a28d 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; @@ -97,5 +98,6 @@ public class Borrow_booksEntity { * 更新日 * */ @Column(name = "date_update", nullable = false) + @LastModifiedDate private Timestamp dateUpdate; } From d8b29c784b71ddc8c0c680ee1cea99980d33bc92 Mon Sep 17 00:00:00 2001 From: s-ikeda <26-s-ikeda-tmn@it-college.co.jp> Date: Mon, 19 Oct 2026 16:52:25 +0900 Subject: [PATCH 3/5] =?UTF-8?q?Borrow=5FBooksEntity=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/demo/entity/Borrow_booksEntity.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) 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 221eb02..7c6339a 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 @@ -20,6 +20,7 @@ import lombok.NoArgsConstructor; @Data @NoArgsConstructor @AllArgsConstructor + public class Borrow_booksEntity { /* @@ -51,11 +52,8 @@ public class Borrow_booksEntity { /* * ステータス * */ - @Column(name = "status", nullable = false) - private char 返却済 = 0; - private char 承認待 = 1; - private char 貸出中 = 2; - private char 却下 = 9; + @Column(name = "status", nullable = false, columnDefinition = "default 1") + private char status; /* * 承認者 From 37e9cb3be18c7b5ee885692141462568d2f94b54 Mon Sep 17 00:00:00 2001 From: a-takayama <26-a-takayama-scm@it-college.co.jp> Date: Mon, 19 Oct 2026 16:53:13 +0900 Subject: [PATCH 4/5] =?UTF-8?q?Book=5FcollectionEntity=E9=80=94=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/demo/entity/Book_collectionEntity.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 b761192..b6953e4 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 @@ -13,6 +13,7 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +//テーブル名 @Table(name = "book_collection") @Entity @Data @@ -47,7 +48,7 @@ public class Book_collectionEntity { @Column(name = "note text", nullable = true) private String noteText; - //貸出フラグ + //貸出フラグ -> charに変更する @Column(name = "flg_lending", length = 1, nullable = false) private String flgLending; From a26978a6901a3e74cc57d29c2aaf11e47f5ee92b Mon Sep 17 00:00:00 2001 From: y-ogawa <26-y-ogawa-tmn@it-college.co.jp> Date: Mon, 19 Oct 2026 17:22:22 +0900 Subject: [PATCH 5/5] =?UTF-8?q?=E6=9C=80=E4=BF=AE=E6=AD=A3=E3=81=A7?= =?UTF-8?q?=E3=81=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/demo/entity/Book_collectionEntity.java | 4 ++-- .../main/java/com/example/demo/entity/Borrow_booksEntity.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 21a88f6..d85471e 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 @@ -51,8 +51,8 @@ public class Book_collectionEntity { private String noteText; //貸出フラグ -> charに変更する - @Column(name = "flg_lending", length = 1, nullable = false) - private String flgLending; + @Column(name = "flg_lending", nullable = false, columnDefinition = "default 0") + private Character flgLending; //更新者 @Column(name = "id_update", nullable = false) 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 6aec336..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 @@ -54,7 +54,7 @@ public class Borrow_booksEntity { * ステータス * */ @Column(name = "status", nullable = false, columnDefinition = "default 1") - private char status; + private Character status; /* * 承認者