Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
341365aa81 | ||
|
|
5a5bfd9112 | ||
|
|
85d1d3715b |
@@ -1,5 +1,7 @@
|
|||||||
package com.example.demo.repository;
|
package com.example.demo.repository;
|
||||||
|
|
||||||
|
import java.util.Optional;
|
||||||
|
|
||||||
import org.springframework.data.jpa.repository.JpaRepository;
|
import org.springframework.data.jpa.repository.JpaRepository;
|
||||||
import org.springframework.stereotype.Repository;
|
import org.springframework.stereotype.Repository;
|
||||||
|
|
||||||
@@ -7,6 +9,8 @@ import com.example.demo.entity.EmployeeEntity;
|
|||||||
|
|
||||||
@Repository
|
@Repository
|
||||||
public interface EmployeeRepository extends JpaRepository<EmployeeEntity, Integer> {
|
public interface EmployeeRepository extends JpaRepository<EmployeeEntity, Integer> {
|
||||||
|
|
||||||
|
//メールアドレスとパスワードに合致するレコード
|
||||||
|
Optional<EmployeeEntity> findByMailAddressAndPassword(String mailAddress, String password);
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -11,6 +11,7 @@ import org.springframework.stereotype.Service;
|
|||||||
import com.example.demo.entity.Book_collectionEntity;
|
import com.example.demo.entity.Book_collectionEntity;
|
||||||
import com.example.demo.entity.Borrow_booksEntity;
|
import com.example.demo.entity.Borrow_booksEntity;
|
||||||
import com.example.demo.form.LendingForm;
|
import com.example.demo.form.LendingForm;
|
||||||
|
import com.example.demo.form.LoginInfoForm;
|
||||||
import com.example.demo.form.ReturnForm;
|
import com.example.demo.form.ReturnForm;
|
||||||
import com.example.demo.form.SearchConditionBookForm;
|
import com.example.demo.form.SearchConditionBookForm;
|
||||||
import com.example.demo.model.LeadingListModel;
|
import com.example.demo.model.LeadingListModel;
|
||||||
@@ -155,4 +156,44 @@ public class ReturnService {
|
|||||||
|
|
||||||
borrowRepository.save(borrow);
|
borrowRepository.save(borrow);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//貸出テーブルの「ステータス」が「1:承認待」の情報を全件取得
|
||||||
|
public List<LeadingListModel> getAwaitingApprovalList() {
|
||||||
|
List<LeadingListModel> result = new ArrayList<LeadingListModel>();
|
||||||
|
|
||||||
|
List<Borrow_booksEntity> 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;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
//メアドとパスワードが合っていれば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();
|
||||||
|
}
|
||||||
|
|
||||||
|
//LoginInfoFormの情報からFlgを返す 0なら一般,1なら管理
|
||||||
|
public Character getUserFlg(LoginInfoForm form) {
|
||||||
|
return employeeRepository.findByMailAddressAndPassword(form.getMailAddress(), form.getPassword()).get()
|
||||||
|
.getFlgAdmin();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user