From 16f4aacf23f445eb581e0a36aaef51ca8235c591 Mon Sep 17 00:00:00 2001 From: s-sakiyama <26-m-s-stella-tecnica@it-college.jp> Date: Thu, 22 Oct 2026 15:15:03 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=E8=B2=B8=E5=87=BA=E7=94=B3=E8=AB=8B?= =?UTF-8?q?=E6=A9=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/demo/service/ReturnService.java | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) 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 abefb36..5e52673 100644 --- a/team1/src/main/java/com/example/demo/service/ReturnService.java +++ b/team1/src/main/java/com/example/demo/service/ReturnService.java @@ -10,6 +10,7 @@ import org.springframework.stereotype.Service; import com.example.demo.entity.Book_collectionEntity; import com.example.demo.entity.Borrow_booksEntity; +import com.example.demo.form.LendingForm; import com.example.demo.form.ReturnForm; import com.example.demo.form.SearchConditionBookForm; import com.example.demo.model.LeadingListModel; @@ -138,4 +139,20 @@ public class ReturnService { } -} + //書籍貸出申請機能 + public void executeLending(LendingForm form, int idEmployee) { + var book_collection = book_CollectionRepository.findById(form.getId_book());//更新したい本のEntityを取得 + book_collection.get().setFlgLending('1');//フラグだけ書き換え + book_CollectionRepository.save(book_collection.get()); + + Borrow_booksEntity borrow = new Borrow_booksEntity();//空の申請レコード + borrow.setIdApproval(idEmployee);//申請者ID + borrow.setIdBook(form.getId_book());//蔵書ID + borrow.setDateRequest(new Date());//申請日 + borrow.setStatus('1');//ステータスを承認待ちに + borrow.setIdUpdate(idEmployee);//更新者ID + borrow.setDateUpdate(new Date());//更新日 + + borrowRepository.save(borrow); + } +} \ No newline at end of file From 85d1d3715b7206afe3d8a619e55fabc523aa5f0f Mon Sep 17 00:00:00 2001 From: s-sakiyama <26-m-s-stella-tecnica@it-college.jp> Date: Thu, 22 Oct 2026 15:32:06 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=E8=B2=B8=E5=87=BA=E3=83=86=E3=83=BC?= =?UTF-8?q?=E3=83=96=E3=83=AB=E3=81=AE=E3=80=8C=E3=82=B9=E3=83=86=E3=83=BC?= =?UTF-8?q?=E3=82=BF=E3=82=B9=E3=80=8D=E3=81=8C=E3=80=8C1:=E6=89=BF?= =?UTF-8?q?=E8=AA=8D=E5=BE=85=E3=80=8D=E3=81=AE=E6=83=85=E5=A0=B1=E3=82=92?= =?UTF-8?q?=E5=85=A8=E4=BB=B6=E5=8F=96=E5=BE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/demo/service/ReturnService.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) 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 5e52673..2e9f0f0 100644 --- a/team1/src/main/java/com/example/demo/service/ReturnService.java +++ b/team1/src/main/java/com/example/demo/service/ReturnService.java @@ -155,4 +155,25 @@ public class ReturnService { borrowRepository.save(borrow); } + + //貸出テーブルの「ステータス」が「1:承認待」の情報を全件取得 + public List getAwaitingApprovalList() { + List result = new ArrayList(); + + List borrow = borrowRepository.findByStatus('1'); + 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; + + } + } \ No newline at end of file From 5a5bfd91125d1d3ac00149cd5747c9277514c192 Mon Sep 17 00:00:00 2001 From: s-sakiyama <26-m-s-stella-tecnica@it-college.jp> Date: Thu, 22 Oct 2026 15:55:31 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=E3=83=AD=E3=82=B0=E3=82=A4=E3=83=B3?= =?UTF-8?q?=E6=A9=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/repository/EmployeeRepository.java | 6 +++++- .../com/example/demo/service/ReturnService.java | 15 +++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/team1/src/main/java/com/example/demo/repository/EmployeeRepository.java b/team1/src/main/java/com/example/demo/repository/EmployeeRepository.java index 9761b26..0baaa73 100644 --- a/team1/src/main/java/com/example/demo/repository/EmployeeRepository.java +++ b/team1/src/main/java/com/example/demo/repository/EmployeeRepository.java @@ -1,5 +1,7 @@ package com.example.demo.repository; +import java.util.Optional; + import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; @@ -7,6 +9,8 @@ import com.example.demo.entity.EmployeeEntity; @Repository public interface EmployeeRepository extends JpaRepository { - + + //メールアドレスとパスワードに合致するレコード + Optional findByMailAddressAndPassword(String mailAddress, String password); } \ No newline at end of file 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 2e9f0f0..145e562 100644 --- a/team1/src/main/java/com/example/demo/service/ReturnService.java +++ b/team1/src/main/java/com/example/demo/service/ReturnService.java @@ -11,6 +11,7 @@ import org.springframework.stereotype.Service; import com.example.demo.entity.Book_collectionEntity; import com.example.demo.entity.Borrow_booksEntity; import com.example.demo.form.LendingForm; +import com.example.demo.form.LoginInfoForm; import com.example.demo.form.ReturnForm; import com.example.demo.form.SearchConditionBookForm; import com.example.demo.model.LeadingListModel; @@ -176,4 +177,18 @@ public class ReturnService { } + //メアドとパスワードが合っていればtureで返す + public boolean canlogin(String mail, String pass) { + if (mail == null || mail.isEmpty() || pass == null || pass.isEmpty()) { + return false; + } + return employeeRepository.findByMailAddressAndPassword(mail, pass).isPresent(); + } + + //LoginInfoFormの情報からidEmployeeを返す + public int getUserID(LoginInfoForm form) { + return employeeRepository.findByMailAddressAndPassword(form.getMailAddress(), form.getPassword()).get() + .getIdEmployee(); + } + } \ No newline at end of file From 341365aa81dcccc49652a28c2bc5a37321f3b64b Mon Sep 17 00:00:00 2001 From: s-sakiyama <26-m-s-stella-tecnica@it-college.jp> Date: Fri, 23 Oct 2026 09:35:24 +0900 Subject: [PATCH 4/4] =?UTF-8?q?LoginInfoForm=E3=81=AE=E6=83=85=E5=A0=B1?= =?UTF-8?q?=E3=81=8B=E3=82=89=E7=AE=A1=E7=90=86=E8=80=85Flg=E3=82=92?= =?UTF-8?q?=E8=BF=94=E3=81=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/example/demo/service/ReturnService.java | 5 +++++ 1 file changed, 5 insertions(+) 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 145e562..2b21f7e 100644 --- a/team1/src/main/java/com/example/demo/service/ReturnService.java +++ b/team1/src/main/java/com/example/demo/service/ReturnService.java @@ -191,4 +191,9 @@ public class ReturnService { .getIdEmployee(); } + //LoginInfoFormの情報からFlgを返す　0なら一般,1なら管理 + public Character getUserFlg(LoginInfoForm form) { + return employeeRepository.findByMailAddressAndPassword(form.getMailAddress(), form.getPassword()).get() + .getFlgAdmin(); + } } \ No newline at end of file