第2段階2-3の途中まで終了しました。池田

第2段階 2-3の途中まで終了しました。池田
第1段階終了しました。池田
2026-10-14 16:51:43 +09:00 · 2026-10-14 16:47:57 +09:00 · 2026-10-14 15:49:13 +09:00 · 2026-10-09 12:16:11 +09:00
13 changed files with 340 additions and 181 deletions
--- a/build.cmd
+++ b/build.cmd
@@ -0,0 +1,5 @@
+@echo off
+setlocal
+cd /d "%~dp0"
+call mvnw.cmd clean install %*
+endlocal
--- a/pom.xml
+++ b/pom.xml
@@ -17,6 +17,7 @@
    <description>Demo project for Spring Boot</description>
    <properties>
        <java.version>17</java.version>
+        <lombok.version>1.18.34</lombok.version>
    </properties>
    <dependencies>
        <dependency>
@@ -56,10 +57,6 @@
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-validation</artifactId>
        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-databind</artifactId>
--- a/run.cmd
+++ b/run.cmd
@@ -0,0 +1,5 @@
+@echo off
+setlocal
+cd /d "%~dp0"
+call mvnw.cmd spring-boot:run %*
+endlocal
--- a/src/main/java/com/example/rhizome/app/domain/service/SearchDepartment.java
+++ b/src/main/java/com/example/rhizome/app/domain/service/SearchDepartment.java
@@ -1,14 +1,25 @@
 package com.example.rhizome.app.domain.service;

-import com.example.rhizome.app.domain.model.Department;
-import com.example.rhizome.app.domain.model.SearchConditionDepartment;
-
 import java.util.List;

+import com.example.rhizome.app.domain.model.Department;
+import com.example.rhizome.app.domain.model.Employee;
+import com.example.rhizome.app.domain.model.LoginUser;
+import com.example.rhizome.app.domain.model.SearchConditionDepartment;
+
 public interface SearchDepartment {
+
+	List<Department> searchDepartmentBynmDepartment(String nmDepartment);
+
+	List<Department> searchDepartmentByIdDepartment(Integer idDepartment);
+
+	// これはなにをしている？　SearchEmployeeより
+	LoginUser searchLoginUser(String mailAddress);
+
+	Employee searchEmployeeByIdEmployee(Integer idEmployee);
+
 	List<Department> selectAll();

-    List<Department> searchBy(SearchConditionDepartment searchConditionDepartment);
+	List<Department> searchByWithLike(SearchConditionDepartment condition);

-    List<Department> searchByWithLike(SearchConditionDepartment searchConditionDepartment);
 }
--- a/src/main/java/com/example/rhizome/app/domain/service/impl/SearchDepartmentImpl.java
+++ b/src/main/java/com/example/rhizome/app/domain/service/impl/SearchDepartmentImpl.java
@@ -1,17 +1,20 @@
 package com.example.rhizome.app.domain.service.impl;


-import com.example.rhizome.app.domain.model.Department;
-import com.example.rhizome.app.domain.model.SearchConditionDepartment;
-import com.example.rhizome.app.domain.service.SearchDepartment;
-import com.example.rhizome.app.infra.entity.DepartmentEntity;
-import com.example.rhizome.app.infra.repository.DepartmentRepository;
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

-import java.util.List;
+import com.example.rhizome.app.domain.model.Department;
+import com.example.rhizome.app.domain.model.Employee;
+import com.example.rhizome.app.domain.model.LoginUser;
+import com.example.rhizome.app.domain.model.SearchConditionDepartment;
+import com.example.rhizome.app.domain.service.SearchDepartment;
+import com.example.rhizome.app.infra.entity.DepartmentEntity;
+import com.example.rhizome.app.infra.repository.DepartmentRepository;

 /**
 * 部署情報検索系の機能を集約させるサービスクラスです。
@@ -79,4 +82,28 @@ public class SearchDepartmentImpl implements SearchDepartment {
                );

    }
+
+	@Override
+	public List<Department> searchDepartmentBynmDepartment(String nmDepartment) {
+		// TODO 自動生成されたメソッド・スタブ
+		return null;
+	}
+
+	@Override
+	public List<Department> searchDepartmentByIdDepartment(Integer idDepartment) {
+		// TODO 自動生成されたメソッド・スタブ
+		return null;
+	}
+
+	@Override
+	public LoginUser searchLoginUser(String mailAddress) {
+		// TODO 自動生成されたメソッド・スタブ
+		return null;
+	}
+
+	@Override
+	public Employee searchEmployeeByIdEmployee(Integer idEmployee) {
+		// TODO 自動生成されたメソッド・スタブ
+		return null;
+	}
 }
--- a/src/main/java/com/example/rhizome/app/presentation/controller/DeleteEmployeeController.java
+++ b/src/main/java/com/example/rhizome/app/presentation/controller/DeleteEmployeeController.java
@@ -1,6 +1,21 @@
 package com.example.rhizome.app.presentation.controller;


+import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.*;
+
+import java.util.Objects;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.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.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
 import com.example.rhizome.aop.aspect.PermissionCheck;
 import com.example.rhizome.aop.aspect.SessionCheck;
 import com.example.rhizome.app.domain.model.LoginUser;
@@ -12,22 +27,9 @@ import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTa
 import com.example.rhizome.app.presentation.form.DepartmentForm;
 import com.example.rhizome.app.presentation.form.LoginUserForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import javax.servlet.http.HttpSession;
-import java.util.Objects;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.DELETE_EMPLOYEE;

 /**
- * 削除処理のコントロータ
+ * 削除処理のコントローラ
 */
