no message

2026-09-10 13:50:10 +09:00
29 changed files with 536 additions and 807 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,4 @@
+/target/
+/bin/
+.classpath
+.project
--- a/.settings/.jsdtscope
+++ b/.settings/.jsdtscope
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/webapp"/>
+	<classpathentry excluding="**/node_modules/*|**/*.min.js|**/bower_components/*" kind="src" path="target/m2e-wtp/web-resources"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+		<attributes>
+			<attribute name="hide" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+	<classpathentry kind="output" path=""/>
+</classpath>
--- a/.settings/org.eclipse.core.resources.prefs
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
+encoding//src/test/java=UTF-8
+encoding//src/test/resources=UTF-8
+encoding/<project>=UTF-8
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,11 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.methodParameters=generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=17
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="EM-Spring-0.0.1-SNAPSHOT">
+        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
+        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
+        <property name="context-root" value="EM-Spring"/>
+        <property name="java-output-path" value="/EM-Spring/target/classes"/>
+    </wb-module>
+</project-modules>
--- a/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <fixed facet="wst.jsdt.web"/>
+  <installed facet="java" version="17"/>
+  <installed facet="jst.web" version="4.0"/>
+  <installed facet="wst.jsdt.web" version="1.0"/>
+</faceted-project>
--- a/.settings/org.eclipse.wst.jsdt.ui.superType.container
+++ b/.settings/org.eclipse.wst.jsdt.ui.superType.container
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
--- a/.settings/org.eclipse.wst.jsdt.ui.superType.name
+++ b/.settings/org.eclipse.wst.jsdt.ui.superType.name
@@ -0,0 +1 @@
+Window
--- a/.settings/org.eclipse.wst.validation.prefs
+++ b/.settings/org.eclipse.wst.validation.prefs
@@ -0,0 +1,2 @@
+disabled=06target
+eclipse.preferences.version=1
--- a/src/main/java/com/example/rhizome/app/domain/service/impl/RegisterDepartmentImpl.java
+++ b/src/main/java/com/example/rhizome/app/domain/service/impl/RegisterDepartmentImpl.java
@@ -1,35 +0,0 @@
-package com.example.rhizome.app.domain.service.impl;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.example.rhizome.app.domain.model.Department;
-import com.example.rhizome.app.domain.service.RegisterDepartment;
-import com.example.rhizome.app.infra.entity.DepartmentEntity;
-import com.example.rhizome.app.infra.repository.DepartmentRepository;
-
-/**
- * Department テーブルの登録系の機能を集約させるサービスクラスです。
- */
-@Service
-@Transactional
-public class RegisterDepartmentImpl implements RegisterDepartment {
-
-	DepartmentRepository departmentRepository;
-
-	@Autowired
-	public RegisterDepartmentImpl(DepartmentRepository departmentRepository) {
-		this.departmentRepository = departmentRepository;
-	}
-
-	/**
-	 * employee インスタンスの内容を登録する
-	 *
-	 * @param employee 登録対象のデータ
-	 */
-	public void registerDepartment(Department department) {
-		departmentRepository.save(DepartmentEntity.convertFrom(department));
-	}
-
-}
--- 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,18 @@
 package com.example.rhizome.app.domain.service.impl;


