Merge branch 'y-watanabe' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/ShareBooks_new into s-tajihi

src/main/java/com/example/demo/entity/BookApproval.java

@@ -0,0 +1,80 @@
+package com.example.demo.entity;
+
+import java.time.LocalDate;
+
+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.Data;
+
+/*
+ * 【JPAエンティティ】department テーブルの「1行」を表すJavaオブジェクト。
+ * JDBCではSQL結果を手動で詰め替えていたが、JPAは
+ * 「クラス⇔テーブル」「フィールド⇔カラム」の対応を書いておけば自動でやってくれる。
+ */
+
+@Data
+@Entity
+@Table(name = "book") // DBのテーブルに対応するエンティティであることを宣言
+public class BookApproval { // 対応テーブル名（クラス名と違うので明示）
+
+	/*
+	 * @Id             … 主キー（エンティティに必須）
+	 * @GeneratedValue … DB側で自動採番。IDENTITY = MySQLのAUTO_INCREMENTを使う
+	 * @Column(name)   … カラム名。フィールド名と違うので明示
+	 */
+	
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "book_id")
+    private Integer bookId;
+
+    @Column(name = "book_manage_id")
+    private String bookManageId;
+
+    @Column(name = "title")
+    private String title;
+
+    @Column(name = "isbn")
+    private String isbn;
+
+    @Column(name = "author")
+    private String author;
+
+    @Column(name = "publisher")
+    private String publisher;
+
+    @Column(name = "publication_date")
+    private LocalDate publicationDate;
+
+    @Column(name = "book_subcategory_id")
+    private Integer bookSubcategoryId;
+
+    @Column(name = "location_id")
+    private Integer locationId;
+
+    @Column(name = "condition_s")
+    private Integer conditionS;
+
+    @Column(name = "created_at")
+    private LocalDate createdAt;
+
+    @Column(name = "updated_at")
+    private LocalDate updatedAt;
+
+    @Column(name = "is_deleted")
+    private Integer isDeleted;
+
+    @Column(name = "donor_id")
+    private Integer donorId;
+
+    @Column(name = "description")
+    private String description;
+
+    @Column(name = "book_approval")
+    private Integer bookApproval;
+}

src/main/java/com/example/demo/form/BookApprovalForm.java

@@ -0,0 +1,51 @@
+package com.example.demo.form;
+
+import java.time.LocalDate;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor //全フィールドを初期化するコンストラクタが生成
+@NoArgsConstructor //デフォルトコンストラクタを自動で生成
+public class BookApprovalForm {
+	
+	//社員ID
+	private String employeeId;
+	
+	//社員名
+	private String employeeName;
+	
+	//タイトル（必須）
+	@NotBlank(message = "タイトルは必須です")
+    private String title;
+
+	//著者名（必須）
+    @NotBlank(message = "著者名は必須です")
+    private String author;
+
+    //本の状態（必須）
+    @NotBlank(message = "本の状態は必須です")
+    private String bookCondition;
+    
+    //出版社（任意）
+    private String publisher;
+
+    //ISBN（任意）
+    private String isbn;
+
+    //出版日（任意）
+    private LocalDate publishDate;
+
+    //備考（任意）
+    //最大400文字
+    @Size(max = 400, message = "備考は400文字以内で入力してください")
+    private String remarks;
+
+}
+
+

src/main/java/com/example/demo/repository/BookApprovalRepository.java

@@ -0,0 +1,12 @@
+package com.example.demo.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import com.example.demo.entity.BookApproval;
+
+
+	@Repository
+	public interface BookApprovalRepository extends JpaRepository<BookApproval, Integer>{
+	}
+

src/main/java/com/example/demo/service/BookApprovalService.java

