Merge branch 'main' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team1 into y-nakano

機能６のHTML（途中）
2026-10-20 15:58:37 +09:00 · 2026-10-20 15:56:59 +09:00 · 2026-10-20 15:50:07 +09:00 · 2026-10-20 15:49:25 +09:00 · 2026-10-19 17:25:06 +09:00 · 2026-10-19 16:59:25 +09:00
19 changed files with 209 additions and 725 deletions
--- a/team1/pom.xml
+++ b/team1/pom.xml
@@ -74,6 +74,16 @@
 			<artifactId>spring-boot-starter-webmvc-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.example</groupId>
+			<artifactId>HelloSpring</artifactId>
+			<version>0.0.1-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>com.example.rhizome</groupId>
+			<artifactId>EM-Spring</artifactId>
+			<version>0.0.1-SNAPSHOT</version>
+		</dependency>
 	</dependencies>
 
 	<build>
--- a/team1/src/main/java/com/example/demo/controller/LendingListController.java
+++ 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> 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;
+//		
+//	}
+}
--- a/team1/src/main/java/com/example/demo/controller/LoginController.java
+++ b/team1/src/main/java/com/example/demo/controller/LoginController.java
@@ -1,136 +0,0 @@
-package com.example.demo.controller;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import jakarta.servlet.http.HttpSession;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-import com.example.demo.form.LoginInfo;
-import com.example.demo.form.LoginInfo.LoginInfoForm;
-import com.example.demo.form.LoginUserForm;
-import com.example.demo.form.MessageForm;
-
-@Controller
-public class LoginController {
-
-	//
-	private final static Logger LOGGER = Logger.getLogger(LoginController.class.getName());
-
-	//
-	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
-
-	HttpSession httpSession;
-	Login login;
-
-	@Autowired
-	public LoginController(HttpSession httpSession, Login login) {
-		this.httpSession = httpSession;
-		this.login = login;
-	}
-
-	@ModelAttribute
-	public LoginUserForm loginUserForm() {
-		return new LoginUserForm();
-	}
-
-	/**
-	 * 画面から渡ってきたパラメータのチェックを行う
-	 *
-	 * @param loginInfoForm mailAddress, password を保持したインスタンス
-	 * @param model         ビューにデータを渡すためのコンテナ
-	 * @return 遷移先の画面
-	 */
-	@RequestMapping(value = DO_LOGIN, method = RequestMethod.POST)
-	public String doLogin(LoginInfoForm loginInfoForm, Model model) {
-
-		// ログに出力する
-		final String MAIL_ADDRESS_PASSWORD_ERROR = "メールアドレス、パスワードの入力内容に誤りがあります";
-		// 発生しうるErrorに対するメッセージ
-		final String LOGIN_ERROR = "IDまたはパスワードが間違っています";
-
-		try {
-			// mailAddress, password の入力に誤りがあるかチェック
-			if (!LoginUserForm.checkParameter(loginInfoForm)) {
-
-				// mail,passwordが仕様を満たしていない場合
-				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
-						new MessageForm(MAIL_ADDRESS_PASSWORD_ERROR));
-
-				// エラーだった場合に login.html に処理を戻す。mailAddress, password を login.htmlに表示するために
-				// ここで addAttribute する
-				model.addAttribute(PageReturnAttributeKeyword.LOGIN_INFO_FORM, loginInfoForm);
-				// login.html に遷移する様に設定
-				return TransitionTargetPageNameKeyword.LOGIN_HTML;
-			}
-			// Login者情報インスタンスを作成
-			LoginInfo loginInfo = createLoginInfo(httpSession, loginInfoForm);
-
-			// login 可能かチェック
-			if (!login.canLogin(loginInfo)) {
-				// ログイン不可の場合、エラーメッセージをセットして入力された値とともに login.html を再表示
-				// 画面に表示するエラーメッセージをセット
-				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(LOGIN_ERROR));
-				// 画面に表示する mailAddress, password をセット
-				model.addAttribute(PageReturnAttributeKeyword.LOGIN_INFO_FORM, loginInfoForm);
-				// login.html に遷移
-				return TransitionTargetPageNameKeyword.LOGIN_HTML;
-			}
-			// ログイン（インスタンス作成）
-			LoginUser loginUser = login.doLogin(loginInfo);
-
-			// ログイン者の情報をセッション情報に格納
-			// セッションに loginUser 情報を保持し続ける = ログイン中として扱う
-			httpSession.setAttribute(SessionKeyword.LOGIN_USER, LoginUserForm.convertFrom(loginUser));
-
-			// 管理者かチェック
-			if (!loginUser.isAdminUser()) {
-				// 管理者ではない場合直で自分の情報を更新するページに遷移する
-				// 編集対象のログイン者の情報を画面に渡す値にセット
-				model.addAttribute(PageReturnAttributeKeyword.UPDATE_PERSONAL_EMPLOYEE_USER_FORM,
-						UpdatePersonalUserForm.convertFrom(loginUser));
-				// 個人の情報更新ページに遷移
-				return TransitionTargetPageNameKeyword.UPDATE_PERSONAL_EMPLOYEE_INPUT_HTML;
-			}
-			// メニュー画面に遷移
-			return TransitionTargetPageNameKeyword.MENU_HTML;
-
-		} catch (Exception e) {
-			// ログイン情報の破棄
-			httpSession.invalidate();
-			e.printStackTrace();
-			// エラーログ出力
-			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-			// エラー画面に遷移
-			return TransitionTargetPageNameKeyword.ERROR_HTML;
-		}
-	}
-
-	/**
-	 * ログイン者情報のインスタンスを作成
-	 *
-	 * @param httpSession   セッション情報
-	 * @param loginInfoForm mailAddress, password を保持したインスタンス
-	 */
-	private static LoginInfo createLoginInfo(HttpSession httpSession, LoginInfoForm loginInfoForm) {
-		// セッションからログイン者情報を取得
-		LoginUserForm loginUserForm = (LoginUserForm) httpSession.getAttribute(SessionKeyword.LOGIN_USER);
-
-		// セッションにログイン者情報があるか
-		if (loginUserForm != null) {
-			// セッションにログイン者情報がある場合
-			return new LoginInfo(loginUserForm.getMailAddress(), loginUserForm.getPassword());
-		}
-
-		// セッションにない場合は画面からの input 値 を取得
-		return new LoginInfo(
-				loginInfoForm.getMailAddress(),
-				loginInfoForm.getPassword());
-	}
-}
--- a/team1/src/main/java/com/example/demo/controller/ReturnCompleteController.java
+++ b/team1/src/main/java/com/example/demo/controller/ReturnCompleteController.java
@@ -1,52 +0,0 @@
-package com.example.demo.controller;
-
-import jakarta.servlet.http.HttpSession;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-import com.example.demo.form.ReturnForm;
-import com.example.demo.service.ReturnService;
-
-//返却完了用のコントローラー
-@Controller
-public class ReturnCompleteController {
-
-	HttpSession httpSession;
-	ReturnService rerurnService;
-
-	@Autowired
-	public ReturnCompleteController(HttpSession httpSession, ReturnService rerurnService) {
-		this.httpSession = httpSession;
-		this.rerurnService = rerurnService;
-	}
-
-	@ModelAttribute
-	ReturnForm returnForm() {
-		return new ReturnForm();
-	}
-
-	//返却完了画面表示処理
-	@RequestMapping(value = "/returnComplete", method = RequestMethod.POST)
-	public String returnComplete(ReturnForm returnForm) {
-
-		try {
-			//セッションからIDを拾いたい
-			httpSession.getAttribute("");
-			//いったん1ということで
-			int id = 1;
-
-			rerurnService.setReturn(returnForm.getIdRequest(), id);
-
-			return "returnComplete";
-
-		} catch (Exception e) {
-			e.printStackTrace();
-			return "エラー画面";
-		}
-
-	}
-}
--- a/team1/src/main/java/com/example/demo/controller/ReturnConfirmController.java
+++ b/team1/src/main/java/com/example/demo/controller/ReturnConfirmController.java
@@ -1,46 +0,0 @@
-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.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-import com.example.demo.form.ReturnForm;
-import com.example.demo.service.ReturnService;
-
-@Controller
-public class ReturnConfirmController {
-
-	ReturnService rerurnService;
-
-	@Autowired
-	ReturnConfirmController(ReturnService rerurnService) {
-		this.rerurnService = rerurnService;
-	}
-
-	@ModelAttribute
-	ReturnForm returnForm() {
-		return new ReturnForm();
-	}
-
-	@RequestMapping(value = "/returnConfirm", method = { RequestMethod.POST, RequestMethod.GET })
-	public String returnConfirm(Model model) {
-		try {
-			//仮の値を入れる
-			Integer id = 1;
-			//申請IDを元に取得
-			ReturnForm resultForm = rerurnService.getReturnForm(id);
-			resultForm.setIdRequest(id);
-
-			//returnFormに値をセット
-			// 画面に返す為の情報をセット
-			model.addAttribute("returnForm", resultForm);
-			return "returnConfirm";
-		} catch (Exception e) {
-			e.printStackTrace();
-			return "エラー画面";
-		}
-	}
-}
--- 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.util.Date;
+ 
+import java.sql.Timestamp;

 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -14,7 +14,7 @@ import org.springframework.data.annotation.LastModifiedDate;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-