+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 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 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;

 /**
 * 部署情報検索系の機能を集約させるサービスクラスです。
@@ -54,7 +55,7 @@ public class SearchDepartmentImpl implements SearchDepartment {
                .createDepartmentList(
                        departmentRepository.findAll(Specification
                                .where(DepartmentRepository.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
-                                .and(DepartmentRepository.nmDepartmentEqual(searchConditionDepartment.getNmDepartment()))
+                                .and(DepartmentRepository.nmDepartmentLike(searchConditionDepartment.getNmDepartment()))
                        )
                );

--- a/src/main/java/com/example/rhizome/app/presentation/controller/InsertDepartmentConfirmController.java
+++ b/src/main/java/com/example/rhizome/app/presentation/controller/InsertDepartmentConfirmController.java
@@ -1,107 +0,0 @@
-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.service.SearchDepartment;
-import com.example.rhizome.app.domain.service.impl.SearchDepartmentImpl;
-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.InsertDepartmentForm;
-import com.example.rhizome.app.presentation.form.MessageForm;
-
-/**
- * 新規登録情報チェック用のコントローラ
- */
-@Controller
-public class InsertDepartmentConfirmController {
-	// ログ出力用インスタンス
-	private final static Logger LOGGER = Logger.getLogger(InsertEmployeeConfirmController.class.getName());
-
-	// エラーメッセージ用の定数フィールド
-	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
-
-	HttpSession httpSession;
-	SearchDepartment searchDepartment;
-
-	@Autowired
-	public InsertDepartmentConfirmController(
-			HttpSession httpSession,
-			SearchDepartmentImpl searchDepartment) {
-		this.httpSession = httpSession;
-		this.searchDepartment = searchDepartment;
-	}
-
-	@ModelAttribute
-	public InsertDepartmentForm insertDepartmentForm() {
-		return new InsertDepartmentForm();
-	}
-
-	/**
-	 * 登録情報のチェックを行う
-	 *
-	 * @param insertDepartmentForm 登録情報
-	 * @param model              ビューにデータを渡すためのコンテナ
-	 * @return 遷移先の画面
-	 */
-	@PermissionCheck
-	@SessionCheck
-	@RequestMapping(value = INSERT_DEPARTMENT_CONFIRM, method = RequestMethod.POST)
-	public String insertDepartmentConfirm(InsertDepartmentForm insertDepartmentForm, Model model) {
-
-		try {
-			// 部署一覧を取得し、画面に返す用のクラスに詰め替える
-			// 作成した部署一覧をセット
-			model.addAttribute(
-					PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-					DepartmentForm.convertFrom(
-							searchDepartment.selectAll()));
-
-			// 登録用パラメータチェック
-			List<String> error = insertDepartmentForm.validateParameter();
-
-			// 入力内容に誤りがあるか
-			if (!error.isEmpty()) {
-				// 誤りがあった場合
-				// 誤りがあった箇所のエラーメッセージを表示
-				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
-						new MessageForm(String.join(", ", error) + "が不正です。"));
-				// 画面に返す為の登録情報をセット
-				model.addAttribute(PageReturnAttributeKeyword.INSERT_DEPARTMENT_FORM, insertDepartmentForm);
-				// 登録画面に遷移
-				return TransitionTargetPageNameKeyword.INSERT_DEPARTMENT_INPUT_HTML;
-			}
-
-			// 登録確認ページに遷移
-			model.addAttribute(PageReturnAttributeKeyword.INSERT_DEPARTMENT_FORM, insertDepartmentForm);
-			// 登録確認画面に遷移
-			return TransitionTargetPageNameKeyword.INSERT_DEPARTMENT_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/InsertDepartmentController.java
+++ b/src/main/java/com/example/rhizome/app/presentation/controller/InsertDepartmentController.java
@@ -1,10 +1,25 @@
 package com.example.rhizome.app.presentation.controller;

-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PostMapping;
+import java.util.logging.Level;
+import java.util.logging.Logger;

-import com.example.rhizome.app.presentation.form.InsertDepartmentForm;
+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;
+import com.example.rhizome.app.domain.service.SearchDepartment;
+import com.example.rhizome.app.domain.service.impl.RegisterEmployeeImpl;
+import com.example.rhizome.app.domain.service.impl.SearchDepartmentImpl;
+import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
+import com.example.rhizome.app.presentation.form.InsertEmployeeForm;

 /**
 * 新規登録用のコントローラ
@@ -12,11 +27,60 @@ import com.example.rhizome.app.presentation.form.InsertDepartmentForm;
@Controller
 public class InsertDepartmentController {

-	@PostMapping("/insertDepartmentInput")
-	public String insertDepartmentInput(@ModelAttribute InsertDepartmentForm form) {
+    // ログ出力用インスタンス
+    private final static Logger LOGGER = Logger.getLogger(InsertDepartmentController.class.getName());
+
+    // エラーメッセージ用の定数フィールド
+    private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
+
+    HttpSession httpSession;
+    RegisterEmployee registerEmployee;
+    SearchDepartment searchDepartment;
+
+    @Autowired
+    public InsertDepartmentController(HttpSession httpSession, RegisterEmployeeImpl registerEmployee, SearchDepartmentImpl searchDepartment) {
+        this.httpSession = httpSession;
+        this.registerEmployee = registerEmployee;
+        this.searchDepartment = searchDepartment;
+    }
+
+    @ModelAttribute
+    public InsertEmployeeForm insertEmployeeForm() {
+        return new InsertEmployeeForm();
+    }
+
+    /**
+     * 新規登録画面表示処理
+     *
+     * @param insertEmployeeForm 登録情報
+     * @param model              ビューにデータを渡すためのコンテナ
+     * @return 遷移先の画面
+     */
+    @PermissionCheck
+    @SessionCheck
+    @RequestMapping(value = TransitionTargetPageNameKeyword.INSERT_DEPARTMENT, method = RequestMethod.POST)
+    public String insertEmployee(InsertEmployeeForm insertEmployeeForm, Model model) {
+
+        try {
+
+            // 登録結果画面に遷移
+            return TransitionTargetPageNameKeyword.INSERT_DEVELOPMENT_INPUT_HTML;
+
+        } catch (Exception e) {
+            // ログイン情報の破棄
+            httpSession.invalidate();
+
+            e.printStackTrace();
+
+            // エラーログ出力
+            LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
+            // エラー画面遷移
+            return TransitionTargetPageNameKeyword.ERROR_HTML;
+        }
+    }

-		return "insertDepartmentInput";

 }

-}
+
+
--- a/src/main/java/com/example/rhizome/app/presentation/controller/SelectDepartmentController.java
+++ b/src/main/java/com/example/rhizome/app/presentation/controller/SelectDepartmentController.java
@@ -15,11 +15,14 @@ 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.SearchDepartment;
+import com.example.rhizome.app.domain.service.SearchEmployeeInfo;
 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.SearchConditionDepartmentForm;

