From 3c6971eefd22dd71e3f3148d7e46e189a546e9c3 Mon Sep 17 00:00:00 2001
From: s-sakiyama <26-m-s-stella-tecnica@it-college.jp>
Date: Tue, 20 Oct 2026 15:54:33 +0900
Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=8D=B4=E5=87=A6=E7=90=86=E7=94=A8?=
=?UTF-8?q?=E3=81=AEhtml,Controller=E4=BD=9C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../controller/ReturnConfirmController.java | 35 +++++
.../controller/returnCompleteController.java | 40 +++++
.../com/example/demo/form/ReturnForm.java | 36 +++++
.../resources/templates/returnComplete.html | 22 +++
.../resources/templates/returnConfirm.html | 137 ++++++++++++++++++
5 files changed, 270 insertions(+)
create mode 100644 team1/src/main/java/com/example/demo/controller/ReturnConfirmController.java
create mode 100644 team1/src/main/java/com/example/demo/controller/returnCompleteController.java
create mode 100644 team1/src/main/java/com/example/demo/form/ReturnForm.java
create mode 100644 team1/src/main/resources/templates/returnComplete.html
create mode 100644 team1/src/main/resources/templates/returnConfirm.html
diff --git a/team1/src/main/java/com/example/demo/controller/ReturnConfirmController.java b/team1/src/main/java/com/example/demo/controller/ReturnConfirmController.java
new file mode 100644
index 0000000..e38bde2
--- /dev/null
+++ b/team1/src/main/java/com/example/demo/controller/ReturnConfirmController.java
@@ -0,0 +1,35 @@
+package com.example.demo.controller;
+
+import java.util.Date;
+
+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;
+
+@Controller
+public class ReturnConfirmController {
+ @ModelAttribute
+ ReturnForm returnForm() {
+ Date date = new Date();
+ return new ReturnForm(1, "テスト名", date, date, date, "ISBN", "書籍名", "出版社", "特記事項");
+ }
+
+ @RequestMapping(value = "/returnConfirm", method = { RequestMethod.POST, RequestMethod.GET })
+ public String returnConfirm(Model model) {
+ try {
+ //申請IDを元に取得
+ //returnFormに値をセット
+ //仮の値を入れる
+ // 画面に返す為の情報をセット
+ model.addAttribute("returnForm", returnForm());
+ return "returnConfirm";
+ } catch (Exception e) {
+ e.printStackTrace();
+ return "エラー画面";
+ }
+ }
+}
diff --git a/team1/src/main/java/com/example/demo/controller/returnCompleteController.java b/team1/src/main/java/com/example/demo/controller/returnCompleteController.java
new file mode 100644
index 0000000..b1f592d
--- /dev/null
+++ b/team1/src/main/java/com/example/demo/controller/returnCompleteController.java
@@ -0,0 +1,40 @@
+package com.example.demo.controller;
+
+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;
+
+//返却完了用のコントローラー
+@Controller
+public class returnCompleteController {
+
+ @ModelAttribute
+ ReturnForm returnForm() {
+ return new ReturnForm();
+ }
+
+ //返却完了画面表示処理
+ @RequestMapping(value = "/returnComplete", method = RequestMethod.POST)
+ public String returnComplete(ReturnForm returnForm) {
+
+ try {
+ System.out.println(returnForm.getNmBook());
+
+ //各種 必要な値をDBから取得,セッションからログイン者の情報
+ //蔵書テーブルの貸出フラグを貸出可、
+ //貸出テーブルのステータスを返却済、
+ //返却日を当日日付、
+ //更新者を更新した人のID、
+ //更新日を当日日付に更新する。
+ return "returnComplete";
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ return "エラー画面";
+ }
+
+ }
+}
diff --git a/team1/src/main/java/com/example/demo/form/ReturnForm.java b/team1/src/main/java/com/example/demo/form/ReturnForm.java
new file mode 100644
index 0000000..2d8839a
--- /dev/null
+++ b/team1/src/main/java/com/example/demo/form/ReturnForm.java
@@ -0,0 +1,36 @@
+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;
+}
diff --git a/team1/src/main/resources/templates/returnComplete.html b/team1/src/main/resources/templates/returnComplete.html
new file mode 100644
index 0000000..d7ae931
--- /dev/null
+++ b/team1/src/main/resources/templates/returnComplete.html
@@ -0,0 +1,22 @@
+
+
+
+
+
+ 書籍返却完了
+
+
+
+
+
+
+書籍の返却が完了しました
+
+
+
+
+
+