@Controller
 public class DeleteEmployeeController {
--- a/src/main/java/com/example/rhizome/app/presentation/controller/InsertEmployeeConfirmController.java
+++ b/src/main/java/com/example/rhizome/app/presentation/controller/InsertEmployeeConfirmController.java
@@ -1,133 +1,132 @@
-package com.example.rhizome.app.presentation.controller;
-
-import com.example.rhizome.aop.aspect.PermissionCheck;
-import com.example.rhizome.aop.aspect.SessionCheck;
-import com.example.rhizome.app.domain.model.Employee;
-import com.example.rhizome.app.domain.service.SearchDepartment;
-import com.example.rhizome.app.domain.service.SearchEmployee;
-import com.example.rhizome.app.domain.service.impl.SearchDepartmentImpl;
-import com.example.rhizome.app.domain.service.impl.SearchEmployeeImpl;
-import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
-import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.DepartmentForm;
-import com.example.rhizome.app.presentation.form.InsertEmployeeForm;
-import com.example.rhizome.app.presentation.form.MessageForm;
-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 javax.servlet.http.HttpSession;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_CONFIRM;
-
-/**
- * 新規登録者情報チェック用のコントローラ
- */
-@Controller
-public class InsertEmployeeConfirmController {
-
-    // ログ出力用インスタンス
-    private final static Logger LOGGER = Logger.getLogger(InsertEmployeeConfirmController.class.getName());
-
-    // エラーメッセージ用の定数フィールド
-    private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
-
-    HttpSession httpSession;
-    SearchDepartment searchDepartment;
-    SearchEmployee searchEmployee;
-
-    @Autowired
-    public InsertEmployeeConfirmController(
-            HttpSession httpSession,
-            SearchDepartmentImpl searchDepartment,
-            SearchEmployeeImpl searchEmployee
-    ) {
-        this.httpSession = httpSession;
-        this.searchDepartment = searchDepartment;
-        this.searchEmployee = searchEmployee;
-    }
-
-    @ModelAttribute
-    public InsertEmployeeForm insertEmployeeForm() {
-        return new InsertEmployeeForm();
-    }
-
-    /**
-     * 登録情報のチェックを行う
-     *
-     * @param insertEmployeeForm 登録情報
-     * @param model              ビューにデータを渡すためのコンテナ
-     * @return 遷移先の画面
-     */
-    @PermissionCheck
-    @SessionCheck
-    @RequestMapping(value = INSERT_EMPLOYEE_CONFIRM, method = RequestMethod.POST)
-    public String insertEmployeeConfirm(InsertEmployeeForm insertEmployeeForm, Model model) {
-
-        try {
-            // 部署一覧を取得し、画面に返す用のクラスに詰め替える
-            // 作成した部署一覧をセット
-            model.addAttribute(
-                    PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-                    DepartmentForm.convertFrom(
-                            searchDepartment.selectAll()
-                    ));
-
-            // 登録用パラメータチェック
-            List<String> error = insertEmployeeForm.validateParameter();
-
-            // 入力内容に誤りがあるか
-            if (!error.isEmpty()) {
-                // 誤りがあった場合
-                // 誤りがあった箇所のエラーメッセージを表示
-                model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(String.join(", ", error) + "が不正です。"));
-                // 画面に返す為の登録情報をセット
-                model.addAttribute(PageReturnAttributeKeyword.INSERT_EMPLOYEE_FORM, insertEmployeeForm);
-                // 登録画面に遷移
-                return TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_INPUT_HTML;
-            }
-
-            final String DUPLICATION = "既に登録済みのメールアドレスです。";
-
-            // 登録対象のメールアドレスを元に検索
-            List<Employee> employeeList = searchEmployee.searchEmployee(insertEmployeeForm.getMailAddress());
-
-            // 検索結果があるか
-            if (!employeeList.isEmpty()) {
-                // 検索した結果0件ではない場合
-                // 重複を許さないため、エラー処理
-                model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(DUPLICATION));
-                // 画面に返す為の登録情報をセット
-                model.addAttribute(PageReturnAttributeKeyword.INSERT_EMPLOYEE_FORM, insertEmployeeForm);
-                // 登録画面に遷移
-                return TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_INPUT_HTML;
-            }
-
-            // 登録確認ページに遷移
-            model.addAttribute(PageReturnAttributeKeyword.INSERT_EMPLOYEE_FORM, insertEmployeeForm);
-            // 登録確認画面に遷移
-            return TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_CONFIRM_HTML;
-
-
-        } catch (Exception e) {
-            // ログイン情報の破棄
-            httpSession.invalidate();
-
-            e.printStackTrace();
-
-            // エラーログ出力
-            LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-            // エラー画面遷移
-            return TransitionTargetPageNameKeyword.ERROR_HTML;
-        }
-    }
-}
-
-
-
+//package com.example.rhizome.app.presentation.controller;
+//
+//import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.*;
+//
+//import java.util.List;
+//import java.util.logging.Level;
+//import java.util.logging.Logger;
+//
+//import javax.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.rhizome.aop.aspect.PermissionCheck;
+//import com.example.rhizome.aop.aspect.SessionCheck;
+//import com.example.rhizome.app.domain.model.Employee;
+//import com.example.rhizome.app.domain.service.SearchDepartment;
+//import com.example.rhizome.app.domain.service.SearchEmployee;
+//import com.example.rhizome.app.domain.service.impl.SearchDepartmentImpl;
+//import com.example.rhizome.app.domain.service.impl.SearchEmployeeImpl;
+//import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
+//import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
+//import com.example.rhizome.app.presentation.form.DepartmentForm;
+//import com.example.rhizome.app.presentation.form.InsertEmployeeForm;
+//import com.example.rhizome.app.presentation.form.MessageForm;
+//
+///**
+// * 新規登録者情報チェック用のコントローラ
+// */
+//@Controller
+//public class InsertEmployeeConfirmController {
+//
+//    // ログ出力用インスタンス
+//    private final static Logger LOGGER = Logger.getLogger(InsertEmployeeConfirmController.class.getName());
+//
+//    // エラーメッセージ用の定数フィールド
+//    private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
+//
+//    HttpSession httpSession;
+//    SearchDepartment searchDepartment;
+//    SearchEmployee searchEmployee;
+//
+//    @Autowired
+//    public InsertEmployeeConfirmController(
+//            HttpSession httpSession,
+//            SearchDepartmentImpl searchDepartment,
+//            SearchEmployeeImpl searchEmployee
+//    ) {
+//        this.httpSession = httpSession;
+//        this.searchDepartment = searchDepartment;
+//        this.searchEmployee = searchEmployee;
+//    }
+//
+//    @ModelAttribute
+//    public InsertEmployeeForm insertEmployeeForm() {
+//        return new InsertEmployeeForm();
+//    }
+//
+//    /**
+//     * 登録情報のチェックを行う
+//     *
+//     * @param insertEmployeeForm 登録情報
+//     * @param model              ビューにデータを渡すためのコンテナ
+//     * @return 遷移先の画面
+//     */
+//    @PermissionCheck
+//    @SessionCheck
+//    @RequestMapping(value = INSERT_EMPLOYEE_CONFIRM, method = RequestMethod.POST)
+//    public String insertEmployeeConfirm(InsertEmployeeForm insertEmployeeForm, Model model) {
+//
+//        try {
+//            // 部署一覧を取得し、画面に返す用のクラスに詰め替える
+//            // 作成した部署一覧をセット
+//            model.addAttribute(
+//                    PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+//                    DepartmentForm.convertFrom(
+//                            searchDepartment.selectAll()
+//                    ));
+//
+//            // 登録用パラメータチェック
+//            List<String> error = insertEmployeeForm.validateParameter();
+//
+//            // 入力内容に誤りがあるか
+//            if (!error.isEmpty()) {
+//                // 誤りがあった場合
+//                // 誤りがあった箇所のエラーメッセージを表示
+//                model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(String.join(", ", error) + "が不正です。"));
+//                // 画面に返す為の登録情報をセット
+//                model.addAttribute(PageReturnAttributeKeyword.INSERT_EMPLOYEE_FORM, insertEmployeeForm);
+//                // 登録画面に遷移
+//                return TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_INPUT_HTML;
+//            }
+//
+//            final String DUPLICATION = "既に登録済みのメールアドレスです。";
+//
+//            // 登録対象のメールアドレスを元に検索
+//            List<Employee> employeeList = searchEmployee.searchEmployee(insertEmployeeForm.getMailAddress());
+//
+//            // 検索結果があるか
+//            if (!employeeList.isEmpty()) {
+//                // 検索した結果0件ではない場合
+//                // 重複を許さないため、エラー処理
+//                model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(DUPLICATION));
+//                // 画面に返す為の登録情報をセット
+//                model.addAttribute(PageReturnAttributeKeyword.INSERT_EMPLOYEE_FORM, insertEmployeeForm);
+//                // 登録画面に遷移
+//                return TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_INPUT_HTML;
+//            }
+//
+//            // 登録確認ページに遷移
+//            model.addAttribute(PageReturnAttributeKeyword.INSERT_EMPLOYEE_FORM, insertEmployeeForm);
+//            // 登録確認画面に遷移
+//            return TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_CONFIRM_HTML;
+//
+//
+//        } catch (Exception e) {
+//            // ログイン情報の破棄
+//            httpSession.invalidate();
+//
+//            e.printStackTrace();
+//
+//            // エラーログ出力
+//            LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
+//            // エラー画面遷移
+//            return TransitionTargetPageNameKeyword.ERROR_HTML;
+//        }
+//    }
+//}
--- a/src/main/java/com/example/rhizome/app/presentation/controller/InsertEmployeeController.java
+++ b/src/main/java/com/example/rhizome/app/presentation/controller/InsertEmployeeController.java
@@ -1,5 +1,21 @@
 package com.example.rhizome.app.presentation.controller;