+/**
+ * 社員検索画面用コントローラ　リスト全件表示、検索表示、更新、削除が可能
+ */
@Controller
 public class SelectDepartmentController {

@@ -30,41 +33,52 @@ public class SelectDepartmentController {

    HttpSession httpSession;
    SearchDepartment searchDepartment;
+    SearchEmployeeInfo searchEmployeeInfo;

    @Autowired
-	public SelectDepartmentController(HttpSession httpSession, SearchDepartment searchDepartment) {
+    public SelectDepartmentController(HttpSession httpSession, SearchDepartment searchDepartment, SearchEmployeeInfo searchEmployeeInfo) {
        this.httpSession = httpSession;
        this.searchDepartment = searchDepartment;
+        this.searchEmployeeInfo = searchEmployeeInfo;
    }

    @ModelAttribute
-	public SearchConditionDepartmentForm searchConditionDepartmentForm() {
-		return new SearchConditionDepartmentForm();
+    public DepartmentForm departmentForm() {
+        return new DepartmentForm();
    }

    /**
-	 * 部署検索画面表示処理コントローラ
+     * 社員検索画面表示処理コントローラ
     *
-	 * @param searchConditionDepartmentForm 検索画面のフォーム
+     * @param searchConditionEmployeeForm 検索画面のフォーム
     * @param model                       ビューにデータを渡すためのコンテナ
     * @return 遷移先の画面
     */
    @PermissionCheck
    @SessionCheck
-	@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO, method = RequestMethod.POST)
-	public String select(SearchConditionDepartmentForm searchConditionDepartmentForm, Model model) {
+    @RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT, method = RequestMethod.POST)
+    public String select(DepartmentForm departmentForm, Model model) {

        try {
+            // 部署一覧を取得し、画面に返す用のクラスに詰め替える
+            // 作成した部署一覧をセット
+        	System.out.println(departmentForm);
+            model.addAttribute(
+                    PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+                    DepartmentForm.convertFrom(searchDepartment.selectAll())
+            );
+           System.out.println(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST);
+           System.out.println(DepartmentForm.convertFrom(searchDepartment.selectAll()));
+           System.out.println(model.getAttribute("departmentFormList"));
           
           // 検索条件を元に検索を実施
-			// 取得した EmployeeInfo（ employee + department ）の情報を画面に返す用の型に詰め替えてセット
-			model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-					DepartmentForm.convertFrom(searchDepartment
-							.searchByWithLike(SearchConditionDepartmentForm.convertTo(searchConditionDepartmentForm))));
+           // 取得した  department の情報を画面に返す用の型に詰め替えてセット
+           model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(searchDepartment.searchBy(DepartmentForm.convertTo(departmentForm))));

            // 検索ページに遷移
            return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;

+
        } catch (Exception e) {
            // ログイン情報の破棄
            httpSession.invalidate();
@@ -79,4 +93,6 @@ public class SelectDepartmentController {

    }

+
+
 }
--- a/src/main/java/com/example/rhizome/app/presentation/controller/SelectEmployeeController.java
+++ b/src/main/java/com/example/rhizome/app/presentation/controller/SelectEmployeeController.java
@@ -1,5 +1,17 @@
 package com.example.rhizome.app.presentation.controller;

+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.SearchDepartment;
@@ -9,16 +21,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.EmployeeInfoForm;
 import com.example.rhizome.app.presentation.form.SearchConditionEmployeeForm;
-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.logging.Level;
-import java.util.logging.Logger;

 /**
 * 社員検索画面用コントローラ　リスト全件表示、検索表示、更新、削除が可能
--- 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
@@ -14,7 +14,5 @@ public class PageReturnAttributeKeyword {
    public static final String LOGIN_INFO_FORM = "loginInfoForm";
    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";
-	public static final String INSERT_DEPARTMENT_FORM = "insertDepartmentForm";

 }
--- 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
@@ -21,10 +21,7 @@ public class TransitionTargetPageNameKeyword {
    public static final String INSERT_EMPLOYEE_INPUT_HTML = "insertEmployeeInput";
    public static final String INSERT_EMPLOYEE_CONFIRM_HTML = "insertEmployeeConfirm";
    public static final String INSERT_EMPLOYEE_RESULT_HTML = "insertEmployeeResult";
-	public static final String INSERT_DEPARTMENT_INPUT_HTML = "insertDepartmentInput";
-	public static final String INSERT_DEPARTMENT_CONFIRM_HTML = "insertDepartmentConfirm";
-	public static final String INSERT_DEPARTMENT_RESULT_HTML = "insertDepartmentResult";
-
+    public static final String INSERT_DEVELOPMENT_INPUT_HTML = "insertDevelopmentInput";
    public static final String UPDATE_EMPLOYEE_INPUT_HTML = "updateEmployeeInput";

    public static final String ERROR_HTML = "error";
@@ -41,20 +38,21 @@ public class TransitionTargetPageNameKeyword {

    // 管理者向け(Controller)
    public static final String DELETE_EMPLOYEE = "/deleteEmployee";
+//    public static final String DELETE_DEPARTMENT = "/deleteDepartment";
    public static final String INSERT_EMPLOYEE_INPUT = "/insertEmployeeInput";
    public static final String INSERT_EMPLOYEE_CONFIRM = "/insertEmployeeConfirm";
    public static final String INSERT_EMPLOYEE = "/insertEmployee";
-	public static final String INSERT_DEPARTMENT_INPUT = "/insertDepartmentInput";
-	public static final String INSERT_DEPARTMENT_CONFIRM = "/insertDepartmentConfirm";
-	public static final String INSERT_DEPARTMENT = "/insertDepartment";
-
+    public static final String INSERT_DEPARTMENT = "/insertDepartmentInput";
+//    public static final String INSERT_DEPARTMENT_INPUT = "/selectDepartmentInfo";
+//    public static final String INSERT_DEPARTMENT_CONFIRM = "/selectDepartmentConfirm";
    public static final String SHOW_MENU = "/showMenu";
    public static final String SELECT_EMPLOYEE_INFO = "/selectEmployeeInfo";
    public static final String SELECT_EMPLOYEE_INFO_FORM_EMPTY = "/selectAll";
-	public static final String SELECT_DEPARTMENT_INFO = "/selectDepartment";
-	public static final String SELECT_DEPARTMENT_INFO_FORM_EMPTY = "/selectDepartmentAll";
    public static final String SHOW_UPDATE_EMPLOYEE = "/showUpdateEmployee";
    public static final String UPDATE_EMPLOYEE_RESULT = "/updateEmployeeResult";
+    public static final String SELECT_DEPARTMENT = "/selectDepartment";
+    public static final String SELECT_DEPARTMENT_INFO_FORM_EMPTY = "/selectDepartmentAll";
+    

    // Department
    // HTML
@@ -74,23 +72,17 @@ public class TransitionTargetPageNameKeyword {
                LOGOUT,
                DO_LOGIN,
                DELETE_EMPLOYEE,
-
                INSERT_EMPLOYEE_INPUT,
                INSERT_EMPLOYEE_CONFIRM,
                INSERT_EMPLOYEE,
-				INSERT_DEPARTMENT_INPUT,
-				INSERT_DEPARTMENT_CONFIRM,
                INSERT_DEPARTMENT,
-
                SHOW_MENU,
                SELECT_EMPLOYEE_INFO,
+                SELECT_DEPARTMENT,
                SELECT_EMPLOYEE_INFO_FORM_EMPTY,
-
-				SELECT_DEPARTMENT_INFO,
-				SELECT_DEPARTMENT_INFO_FORM_EMPTY,
-
                SHOW_UPDATE_EMPLOYEE,
-				UPDATE_EMPLOYEE_RESULT);
+                UPDATE_EMPLOYEE_RESULT
+        );
    }

    /**
@@ -105,7 +97,8 @@ public class TransitionTargetPageNameKeyword {
                INDEX_LOGIN,
                LOGOUT,
                DO_LOGIN,
-				PERSONAL_UPDATE_RESULT);
+                PERSONAL_UPDATE_RESULT
+        );
    }

 }
--- a/src/main/java/com/example/rhizome/app/presentation/form/DepartmentForm.java
+++ b/src/main/java/com/example/rhizome/app/presentation/form/DepartmentForm.java
@@ -3,6 +3,7 @@ package com.example.rhizome.app.presentation.form;
 import java.util.List;

 import com.example.rhizome.app.domain.model.Department;
+import com.example.rhizome.app.domain.model.SearchConditionDepartment;

 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -32,9 +33,7 @@ public class DepartmentForm {
     * @return 画面用（presentation 層）の DepartmentForm インスタンス
     */
    public static DepartmentForm convertFrom(Department department) {
-        return new DepartmentForm(
-        		department.getIdDepartment(), 
-        		department.getNmDepartment());
+        return new DepartmentForm(department.getIdDepartment(), department.getNmDepartment());
    }

    /**
@@ -47,4 +46,19 @@ public class DepartmentForm {
    public static List<DepartmentForm> convertFrom(List<Department> departmentList) {
        return departmentList.stream().map(DepartmentForm::convertFrom).toList();
    }
+    
+    /**
+     * 画面用（presentation 層）の DepartmentForm クラスから business 層の SearchConditionDepartment クラスに
+     * 変換します。
+     *
+     * @param departmentForm 画面用（presentation 層）の departmentForm インスタンス
+     * @return business 層の searchConditionDepartment インスタンス
+     */
+    public static SearchConditionDepartment convertTo(DepartmentForm departmentForm) {
+        return new SearchConditionDepartment(
+        		departmentForm.getIdDepartment(),
+        		departmentForm.getNmDepartment()
+                
+        );
+    }
 }
--- a/src/main/java/com/example/rhizome/app/presentation/form/InsertDepartmentForm.java
+++ b/src/main/java/com/example/rhizome/app/presentation/form/InsertDepartmentForm.java
@@ -1,68 +0,0 @@
-package com.example.rhizome.app.presentation.form;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.example.rhizome.app.domain.model.Department;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 画面から渡ってきた登録内容をまとめ、再度画面に表示する為のクラス
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class InsertDepartmentForm {
-	/**
-	 * 部署名
-	 */
-	private String nmDepartment;
-
-	/**
-	 * 仮引数を null or 空 判定する
-	 *
-	 * @param str 判定対象の文字列
-	 * @return true:null or 空 false:null or 空 では無い
-	 */
-	private static boolean isNullOrBlank(String str) {
-		if (null == str) {
-			return true;
-		}
-
-		return str.isBlank();
-	}
-
-	/**
-	 * 画面から渡ってきた登録内容をまとめ、ビジネスモデルに変換
-	 *
-	 * @param insertEmployeeForm 画面から渡ってきた登録内容
-	 * @return ビジネスモデルのインスタンス
-	 */
-	public static Department convertTo(InsertDepartmentForm insertDepartmentForm) {
-		return new Department(
-				null,
-				insertDepartmentForm.getNmDepartment());
-	}
-
-	/**
-	 * 登録データのValidationを行う
-	 *
-	 * @return エラーが有った場合はエラー文言、無ければ空のリストが返る
-	 */
-	public List<String> validateParameter() {
-		final String DEPARTMENT_NAME_NULL_BLANK = "部署名";
-
-		List<String> error = new ArrayList<>();
-
-		if (isNullOrBlank(nmDepartment)) {
-			error.add(DEPARTMENT_NAME_NULL_BLANK);
-		}
-
-		return error;
-
-	}
-
-}
--- a/src/main/java/com/example/rhizome/app/presentation/form/SearchConditionDepartmentForm.java
+++ b/src/main/java/com/example/rhizome/app/presentation/form/SearchConditionDepartmentForm.java
@@ -1,53 +0,0 @@
-package com.example.rhizome.app.presentation.form;
-
-import com.example.rhizome.app.domain.model.SearchConditionDepartment;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 画面から渡ってきた検索条件をまとめ、再度画面に表示する為のクラス
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class SearchConditionDepartmentForm {
-
-	/**
-	 * 部署ID
-	 */
-	private Integer idDepartment;
-
-	/**
-	 * 部署名
-	 */
-	private String nmDepartment;
-
-	/**
-	 * business 層の SearchConditionDepartment クラスから画面用（presentation 層）の SearchConditionDepartmentForm に
-	 * 変換します。
-	 *
-	 * @param searchConditionDepartment business 層の SearchConditionDepartment インスタンス
-	 * @return 画面用（presentation 層）の SearchConditionDepartmentForm インスタンス
-	 */
-	public static SearchConditionDepartmentForm convertFrom(SearchConditionDepartment searchConditionDepartment) {
-		return new SearchConditionDepartmentForm(
-				searchConditionDepartment.getIdDepartment(),
-				searchConditionDepartment.getNmDepartment());
-	}
-
-	/**
-	 * 画面用（presentation 層）の SearchConditionDepartmentForm クラスから business 層の SearchConditionDepartment クラスに
-	 * 変換します。
-	 *
-	 * @param searchConditionEmployeeForm 画面用（presentation 層）の SearchConditionDepartmentForm インスタンス
-	 * @return business 層の SearchConditionDepartment インスタンス
-	 */
-	public static SearchConditionDepartment convertTo(SearchConditionDepartmentForm searchConditionDepartmentForm) {
-		return new SearchConditionDepartment(
-				searchConditionDepartmentForm.getIdDepartment(),
-				searchConditionDepartmentForm.getNmDepartment());
-	}
-
-}
--- a/src/main/resources/templates/insertDepartmentConfirm.html
+++ b/src/main/resources/templates/insertDepartmentConfirm.html
@@ -1,79 +0,0 @@
-<!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>
-	<!-- CSSの読み込み -->
-	<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="insertDepartment" id="insertForm" method="post" th:object="${insertDepartmentForm}">
-
-		<div class="msgBox error" th:if="${messageError != null}">
-			<span class="error" th:each="message : ${messageError.message}" th:text="${message}"></span>
-		</div>
-		<table>
-			<tr>
-				<th class="header">部署ID</th>
-				<td>
-					<label>
-						<input class="readOnly" name="departmentId" readonly="readonly" type="text" value="自動で設定されます" />
-					</label>
-				</td>
-			</tr>
-			<tr>
-				<th class="header">部署名</th>
-				<td>
-					<label>
-						<input class="readOnly" name="nmDepartment" readonly="readonly" th:value="*{nmDepartment}"
-							type="text" />
-					</label>
-				</td>
-			</tr>
-
-			<tr>
-				<td class="btnArea" colspan="2">
-					<input type="submit" value="登録" />
-				</td>
-			</tr>
-		</table>
-		<a href="javascript:onClickEdit()">登録内容の編集</a>　|　<a href="showMenu">メニューに戻る</a>
-	</form>
-
-	<script type="text/javascript">
-		function onClickEdit() {
-			const form = document.getElementById('insertForm');
-			form.setAttribute('method', 'post');
-			form.setAttribute('action', 'insertDepartmentInput');
-
-			// 確認画面から編集画面に戻ってきたときのフラグ（未使用）
-			const inputField = document.createElement("input");
-			inputField.setAttribute("type", "hidden");
-			inputField.setAttribute("name", "backFlg");
-			inputField.setAttribute("value", "edit");
-
-			form.appendChild(inputField);
-
-			// フォームをDOMに追加
-			document.body.appendChild(form);
-
-			form.submit();
-		}
-	</script>
-
-</body>
-
-</html>
--- a/src/main/resources/templates/insertDepartmentInput.html
+++ b/src/main/resources/templates/insertDepartmentInput.html
@@ -1,58 +0,0 @@
-<!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>
-	<!-- CSSの読み込み -->
-	<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="insertDepartmentConfirm" method="post" th:object="${insertDepartmentForm}">
-
-		<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>
-					<label>
-						<input class="readOnly" readonly="readonly" type="text" value="自動で設定されます" />
-					</label>
-				</td>
-			</tr>
-			<tr>
-				<th class="header">部署名</th>
-				<td>
-					<label>
-						<input maxlength="50" placeholder="部署名" required="required" th:field="*{nmDepartment}"
-							type="text" />
-					</label>
-				</td>
-			</tr>
-
-			<tr>
-				<td class="btnArea" colspan="2">
-					<input type="submit" value="登録確認" />
-				</td>
-			</tr>
-		</table>
-	</form>
-	<a href="showMenu">メニューに戻る</a>
-</body>
-
-</html>
--- a/src/main/resources/templates/insertDepartmentResult.html
+++ b/src/main/resources/templates/insertDepartmentResult.html
@@ -1,41 +0,0 @@
-<!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>
-	<!-- CSSの読み込み -->
-	<link rel="stylesheet" th:href="@{/css/all.css}">
-	<link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
-	<title>部署登録完了</title>
-</head>
-
-<body>
-	<h2>部署登録が完了しました</h2>
-	<br />
-	<a href="javascript:insertSubmit()">続けて登録する</a>　|　<a href="showMenu">メニューに戻る</a>
-</body>
-<script type="text/javascript">
-	function insertSubmit() {
-		const form = document.createElement('form');
-		form.setAttribute('method', 'post');
-		form.setAttribute('action', 'insertDepartmentInput');
-
-		// 動的送信用のHidden
-		// 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
-		const inputField = document.createElement("input");
-		inputField.setAttribute("type", "hidden");
-		inputField.setAttribute("value", "select");
-
-		form.appendChild(inputField);
-
-		// フォームをDOMに追加
-		document.body.appendChild(form);
-
-		form.submit();
-	}
-</script>
-
-</html>
--- a/src/main/resources/templates/insertDevelopmentInput.html
+++ b/src/main/resources/templates/insertDevelopmentInput.html
@@ -0,0 +1,23 @@
+<!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>
+    <!-- CSSの読み込み -->
+    <link rel="stylesheet" th:href="@{/css/all.css}">
+    <link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
+    <title>社員登録</title>
+</head>
+
+<body>
+<h1>
+    社員登録　　　
+
+</h1>
+
+<a href="showMenu">メニューに戻る</a>
+</body>
+</html>
--- a/src/main/resources/templates/menu.html
+++ b/src/main/resources/templates/menu.html
@@ -25,17 +25,21 @@
    <tr>
        <td><a class="menuClass" href="javascript:selectEmployeeSubmit()"><i class="fas fa-search"></i> 社員検索 </a>
        </td>
-			<td class="description">登録済みのユーザ一覧表示と</br>更新、削除を行います。</td>
-
-			<td><a class="menuClass" href="javascript:selectDepartmentSubmit()"><i class="fas fa-search"></i> 部署検索 </a>
-			</td>
-			<td class="description">登録済みの部署一覧表示と</br>更新、削除を行います。</td>
+        <td class="description">登録済みのユーザ一覧表示と更新、削除を行います。</td>
    </tr>

    <tr>
        <td><a class="menuClass" href="javascript:insertEmployeeSubmit()"><i class="fas fa-plus"></i> 社員登録 </a></td>
        <td class="description">新規でユーザ追加を行います。</td>
+    </tr>
 	
+	<tr>
+	    <td><a class="menuClass" href="javascript:selectDepartmentSubmit()"><i class="fas fa-search"></i> 部署検索 </a>
+	    </td>
+	    <td class="description">登録済みの部署一覧表示と更新、削除を行います。</td>
+	</tr>
+	
+	<tr>
 	    <td><a class="menuClass" href="javascript:insertDepartmentSubmit()"><i class="fas fa-plus"></i> 部署登録 </a>
 	    </td>
 	    <td class="description">新規で部署追加を行います。</td>
@@ -73,7 +77,7 @@
        // 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
        const inputField = document.createElement("input");
        inputField.setAttribute("type", "hidden");
-		inputField.setAttribute("value", "selectDepartmentAll");
+        inputField.setAttribute("value", "selectDepartment");

        form.appendChild(inputField);

--- a/src/main/resources/templates/selectDepartment.html
+++ b/src/main/resources/templates/selectDepartment.html
@@ -12,7 +12,6 @@
    <title>検索</title>

 </head>
-
 <body>
 <h1>
 	    検索条件入力　　　
@@ -21,7 +20,9 @@
 	        <button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
 	    </div>
 </h1>
-	<form action="selectDepartment" method="post" th:object="${searchConditionDepartmentForm}">
+<form action="selectDepartment"
+      method="post"
+      th:object="${departmentForm}">

    <div class="msgBox error" th:if="${messageError} != null">
        <span class="error" th:text="${messageError.message}"></span>
@@ -30,13 +31,17 @@
        <tr>
            <th class="header">部署ID</th>
            <td>
-					<input placeholder="部署ID" th:field="*{idDepartment}" type="number" />
+                <input placeholder="部署ID"
+                       th:field="*{idDepartment}"
+                       type="number"/>
            </td>
        </tr>
        <tr>
            <th class="header">部署名</th>
            <td>
-					<input placeholder="部署名" th:field="*{nmDepartment}" type="text" />
+                <input placeholder="部署名"
+                       th:field="*{nmDepartment}"
+                       type="text"/>部署名
            </td>
        </tr>
        
@@ -66,27 +71,21 @@
    <table class="table-grid table-striped table-hover">
        <thead>
        <tr>
-					<th style="width: 100px;">部署ID</th>
+            <th style="width: 60px;">部署ID</th>
            <th style="width: 100px;">部署名</th>
            <th style="width: 150px;">操作</th>
        </tr>
        </thead>
        <tbody>
-				<tr th:each="departmentForm : ${departmentFormList}">
-					<td th:text="${departmentForm.idDepartment}"></td>
-					<td th:text="${departmentForm.nmDepartment}"></td>
+        <tr th:each="departmentFormList : ${departmentFormList}">
+            <td th:text="${departmentFormList.idDepartment}"></td>
+            <td th:text="${departmentFormList.nmDepartment}"></td>
            <td>
                <!-- 更新フォーム -->
-						<form action="showUpdateDepartment" method="post" style="display: inline;">
-							<input name="idDepartment" th:value="${departmentForm.idDepartment}" type="hidden">
-							<input type="submit" value="更新">
-						</form>
+
                <!-- 削除フォーム -->
-						<form action="deleteDepartment" method="post" onsubmit="return confirm('本当に削除しますか？');"
-							style="display: inline;">
-							<input name="idDepartment" th:value="${departmentForm.idDepartment}" type="hidden">
-							<input type="submit" value="削除">
-						</form>
+
+                
            </td>
        </tr>
        </tbody>
@@ -108,4 +107,5 @@

 </script>

+
 </html>
				`@@ -0,0 +1 @@`
				`org.eclipse.wst.jsdt.launching.baseBrowserLibrary`