+ 
 //テーブル名
@Table(name = "book_collection")
@Entity
@@ -22,100 +22,102 @@ import lombok.NoArgsConstructor;
@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, length = 13)
 	private String isBn;
-
+	
 	//書籍名
 	@Column(name = "nm_book", nullable = false, length = 50)
-	private String nmBook;
-
+    private String nmBook;
+	
 	//書籍名よみ
 	@Column(name = "kn_book", nullable = true, length = 100)
-	private String knBook;
-
+    private String knBook;
+	
 	//出版社
 	@Column(name = "publisher", nullable = true, length = 50)
-	private String pubLisher;
-
+    private String pubLisher;
+	
 	//特記事項
-	@Column(name = "note", nullable = true)
-	private String noteText;
-
+	@Column(name = "note text", nullable = true)
+    private String noteText;
+	
 	//貸出フラグ   -> charに変更する
 	@Column(name = "flg_lending", nullable = false, columnDefinition = "default 0")
-	private Character flgLending;
-
+    private Character flgLending;
+	
 	//更新者
 	@Column(name = "id_update", nullable = false)
-	private Integer idUpdate;
-
+    private Integer idUpdate;
+	
 	//更新日
-	@Column(name = "date_update", nullable = false)
-	@LastModifiedDate
-	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<book_collection> createbook_collectionList(List<EmployeeEntity> employeeEntityList) {
-	////        return employeeEntityList.stream().map(EmployeeEntity::createbook_collection).toList();
-	////    }
-	//    
-	//    List<book_collection> 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()
-	//        );
-	//    }
+    @Column(name = "date_update", nullable = false)
+    @LastModifiedDate
+    private Timestamp 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<book_collection> createbook_collectionList(List<EmployeeEntity> employeeEntityList) {
+////        return employeeEntityList.stream().map(EmployeeEntity::createbook_collection).toList();
+////    }
+//    
+//    List<book_collection> 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()
+//        );
+//    }
 }
--- a/team1/src/main/java/com/example/demo/entity/Borrow_booksEntity.java
+++ b/team1/src/main/java/com/example/demo/entity/Borrow_booksEntity.java
@@ -1,5 +1,6 @@
 package com.example.demo.entity;

+import java.security.Timestamp;
 import java.util.Date;

 import jakarta.persistence.Column;
@@ -7,9 +8,8 @@ import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
-import jakarta.persistence.Table;

-//import org.hibernate.annotations.Audited.Table;
+import org.hibernate.annotations.Audited.Table;
 import org.springframework.data.annotation.LastModifiedDate;

 import lombok.AllArgsConstructor;
@@ -97,5 +97,5 @@ public class Borrow_booksEntity {
 	 * */
 	@Column(name = "date_update", nullable = false)
 	@LastModifiedDate
-	private Date dateUpdate;
+	private Timestamp dateUpdate;
 }
--- a/team1/src/main/java/com/example/demo/entity/EmployeeEntity.java
+++ b/team1/src/main/java/com/example/demo/entity/EmployeeEntity.java
@@ -1,6 +1,6 @@
 package com.example.demo.entity;

-import java.util.Date;
+import java.security.Timestamp;

 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -81,7 +81,7 @@ public class EmployeeEntity {
 	 */
 	@Column(name = "date_update", nullable = false)
 	@LastModifiedDate
-	private Date dateUpdate;
+	private Timestamp dateUpdate;
 }

 //	public static EmployeeEntity convertForm(Employee employee) {
@@ -138,4 +138,4 @@ public class EmployeeEntity {
 //		getIdUpdate(),
 //		getDateUpdate());
 //}
-//}
+//}
--- a/team1/src/main/java/com/example/demo/form/LoginInfo.java
+++ b/team1/src/main/java/com/example/demo/form/LoginInfo.java
@@ -1,24 +0,0 @@
-package com.example.demo.form;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-public class LoginInfo {
-	//ログインをする人
-	@Data
-	@AllArgsConstructor
-	@NoArgsConstructor
-	public class LoginInfoForm {
-		   /**
-	     * メールアドレス
-	     */
-	    private String mailAddress;
-	    /**
-	     * パスワード
-	     */
-	    private String password;
-
-	}
-
-}
--- a/team1/src/main/java/com/example/demo/form/LoginUserForm.java
+++ b/team1/src/main/java/com/example/demo/form/LoginUserForm.java
@@ -1,107 +0,0 @@
-package com.example.demo.form;
-
-import com.example.demo.form.LoginInfo.LoginInfoForm;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-//ログインをする人
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class LoginUserForm {
-	/**
-     * 社員ID
-     */
-    private Integer idEmployee;
-    /**
-     * 社員名
-     */
-    private String nmEmployee;
-    /**
-     * 社員名よみ
-     */
-    private String knEmployee;
-    /**
-     * メールアドレス
-     */
-    private String mailAddress;
-    /**
-     * パスワード
-     */
-    private String password;
-
-    /**
-     * 管理者フラグ
-     */
-    private Integer flgadmin;
-
-    /**
-     * business 層の LoginUser クラスから画面用（presentation 層）の LoginUserForm に
-     * 変換します。
-     *
-     * @param loginUser business 層の LoginUser インスタンス
-     * @return クラスから画面用（presentation 層）の LoginUserForm
-     */
-    public static LoginUserForm convertFrom(LoginUserForm loginUser) {
-        return new LoginUserForm(
-                loginUser.getIdEmployee(),
-                loginUser.getNmEmployee(),
-                loginUser.getKnEmployee(),
-                loginUser.getMailAddress(),
-                loginUser.getPassword(),
-                loginUser.getFlgAdmin()
-        );
-    }
-
-    /**
-     * 画面用（presentation 層）の LoginUserForm クラスから business 層の LoginUser クラスに
-     * 変換します。
-     *
-     * @param loginUserForm 画面用（presentation 層）の LoginUserForm インスタンス
-     * @return business 層の LoginUser インスタンス
-     */
-    public static LoginUserForm convertTo(LoginUserForm loginUserForm) {
-        return new LoginUserForm(
-                loginUserForm.getIdEmployee(),
-                loginUserForm.getNmEmployee(),
-                loginUserForm.getKnEmployee(),
-                loginUserForm.getMailAddress(),
-                loginUserForm.getPassword(),
-                loginUserForm.getFlgAdmin()
-        );
-    }
-
-    /**
-     * 画面から渡ってきた必須の値が仕様を満たしているか確認
-     *
-     * @param loginInfoForm 画面から渡ってきた mailAddress, password を格納しているインスタンス
-     * @return true:仕様を満たしている , false:仕様を満たしていない
-     */
-    public static boolean checkParameter(LoginInfoForm loginInfoForm) {
-        if (null == loginInfoForm.getMailAddress()) {
-            return false;
-        }
-
-        if (loginInfoForm.getMailAddress().isBlank()) {
-            return false;
-        }
-
-        if (null == loginInfoForm.getPassword()) {
-            return false;
-        }
-
-        return !loginInfoForm.getPassword().isBlank();
-
-    }
-
-    /**
-     * 管理者権限を持っているか確認
-     *
-     * @return true:管理者権限を持っている , false:管理者権限を持っていない
-     */
-    public boolean isAdminUser() {
-        return getFlgAdmin() == 1;
-    }
-}
--- a/team1/src/main/java/com/example/demo/form/MessageForm.java
+++ b/team1/src/main/java/com/example/demo/form/MessageForm.java
@@ -1,14 +0,0 @@
-package com.example.demo.form;
-
-//画面にエラー表示する
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class MessageForm {
-    private String message;
-}
-
--- a/team1/src/main/java/com/example/demo/form/ReturnForm.java
+++ b/team1/src/main/java/com/example/demo/form/ReturnForm.java
@@ -1,36 +0,0 @@
-package com.example.demo.form;
-
-import java.util.Date;
-
-import org.springframework.format.annotation.DateTimeFormat;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class ReturnForm {
-	//申請ID
-	private Integer idRequest;
-	//申請者名//社員名
-	private String nmEmployee;
-	//申請日
-	@DateTimeFormat(pattern = "yyyy-mm-dd")
-	private Date dateRequest;
-	//貸出日
-	@DateTimeFormat(pattern = "yyyy-mm-dd")
-	private Date dateBorrow;
-	//返却予定日
-	@DateTimeFormat(pattern = "yyyy-mm-dd")
-	private Date dateScheduledReturn;
-	//ISBN
-	private String isBn;
-	//書籍名
-	private String nmBook;
-	//出版社
-	private String pubLisher;
-	//特記事項
-	private String noteText;
-}
--- a/team1/src/main/java/com/example/demo/service/LendingListService.java
+++ 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<table> getcollectionWithborrow(){
+		return collection;
+	}
+	
+}
--- a/team1/src/main/java/com/example/demo/service/ReturnService.java
+++ b/team1/src/main/java/com/example/demo/service/ReturnService.java
@@ -1,65 +0,0 @@
-package com.example.demo.service;
-
-import java.util.Date;
-import java.util.Optional;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.example.demo.entity.Borrow_booksEntity;
-import com.example.demo.form.ReturnForm;
-import com.example.demo.repository.Book_CollectionRepository;
-import com.example.demo.repository.Borrow_BooksRepository;
-import com.example.demo.repository.EmployeeRepository;
-
-@Service
-public class ReturnService {
-
-	Book_CollectionRepository book_CollectionRepository;
-	Borrow_BooksRepository borrowRepository;
-	EmployeeRepository employeeRepository;
-
-	@Autowired
-	public ReturnService(
-			Book_CollectionRepository book_CollectionRepository,
-			Borrow_BooksRepository borrowRepository,
-			EmployeeRepository employeeRepository) {
-		this.book_CollectionRepository = book_CollectionRepository;
-		this.borrowRepository = borrowRepository;
-		this.employeeRepository = employeeRepository;
-	}
-
-	public ReturnForm getReturnForm(int id) {
-		ReturnForm result = new ReturnForm();
-		Optional<Borrow_booksEntity> borrow = borrowRepository.findById(id);
-		//		System.out.println(borrow);
-		result.setDateRequest(borrow.get().getDateRequest());//申請日
-		result.setDateBorrow(borrow.get().getDateBorrow());//貸出日
-		result.setDateScheduledReturn(borrow.get().getDateScheduledReturn());//返却予定日
-
-		var emp = employeeRepository.findById(borrow.get().getIdApplicant());
-		result.setNmEmployee(emp.get().getNmEmployee());//申請者名、社員名
-
-		var book = book_CollectionRepository.findById(borrow.get().getIdBook());
-		result.setIsBn(book.get().getIsBn());//ISBN
-		result.setNmBook(book.get().getNmBook());//書籍名
-		result.setPubLisher(book.get().getPubLisher());//出版社
-		result.setNoteText(book.get().getNoteText());
-
-		return result;
-	}
-
-	public void setReturn(int id_request, int id_employee) {
-		var borrow = borrowRepository.findById(id_request);
-		var book = book_CollectionRepository.findById(borrow.get().getIdBook());
-		book.get().setFlgLending('0');//「貸出フラグ」を【貸出可】
-		borrow.get().setStatus('0');//貸出テーブルの「ステータス」を【返却済
-		borrow.get().setDateReturn(new Date());//「返却日」を当日日付
-		borrow.get().setIdUpdate(id_employee);//「更新者」を更新した人のID
-		borrow.get().setDateUpdate(new Date());//「更新日」を当日日付に更新する。
-
-		borrowRepository.save(borrow.get());
-		book_CollectionRepository.save(book.get());
-	}
-
-}
--- a/team1/src/main/java/com/example/demo/service/S.java
+++ b/team1/src/main/java/com/example/demo/service/S.java
@@ -0,0 +1,5 @@
+package com.example.demo.service;
+
+public class S {
+
+}
--- a/team1/src/main/resources/templates/application.html
+++ b/team1/src/main/resources/templates/application.html
@@ -18,7 +18,7 @@
 	<!--クラス名確認すること（現在仮入力）-->
 	<form action="confirmLending" id="lendingForm" method="post" th:object="${lendingForm}">
 		<table>
-			<!--蔵書ID、書籍名はreadonlyにて固定-->
+			<!--蔵所ID、書籍名はreadonlyにて固定-->
 			<tr>
 				<th class="header">蔵書ID</th>
 				<td><input type="text" th:field="*{id_book}" readonly="readonly"></td>
--- a/team1/src/main/resources/templates/lendingList.html
+++ b/team1/src/main/resources/templates/lendingList.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+	
+<head>
+<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
+<title>貸出中書籍一覧</title>
+</head>
+
+<body>
+	<h1>
+		<div class="rightSection">
+			<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
+		</div>
+		<a href="menu">メニューに戻る</a>
+		<h1><span>検索結果</span></h1>
+	</h1>
+	<thead>
+	<tr>
+		<th style="width: 100px;">申請ID</th>
+		<th style="width: 100px;">申請者名</th>
+		<th style="width: 100px;">書籍名</th>
+		<th style="width: 100px;">申請日</th>
+		<th style="width: 100px;">貸出日</th>
+		<th style="width: 100px;">返却予定日</th>
+		<th style="width: 100px;">操作</th>
+	</tr>
+	</thead>
+	<tbody>
+		<tr th:each="">
+			<td th:text="${.idRequest}"></td>
+			<td th:text="${.}"></td>
+			<td th:text="${.}"></td>
+			<td th:text="${.dateRequest}"></td>
+			<td th:text="${.dateBorrow}"></td>
+			<td th:text="${.dateScheduledReturn}"></td>
+			<td>
+				<form action="" method="post" style="display: inline;">
+					<input name="" th:value="${}" type="hidden">
+					<input type="submit" value="返却">
+				</form>
+			</td>
+	</tbody>
+</body>
+</html>
--- a/team1/src/main/resources/templates/returnComplete.html
+++ b/team1/src/main/resources/templates/returnComplete.html
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-	<meta charset="UTF-8">
-	<title>書籍返却完了</title>
-</head>
-
-
-<div style="text-align: right;">
-	<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
-</div>
-<h2 style="text-align: center;">書籍の返却が完了しました</h2>
-
-
-<div style="text-align: center;">
-<!--	コントローラーのメソッド名-->
-<a href="lendingList">貸出中書籍一覧に戻る</a>　|　<a href="showMenu">メニューに戻る</a>
-</div>
-</body>
-
-</html>
--- a/team1/src/main/resources/templates/returnConfirm.html
+++ b/team1/src/main/resources/templates/returnConfirm.html
@@ -1,137 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-	<meta charset="UTF-8">
-	<title>書籍返却確認</title>
-</head>
-<body>
-		<div style="text-align: right;">
-			<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
-		</div>
-	
-
-	<form action ="returnComplete"
-	method="post"
-	th:object="${returnForm}">
-	<table style="margin:auto">
-		<tr>
-			<th class="header">申請ID</th>
-			<td>
-				<label>
-					<input class="readOnly"
-					 name="idRequest"
-					  readonly="readonly"
-					   th:field="*{idRequest}"
-					    type="text" />
-				</label>
-			</td>
-		</tr>
-		<tr>
-			<th class="header">申請者名</th>
-			<td>
-				<label>
-					<input class="readOnly"
-					 name="nmEmployee"
-					  readonly="readonly"
-					   th:field="*{nmEmployee}"
-					    type="text" />
-				</label>
-			</td>
-		</tr>
-		<tr>
-			<th class="header">申請日</th>
-			<td>
-				<label>
-					<input class="readOnly"
-					 name="dateRequest"
-					  readonly="readonly"
-					   th:field="*{dateRequest}"
-					    type="text" />
-				</label>
-			</td>
-		</tr>
-		<tr>
-			<th class="header">ISBN</th>
-			<td>
-				<label>
-					<input class="readOnly"
-					 name="isBn"
-					  readonly="readonly"
-					   th:field="*{isBn}"
-					    type="text" />
-				</label>
-			</td>
-		</tr>
-		<tr>
-			<th class="header">書籍名</th>
-			<td>
-				<label>
-					<input class="readOnly"
-					 name="nmBook"
-					  readonly="readonly"
-					   th:field="*{nmBook}"
-					    type="text" />
-				</label>
-			</td>
-		</tr>
-		<tr>
-			<th class="header">出版社</th>
-			<td>
-				<label>
-					<input class="readOnly"
-					 name="pubLisher"
-					  readonly="readonly"
-					   th:field="*{pubLisher}"
-					    type="text" />
-				</label>
-			</td>
-		</tr>
-		<tr>
-			<th class="header">特記事項</th>
-			<td>
-				<label>
-					<input class="readOnly"
-					 name="noteText"
-					  readonly="readonly"
-					   th:field="*{noteText}"
-					    type="text" />
-				</label>
-			</td>
-		</tr>
-		<tr>
-			<th class="header">貸出日</th>
-			<td>
-				<label>
-					<input class="readOnly"
-					 name="dateBorrow"
-					  readonly="readonly"
-					   th:field="*{dateBorrow}"
-					    type="text" />
-				</label>
-			</td>
-		</tr>
-		<tr>
-			<th class="header">返却予定日</th>
-			<td>
-				<label>
-					<input class="readOnly"
-					 name="dateScheduledReturn"
-					  readonly="readonly"
-					   th:field="*{dateScheduledReturn}"
-					    type="text" />
-				</label>
-			</td>
-		</tr>
-		<tr style="text-align: right;">
-            <td>
-                <input type="submit" value="返却"/>
-            </td>
-        </tr>
-	</table>
-<!--	コントローラーのメソッド名-->
-	<a href="lendingList">貸出中書籍一覧に戻る</a>
-	</form>
-	</body>
-
-</html>
Author	SHA1	Message	Date
y-nakano	49693b28d4	Merge branch 'main' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team1 into y-nakano	2026-10-20 15:58:37 +09:00
y-nakano	4fb0f51dc4	機能６のHTML（途中）	2026-10-20 15:56:59 +09:00
y-nakano	c5142cdfdf	Merge branch 'main' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team1 into y-nakano	2026-10-20 15:50:07 +09:00
y-nakano	53485523b0	no message	2026-10-20 15:49:25 +09:00
y-nakano	6b0fcad592	Merge remote-tracking branch 'origin/s-ikeda' into y-nakano	2026-10-19 17:25:06 +09:00
y-nakano	077b53243a	Merge remote-tracking branch 'origin/m-endo' into y-nakano	2026-10-19 16:59:25 +09:00
y-nakano	ef84f8ff26	Book_collectionのEntity	2026-10-19 15:31:51 +09:00