@@ -0,0 +1,61 @@
+package com.example.demo.service;
+
+import java.time.LocalDate;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.example.demo.entity.BookApproval;
+import com.example.demo.form.BookApprovalForm;
+import com.example.demo.repository.BookApprovalRepository;
+
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class BookApprovalService {
+
+	private final BookApprovalRepository bookApprovalRepository;
+
+	/*
+	 * 【登録(regist)】
+	 * @Transactional … このメソッドを1トランザクションで実行。途中で例外が出れば全ロールバック。
+	 *
+	 * Controllerから来る employee.department は new して departmentId だけ入れた「仮」オブジェクト。
+	 * JPAから見ると管理下にない(detached)状態なので、そのまま保存すると
+	 * 部署まで新規INSERTしようとするなど事故のもと。
+	 * → findById で「管理下(managed)の本物のDepartment」を取り直し、紐付けてから save する。
+	 *
+	 * save()：主キー(employeeId)がnullなのでINSERTになり、AUTO_INCREMENTのIDが採番される。
+	 */
+
+@Transactional
+ public void regist(BookApprovalForm bookApprovalForm) {
+
+	        BookApproval entity = new BookApproval();
+
+	        //必須こうもく
+	        entity.setTitle(bookApprovalForm.getTitle());
+	        entity.setAuthor(bookApprovalForm.getAuthor());
+
+	        //任意
+	        entity.setPublisher(bookApprovalForm.getPublisher());
+	        entity.setIsbn(bookApprovalForm.getIsbn());
+	        entity.setPublicationDate(bookApprovalForm.getPublishDate());
+	        entity.setDescription(bookApprovalForm.getRemarks());
+
+	        //本の状態
+	        entity.setConditionS(Integer.parseInt(bookApprovalForm.getBookCondition()));
+
+	        //寄贈者
+	        entity.setDonorId(Integer.parseInt(bookApprovalForm.getEmployeeId()));
+
+	       
+
+	        //登録日時
+	        entity.setCreatedAt(LocalDate.now());
+	        entity.setUpdatedAt(LocalDate.now());
+
+	        bookApprovalRepository.save(entity);
+	    }
+	}

src/main/resources/templates/bookApproval.html

@@ -7,638 +7,8 @@
 
 	<title>寄贈申請フォーム</title>
 