+import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.*;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.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.rhizome.aop.aspect.PermissionCheck;
 import com.example.rhizome.aop.aspect.SessionCheck;
 import com.example.rhizome.app.domain.service.RegisterEmployee;
@@ -11,20 +27,6 @@ import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTa
 import com.example.rhizome.app.presentation.form.DepartmentForm;
 import com.example.rhizome.app.presentation.form.InsertEmployeeForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
-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 javax.servlet.http.HttpSession;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.INSERT_EMPLOYEE;

 /**
 * 新規登録用のコントローラ
@@ -193,6 +195,3 @@ public class InsertEmployeeController {
    }

 }
-
-
-
--- a/src/main/java/com/example/rhizome/app/presentation/controller/pageproperty/PageReturnAttributeKeyword.java
+++ b/src/main/java/com/example/rhizome/app/presentation/controller/pageproperty/PageReturnAttributeKeyword.java
@@ -15,4 +15,6 @@ public class PageReturnAttributeKeyword {
    public static final String UPDATE_PERSONAL_EMPLOYEE_USER_FORM = "updatePersonalEmployeeUserForm";
    public static final String EMPLOYEE_INFO_FORM_LIST = "employeeInfoFormList";
    
+	public static final String DEPARTMENT_INFO_FORM_LIST = "departmentInfoFormList";
+
 }
--- a/src/main/java/com/example/rhizome/app/presentation/controller/pageproperty/TransitionTargetPageNameKeyword.java
+++ b/src/main/java/com/example/rhizome/app/presentation/controller/pageproperty/TransitionTargetPageNameKeyword.java
@@ -45,9 +45,19 @@ public class TransitionTargetPageNameKeyword {
    public static final String SHOW_UPDATE_EMPLOYEE = "/showUpdateEmployee";
    public static final String UPDATE_EMPLOYEE_RESULT = "/updateEmployeeResult";

+	public static final String SELECT_DEPARTMENT_INFO = "/selectEmployeeInfo";
+	public static final String SELECT_DEPARTMENT_INFO_FORM_EMPTY = "/selectAll";
+
+	public static final String DELETE_DEPARTMENT = "/deleteDepartment";
+
+
    // Department
    // HTML
+	public static final String SELECT_DEPARTMENT_HTML = "selectDepartment";
+	
    // Controller
+	public static final String SELECT_DEPARTMENT = "/selectDepartment";
+	public static final String SELECT_DEPARTMENT_FORM_EMPTY = "/selectDepartmentAll";
 	
    /**
     * 管理者向けのページリストを返す
--- a/src/main/resources/templates/menu.html
+++ b/src/main/resources/templates/menu.html
@@ -33,6 +33,18 @@
        <td class="description">新規でユーザ追加を行います。</td>
    </tr>
 	
+	<!-- 追記 -->
+	<tr>
+		<td><a class="menuClass" href="javascript:selectDepartmentSubmit()"><i class="fas fa-search"></i> 部署検索 </a>
+		</td>
+		<td class="description">登録済みの部署一覧表示と</br>更新、削除を行います。</td>
+	</tr>
+	<tr>
+		<td><a class="menuClass" href="javascript:selectDepartmentSubmit()"><i class="fas fa-search"></i> 部署登録 </a>
+		</td>
+		<td class="description">新規で部署追加を行います。</td>
+	</tr>
+
 </table>
 </body>

--- a/src/main/resources/templates/selectDepartment.html
+++ b/src/main/resources/templates/selectDepartment.html
@@ -0,0 +1,78 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+
+<head>
+	<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
+	<script th:src="@{/js/common.js}"></script>
+	<link rel="stylesheet" th:href="@{/css/all.css}">
+	<link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
+	<title>部署検索</title>
+</head>
+
+<body>
+	<h1>
+		部署検索条件入力　　　
+		<div class="rightSection">
+			<span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
+			<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
+		</div>
+	</h1>
+
+	<form action="selectDepartment" method="post" th:object="${searchConditionDepartmentForm}">
+		<div class="msgBox error" th:if="${messageError} != null">
+			<span class="error" th:text="${messageError.message}"></span>
+		</div>
+		<table>
+			<tr>
+				<th class="header">部署ID</th>
+				<td>
+					<input placeholder="部署ID" th:field="*{idDepartment}" type="number" />
+				</td>
+			</tr>
+			<tr>
+				<th class="header">部署名</th>
+				<!-- ★部署名の入力欄（type="text"）を作る -->
+				<td>
+					<input placeholder="部署名" th:field="*{nmDepartment}" type="text" />
+				</td>
+			</tr>
+			<tr>
+				<td class="btnArea" colspan="2"><input type="submit" value="検索" /></td>
+				<td class="btnArea" colspan="2"><button onclick="clearInput()">クリア</button></td>
+			</tr>
+		</table>
+	</form>
+
+	<a href="showMenu">メニューに戻る</a>
+	<h1><span>検索結果</span></h1>
+
+	<!-- ★検索結果が1件以上：表(部署ID・部署名)を th:each で繰り返す。変数は departmentFormList -->
+	<!-- departmentFormListから要素を順番に取り出す -->
+	<div th:if="${departmentFormList !=null and departmentFormList.size()> 0}">
+
+		<table>
+			<tr>
+<!--				<th>部署ID</th>-->
+				<th>部署名</th>
+			</tr>
+
+			<!-- 検索結果を1件ずつ取り出して表示 -->
+			<tr th:each="departmentForm : ${departmentFormList}">
+<!--				<td th:text="${departmentForm.idDepartment}"></td>-->
+				<td th:text="${departmentForm.nmDepartment}"></td>
+			</tr>
+		</table>
+
+	</div>
+
+</body>
+<script type="text/javascript">
+
+	<!--  ★部署名の入力欄も空にする（id は th:field が自動で作る） -->
+	function clearInput() {
+		document.getElementById('idDepartment').value = '';
+		document.getElementById('nmDepartment').value = '';
+	}
+</script>
+
+</html>
--- a/src/main/resources/templates/updateDepartmentInput.html
+++ b/src/main/resources/templates/updateDepartmentInput.html
@@ -0,0 +1,12 @@
+// 実装手順書より
+
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Insert title here</title>
+</head>
+<body>
+
+</body>
+</html>
Author	SHA1	Message	Date
s-ikeda	d8c869b73b	第2段階2-3の途中まで終了しました。池田	2026-10-14 16:51:43 +09:00
s-ikeda	d977f90437	第2段階 2-3の途中まで終了しました。池田	2026-10-14 16:47:57 +09:00
s-ikeda	d2828cbf7c	第1段階終了しました。池田	2026-10-14 15:49:13 +09:00
m-mun	aae31940db	ビルドエラーを修正	2026-10-09 12:16:11 +09:00