-	<style>
-		/* =========================
-   共通
-   ========================= */
-
-		* {
-			margin: 0;
-			padding: 0;
-			box-sizing: border-box;
-			font-family: "Yu Gothic", "Meiryo", sans-serif;
-		}
-
-		body {
-			background: #f5f7fa;
-			color: #333;
-		}
-
-
-		/* =========================
-   ヘッダー
-   ========================= */
-
-		.header {
-			height: 60px;
-			background: #fff;
-			border-bottom: 1px solid #e5e7eb;
-
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-
-			padding: 0 20px;
-		}
-
-		.logo {
-			font-size: 20px;
-			font-weight: bold;
-			color: #1b3768;
-		}
-
-		.header-right {
-			display: flex;
-			align-items: center;
-			gap: 8px;
-		}
-
-
-		/* =========================
-   通知
-   ========================= */
-
-		.notification {
-			position: relative;
-
-			display: flex;
-			align-items: center;
-			justify-content: center;
-
-			width: 36px;
-			height: 36px;
-
-			font-size: 18px;
-
-			cursor: pointer;
-			border-radius: 4px;
-
-			transition:
-				background-color 0.2s ease,
-				transform 0.2s ease;
-		}
-
-		.notification:hover {
-			background: #f0f4fa;
-			transform: translateY(-1px);
-		}
-
-		.notification-badge {
-			position: absolute;
-
-			top: 4px;
-			right: 4px;
-
-			width: 7px;
-			height: 7px;
-
-			background: #dc2626;
-			border-radius: 50%;
-
-			border: 1px solid #fff;
-		}
-
-
-		/* =========================
-   サインイン中アカウント
-   ========================= */
-
-		.account {
-			display: inline-flex;
-			align-items: center;
-
-			min-height: 36px;
-
-			padding: 8px 12px;
-
-			border-radius: 4px;
-
-			cursor: pointer;
-
-			color: #333;
-			background: transparent;
-
-			transition:
-				background-color 0.2s ease,
-				color 0.2s ease,
-				box-shadow 0.2s ease;
-		}
-
-		.account:hover {
-			background: #f0f4fa;
-			color: #1659d4;
-
-			box-shadow:
-				0 1px 4px rgba(0, 0, 0, 0.08);
-		}
-
-
-		/* =========================
-   ログアウト
-   ========================= */
-
-		.logout-btn {
-			padding: 8px 15px;
-
-			background: #fff;
-
-			border: 1px solid #d1d5db;
-			border-radius: 4px;
-
-			cursor: pointer;
-
-			color: #333;
-
-			transition:
-				background-color 0.2s ease,
-				border-color 0.2s ease,
-				color 0.2s ease,
-				box-shadow 0.2s ease;
-		}
-
-		.logout-btn:hover {
-			background: #f0f4fa;
-			border-color: #1659d4;
-			color: #1659d4;
-
-			box-shadow:
-				0 1px 4px rgba(22, 89, 212, 0.15);
-		}
-
-
-		/* =========================
-   レイアウト
-   ========================= */
-
-		.wrapper {
-			display: flex;
-			min-height: calc(100vh - 60px);
-		}
-
-
-		/* =========================
-   サイドメニュー
-   ========================= */
-
-		.sidebar {
-			width: 220px;
-
-			background: #002b66;
-			color: #fff;
-		}
-
-		.sidebar-title {
-			padding: 18px;
-
-			font-size: 13px;
-
-			border-bottom:
-				1px solid rgba(255, 255, 255, 0.1);
-		}
-
-		.menu {
-			list-style: none;
-		}
-
-		.menu li {
-			padding: 16px 20px;
-
-			cursor: pointer;
-
-			transition:
-				background-color 0.2s ease,
-				padding-left 0.2s ease;
-		}
-
-		.menu li:hover {
-			background: #0d477f;
-			padding-left: 24px;
-		}
-
-		.menu li.active {
-			background: #1158d8;
-
-			border-radius: 4px;
-
-			margin: 8px;
-		}
-
-		.menu li.active:hover {
-			background: #0d47b5;
-		}
-
-
-		/* =========================
-   メイン
-   ========================= */
-
-		.main {
-			flex: 1;
-			padding: 24px;
-
-			min-width: 0;
-		}
-
-		.breadcrumb {
-			font-size: 12px;
-			color: #64748b;
-
-			margin-bottom: 15px;
-		}
-
-		.page-title {
-			font-size: 38px;
-			color: #173a70;
-
-			margin-bottom: 10px;
-		}
-
-		.description {
-			font-size: 14px;
-
-			margin-bottom: 4px;
-		}
-
-		.required-note {
-			color: #d9534f;
-
-			font-size: 12px;
-
-			margin-bottom: 18px;
-		}
-
-
-		/* =========================
-   カード
-   ========================= */
-
-		.card {
-			background: #fff;
-
-			border: 1px solid #e5e7eb;
-
-			border-radius: 4px;
-		}
-
-		.card-body {
-			padding: 25px;
-		}
-
-		.section-title {
-			font-weight: bold;
-
-			margin-bottom: 15px;
-
-			color: #1f3a64;
-		}
-
-
-		/* =========================
-   フォーム
-   ========================= */
-
-		.form-grid {
-			display: flex;
-			flex-direction: column;
-
-			gap: 18px;
-		}
-
-		.form-group {
-			display: flex;
-			align-items: flex-start;
-		}
-
-		.form-group label {
-			width: 140px;
-
-			flex-shrink: 0;
-
-			font-size: 13px;
-			font-weight: bold;
-
-			padding-top: 10px;
-		}
-
-		.input-area {
-			flex: 1;
-
-			max-width: 700px;
-		}
-
-
-		/* =========================
-   必須・任意
-   ========================= */
-
-		.required {
-			color: #d9534f;
-			font-size: 11px;
-		}
-
-		.optional {
-			color: #555;
-			font-size: 11px;
-		}
-
-
-		/* =========================
-   入力欄
-   ========================= */
-
-		input[type="text"],
-		input[type="date"],
-		select,
-		textarea {
-			width: 100%;
-
-			border: 1px solid #d6dbe3;
-			border-radius: 4px;
-
-			padding: 10px;
-
-			font-size: 13px;
-
-			background: #fff;
-
-			transition:
-				border-color 0.2s ease,
-				box-shadow 0.2s ease;
-		}
-
-		input[type="text"]:focus,
-		input[type="date"]:focus,
-		select:focus,
-		textarea:focus {
-			outline: none;
-
-			border-color: #1659d4;
-
-			box-shadow:
-				0 0 0 2px rgba(22, 89, 212, 0.1);
-		}
-
-		input[readonly] {
-			background: #f3f4f6;
-		}
-
-		textarea {
-			resize: none;
-
-			height: 90px;
-		}
-
-
-		/* =========================
-   補足説明
-   ========================= */
-
-		.help {
-			font-size: 11px;
-
-			color: #6b7280;
-
-			margin-top: 4px;
-		}
-
-		.counter {
-			text-align: right;
-
-			font-size: 11px;
-
-			color: #888;
-
-			margin-top: 3px;
-		}
-
-
-		/* =========================
-   必須・任意項目の区切り
-   ========================= */
-
-		.optional-section {
-			margin-top: 25px;
-
-			padding-top: 22px;
-
-			border-top:
-				1px solid #e5e7eb;
-		}
-
-		.optional-section-title {
-			font-weight: bold;
-
-			color: #1f3a64;
-
-			margin-bottom: 15px;
-		}
-
-
-		/* =========================
-   ボタン
-   ========================= */
-
-		.button-area {
-			display: flex;
-
-			justify-content: space-between;
-			align-items: center;
-
-			margin-top: 20px;
-		}
-
-		.btn {
-			min-width: 120px;
-
-			padding: 10px 20px;
-
-			border-radius: 4px;
-
-			border: 1px solid #d1d5db;
-
-			background: #fff;
-			color: #333;
-
-			cursor: pointer;
-
-			font-weight: bold;
-
-			transition:
-				background-color 0.2s ease,
-				border-color 0.2s ease,
-				color 0.2s ease,
-				box-shadow 0.2s ease,
-				transform 0.2s ease;
-		}
-
-		.btn:hover {
-			background: #f0f4fa;
-
-			border-color: #1659d4;
-
-			color: #1659d4;
-
-			box-shadow:
-				0 2px 5px rgba(0, 0, 0, 0.08);
-
-			transform: translateY(-1px);
-		}
-
-		.btn:active {
-			transform: translateY(0);
-
-			box-shadow: none;
-		}
-
-
-		/* =========================
-   確認ボタン
-   ========================= */
-
-		.btn-primary {
-			background: #1158d8;
-
-			border: 1px solid #1158d8;
-
-			color: #fff;
-		}
-
-		.btn-primary:hover {
-			background: #0d47b5;
-
-			border-color: #0d47b5;
-
-			color: #fff;
-
-			box-shadow:
-				0 2px 6px rgba(17, 88, 216, 0.3);
-
-			transform: translateY(-1px);
-		}
-
-		.btn-primary:active {
-			background: #0b3d9c;
-
-			border-color: #0b3d9c;
-
-			transform: translateY(0);
-
-			box-shadow: none;
-		}
-
-		.right-btns {
-			display: flex;
-
-			gap: 12px;
-		}
-
-
-		/* =========================
-   フッター
-   ========================= */
-
-		.footer {
-			text-align: center;
-
-			margin-top: 25px;
-
-			font-size: 12px;
-
-			color: #666;
-		}
-
-
-		/* =========================
-   レスポンシブ
-   ========================= */
-
-		@media (max-width: 700px) {
-
-			.header {
-				padding: 0 12px;
-			}
-
-			.logo {
-				font-size: 16px;
-			}
-
-			.account {
-				display: none;
-			}
-
-			.sidebar {
-				width: 180px;
-			}
-
-			.main {
-				padding: 18px;
-			}
-
-			.page-title {
-				font-size: 30px;
-			}
-
-			.form-group {
-				flex-direction: column;
-			}
-
-			.form-group label {
-				width: 100%;
-
-				padding-top: 0;
-
-				margin-bottom: 6px;
-			}
-
-			.input-area {
-				width: 100%;
-
-				max-width: none;
-			}
-
-			.button-area {
-				flex-direction: column;
-
-				gap: 12px;
-
-				align-items: stretch;
-			}
-
-			.right-btns {
-				justify-content: flex-end;
-			}
-		}
-
-
-		@media (max-width: 480px) {
-
-			.sidebar {
-				display: none;
-			}
-
-			.main {
-				padding: 15px;
-			}
-
-			.page-title {
-				font-size: 25px;
-			}
-
-			.card-body {
-				padding: 18px;
-			}
-
-			.right-btns {
-				flex-direction: column;
-			}
-
-			.btn {
-				width: 100%;
-			}
-		}
-	</style>
-</head>
 	
+	</head>
 
 <body>
 

src/main/resources/templates/bookApprovalConfirm.html

@@ -821,21 +821,19 @@ textarea {
 
                 <div class="right-btns">
 
-                    <button
+					<button
-                        type="reset"
+					    type="button"
-                        class="btn">
+					    class="btn"
+					    onclick="location.href='/bookApproval'">
 
-                        修正
+					    修正
 
-                    </button>
+					</button>
 
                     <button
-                        type="submit"
+                        type="button"
-                        class="btn btn-primary">
+                        class="btn btn-primary"
-
+						onclick="CompleteModal()">申請送信</button>
-                        確定
-
-                    </button>
 
                 </div>
 
@@ -852,5 +850,15 @@ textarea {
 
 </div>
 
+
+<script>
+
+function CompleteModal() { //関数定義
+    alert("申請が完了しました。");
+    location.href = "/bookApproval";
+}
+
+</script>
+
 </body>
 </html>