[ADD] 部署登録・削除・更新のためのサービスメソッド実装

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>

src/main/java/com/example/rhizome/aop/Handler/GlobalExceptionHandler.java

@@ -1,25 +1,22 @@
 package com.example.rhizome.aop.Handler;
 
-import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.LoginInfoForm;
-import com.example.rhizome.app.presentation.form.MessageForm;
-import com.example.rhizome.exception.InsufficientPermissionException;
-import com.example.rhizome.exception.NoSessionException;
+import static com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword.*;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
 import org.springframework.http.HttpStatus;
 import org.springframework.ui.Model;
 import org.springframework.web.HttpRequestMethodNotSupportedException;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
+import com.example.rhizome.app.presentation.form.LoginInfoForm;
+import com.example.rhizome.app.presentation.form.MessageForm;
+import com.example.rhizome.exception.InsufficientPermissionException;
+import com.example.rhizome.exception.NoSessionException;
 
-import static com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword.LOGIN_INFO_FORM;
-import static com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword.MESSAGE_ERROR;
-
-/**
- * 例外処理用のコントローラ
- */
 @ControllerAdvice
 public class GlobalExceptionHandler {
 
@@ -28,12 +25,6 @@ public class GlobalExceptionHandler {
 	private final String SEVERE_ERROR_MESSAGE_ILLEGAL_TRANSITION = "不正な遷移です。";
 	private final String SEVERE_ERROR_MESSAGE_BAD_REQUEST = "不正なリクエストです。";
 
-    /**
-     * セッションが切れている場合の例外処理
-     *
-     * @param model ビューにデータを渡すためのコンテナ
-     * @return 遷移先の画面
-     */
 	@ExceptionHandler(NoSessionException.class)
 	public String handleNoSessionException(Model model, Exception e) {
 
@@ -42,18 +33,11 @@ public class GlobalExceptionHandler {
 
 		e.printStackTrace();
 
-        // エラーログ出力
 		LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE_ILLEGAL_TRANSITION, e);
 
 		return TransitionTargetPageNameKeyword.LOGIN_HTML;
 	}
 
-    /**
-     * 権限がない場合の例外処理
-     *
-     * @param model ビューにデータを渡すためのコンテナ
-     * @return 遷移先の画面
-     */
 	@ExceptionHandler(InsufficientPermissionException.class)
 	public String handleInsufficientPermissionException(Model model, Exception e) {
 
@@ -62,50 +46,32 @@ public class GlobalExceptionHandler {
 
 		e.printStackTrace();
 
-        // エラーログ出力
 		LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE_ILLEGAL_TRANSITION, e);
 
-        return TransitionTargetPageNameKeyword.LOGIN_HTML;
+		return TransitionTargetPageNameKeyword.ERROR_HTML;
 
 	}
 
-    /**
-     * リクエストメソッドが不正な場合の例外処理
-     *
-     * @param model ビューにデータを渡すためのコンテナ
-     * @return 遷移先の画面
-     */
 	@ExceptionHandler(HttpRequestMethodNotSupportedException.class)
 	public String handleBadRequestException(Model model, Exception e) {
-        // エラーメッセージやその他の情報をモデルに追加する
 		model.addAttribute("error", SEVERE_ERROR_MESSAGE_BAD_REQUEST);
 		model.addAttribute("status", HttpStatus.BAD_REQUEST.value());
 
 		e.printStackTrace();
 
-        // エラーログ出力
 		LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE_ILLEGAL_TRANSITION, e);
 
-        // カスタムエラーページにリダイレクト
 		return TransitionTargetPageNameKeyword.ERROR_HTML;
 	}
 
-    /**
-     * その他の例外処理
-     *
-     * @param model ビューにデータを渡すためのコンテナ
-     * @return 遷移先の画面
-     */
 	@ExceptionHandler(Exception.class)
 	public String AllException(Model model, Exception e) {
-        // エラーメッセージやその他の情報をモデルに追加する
 		model.addAttribute("error", SEVERE_ERROR_MESSAGE_BAD_REQUEST);
 
 		e.printStackTrace();
 
 		LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE_ILLEGAL_TRANSITION, e);
 
-        // カスタムエラーページにリダイレクト
 		return TransitionTargetPageNameKeyword.ERROR_HTML;
 	}
 }

src/main/java/com/example/rhizome/aop/aspect/PermissionCheck.java

@@ -5,10 +5,6 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/**
- * SessionCheckアノテーション
- * セッションチェックを行うメソッドに付与する
- */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
 public @interface PermissionCheck {

src/main/java/com/example/rhizome/aop/aspect/PermissionCheckAspect.java

@@ -1,20 +1,18 @@
 package com.example.rhizome.aop.aspect;
 
-import com.example.rhizome.app.presentation.controller.pageproperty.SessionKeyword;
-import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.LoginUserForm;
-import com.example.rhizome.exception.InsufficientPermissionException;
+import javax.servlet.http.HttpServletRequest;
+
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.aspectj.lang.annotation.Pointcut;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import javax.servlet.http.HttpServletRequest;
+import com.example.rhizome.app.presentation.controller.pageproperty.SessionKeyword;
+import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
+import com.example.rhizome.app.presentation.form.LoginUserForm;
+import com.example.rhizome.exception.InsufficientPermissionException;
 
-/**
- * 権限チェック用のAOP
- */
 @Aspect
 @Component
 public class PermissionCheckAspect {
@@ -26,65 +24,39 @@ public class PermissionCheckAspect {
 		this.request = request;
 	}
 
-    // Aspectのフックを定義（今回はPermissionCheckアノテーションが定義されているメソッドが動作するタイミング）
 	@Pointcut("@annotation(com.example.rhizome.aop.aspect.PermissionCheck)")
 	public void permissionCheckMethod() {
 	}
 
-    /**
-     * 権限チェック
-     */
 	@Before("permissionCheckMethod()")
 	public void checkPermission() {
-        // ログインユーザの取得
 		LoginUserForm loginUserForm = (LoginUserForm) request.getSession().getAttribute(SessionKeyword.LOGIN_USER);
 
-        // ログインユーザが取得できない場合、または権限がない場合はエラー画面に遷移
 		if (loginUserForm == null || !hasRequiredPermission(request.getRequestURI(), loginUserForm)) {
 			throw new InsufficientPermissionException("不正な遷移です");
 		}
 
 	}
 
-    /**
-     * 遷移先のURLとログインユーザの権限から、遷移可否を判定する
-     *
-     * @param targetURL     遷移したいURL
-     * @param loginUserForm リクエスト元のユーザ
-     * @return true:遷移可 false:遷移不可
-     */
 	private boolean hasRequiredPermission(String targetURL, LoginUserForm loginUserForm) {
 
-        // 管理者権限
 		if (isAdminTransition(targetURL, loginUserForm)) {
 			return true;
 		}
 
-        // 一般権限
 		if (isUserTransition(targetURL, loginUserForm)) {
 			return true;
 		}
 
-        // アクセス不許可の場合の処理（不正アクセス画面に遷移）
 		return false;
 
 	}
 
-    /**
-     * 管理者用のアカウントで管理者向けのページアクセスか
-     *
-     * @param targetURL     遷移したいURL
-     * @param loginUserForm リクエスト元のユーザ
-     * @return true:遷移可 false:遷移不可
-     */
 	private boolean isAdminTransition(String targetURL, LoginUserForm loginUserForm) {
 
-        // 管理者か
 		if (!loginUserForm.isAdminUser()) {
 			return false;
 		}
-
-        // 管理者向けのページ遷移か
 		if (!TransitionTargetPageNameKeyword.getAdminPageList().contains(targetURL)) {
 			return false;
 		}
@@ -92,23 +64,13 @@ public class PermissionCheckAspect {
 		return true;
 	}
 
-    /**
-     * 一般ユーザ用のアカウントで一般ユーザ向けのページアクセスか
-     *
-     * @param targetURL     遷移したいURL
-     * @param loginUserForm リクエスト元のユーザ
-     * @return true:遷移可 false:遷移不可
-     */
 	private boolean isUserTransition(String targetURL, LoginUserForm loginUserForm) {
 
-        // 管理者か
 		if (loginUserForm.isAdminUser()) {
 			return false;
 		}
 
-        // 一般ユーザ向けのページ遷移か
 		return TransitionTargetPageNameKeyword.getUserPageList().contains(targetURL);
 
 	}
 }
-

src/main/java/com/example/rhizome/aop/aspect/SessionCheck.java

@@ -5,10 +5,6 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/**
- * SessionCheckアノテーション
- * セッションチェックを行うメソッドに付与する
- */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
 public @interface SessionCheck {

src/main/java/com/example/rhizome/aop/aspect/SessionCheckAspect.java

@@ -1,19 +1,17 @@
 package com.example.rhizome.aop.aspect;
 
-import com.example.rhizome.app.presentation.controller.pageproperty.SessionKeyword;
-import com.example.rhizome.exception.NoSessionException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.aspectj.lang.annotation.Pointcut;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
+import com.example.rhizome.app.presentation.controller.pageproperty.SessionKeyword;
+import com.example.rhizome.exception.NoSessionException;
 
-/**
- * セッションチェック用のAOP
- */
 @Aspect
 @Component
 public class SessionCheckAspect {
@@ -29,15 +27,10 @@ public class SessionCheckAspect {
 	public void sessionCheckMethod() {
 	}
 
-    /**
-     * セッションチェック
-     */
 	@Before("sessionCheckMethod()")
 	public void checkSession() {
-        // セッションの取得
 		HttpSession session = request.getSession(false);
 
-        // セッションが取得できない場合はエラー画面に遷移
 		if (session == null || session.getAttribute(SessionKeyword.LOGIN_USER) == null) {
 			throw new NoSessionException("不正なログインです");
 		}

src/main/java/com/example/rhizome/app/domain/model/Department.java

@@ -3,19 +3,10 @@ package com.example.rhizome.app.domain.model;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
-/**
- * 部署情報の概念を表現するモデルクラスです。
- */
 @Getter
 @AllArgsConstructor
 public class Department {
-    /**
-     * 部署ID
-     */
 	private final Integer idDepartment;
-    /**
-     * 部署名
-     */
 	private final String nmDepartment;
 
 }

src/main/java/com/example/rhizome/app/domain/model/Employee.java

@@ -3,39 +3,15 @@ package com.example.rhizome.app.domain.model;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
-/**
- * 社員を表現するモデルクラスです
- */
 @Getter
 @AllArgsConstructor
 public class Employee {
-    /**
-     * 社員ID
-     */
 	private final Integer idEmployee;
-    /**
-     * 社員名
-     */
 	private final String nmEmployee;
-    /**
-     * 社員名カナ
-     */
 	private final String knEmployee;
-    /**
-     * メールアドレス
-     */
 	private final String mailAddress;
-    /**
-     * パスワード
-     */
 	private final String password;
-    /**
-     * 管理者権限
-     */
 	private final Integer adminAuth;
-    /**
-     * 部署ID
-     */
 	private final Integer idDepartment;
 
 }

src/main/java/com/example/rhizome/app/domain/model/EmployeeInfo.java

@@ -1,28 +1,14 @@
-/*
- * EmployeeInfo.java
- *   作成	IT-College	2016
- *------------------------------------------------------------
- * Copyright(c) Rhizome Inc. All Rights Reserved.
- */
 package com.example.rhizome.app.domain.model;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
-/**
- * 社員情報の概念を表現するモデルクラスです。
- */
 @Getter
 @AllArgsConstructor
 public class EmployeeInfo {
 
-    /**
-     * 社員情報
-     */
 	private final Employee employee;
-    /**
-     * 部署名
-     */
+
 	private final Department department;
 
 }

src/main/java/com/example/rhizome/app/domain/model/LoginInfo.java

@@ -3,20 +3,12 @@ package com.example.rhizome.app.domain.model;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
-/**
- * ログインを試みる人を表現するモデルクラスです
- */
-
 @Getter
 @AllArgsConstructor
 public class LoginInfo {
-    /**
-     * メールアドレス
-     */
+
 	private String mailAddress;
-    /**
-     * パスワード
-     */
+
 	private String password;
 
 }

src/main/java/com/example/rhizome/app/domain/model/LoginUser.java

@@ -3,48 +3,23 @@ package com.example.rhizome.app.domain.model;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
-/**
- * ログイン者を表現するクラスです
- */
 @Getter
 @AllArgsConstructor
 public class LoginUser {
-    /**
-     * 社員ID
-     */
 	private final Integer idEmployee;
-    /**
-     * 社員名
-     */
+
 	private final String nmEmployee;
-    /**
-     * 社員名カナ
-     */
+
 	private final String knEmployee;
-    /**
-     * メールアドレス
-     */
+
 	private final String mailAddress;
-    /**
-     * パスワード
-     */
+
 	private final String password;
 
-    /**
-     * 管理者権限
-     */
 	private final Integer adminAuth;
 
-    /**
-     * 部署ID
-     */
 	private final Integer idDepartment;
 
-    /**
-     * ログインユーザが管理者か
-     *
-     * @return true:管理者 false:一般権限
-     */
 	public boolean isAdminUser() {
 		return getAdminAuth() == 1;
 	}

src/main/java/com/example/rhizome/app/domain/model/SearchConditionDepartment.java

@@ -3,19 +3,11 @@ package com.example.rhizome.app.domain.model;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
-/**
- * 部署情報の検索要件を表現するモデルクラスです。
- */
 @Getter
 @AllArgsConstructor
 public class SearchConditionDepartment {
-    /**
-     * 部署ID
-     */
 	private final Integer idDepartment;
-    /**
-     * 部署名
-     */
+
 	private final String nmDepartment;
 
 }

src/main/java/com/example/rhizome/app/domain/model/SearchConditionEmployee.java

@@ -3,31 +3,13 @@ package com.example.rhizome.app.domain.model;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
-/**
- * 社員情報の検索条件という概念を表現するモデルクラスです
- */
 @Getter
 @AllArgsConstructor
 public class SearchConditionEmployee {
-    /**
-     * 社員ID
-     */
 	private final Integer idEmployee;
-    /**
-     * 社員名
-     */
 	private final String nmEmployee;
-    /**
-     * 社員名カナ
-     */
 	private final String knEmployee;
-    /**
-     * メールアドレス
-     */
 	private final String mailAddress;
-    /**
-     * 部署ID
-     */
 	private final Integer idDepartment;
 
 }

src/main/java/com/example/rhizome/app/domain/service/DeleteDepartment.java

@@ -0,0 +1,6 @@
+package com.example.rhizome.app.domain.service;
+
+public interface DeleteDepartment {
+	void deleteDepartment(Integer idDepartment);
+
+}

src/main/java/com/example/rhizome/app/domain/service/SearchDepartment.java

@@ -1,14 +1,19 @@
 package com.example.rhizome.app.domain.service;
 
+import java.util.List;
+
 import com.example.rhizome.app.domain.model.Department;
 import com.example.rhizome.app.domain.model.SearchConditionDepartment;
 
-import java.util.List;
-
 public interface SearchDepartment {
 	List<Department> selectAll();
 
 	List<Department> searchBy(SearchConditionDepartment searchConditionDepartment);
 
 	List<Department> searchByWithLike(SearchConditionDepartment searchConditionDepartment);
+
+	List<Department> searchByDepartmentName(SearchConditionDepartment searchConditionDepartment);
+
+	List<Department> searchByDepartmentId(SearchConditionDepartment searchConditionDepartment);
+
 }

src/main/java/com/example/rhizome/app/domain/service/SearchEmployeeInfo.java

@@ -1,10 +1,10 @@
 package com.example.rhizome.app.domain.service;
 
+import java.util.List;
+
 import com.example.rhizome.app.domain.model.EmployeeInfo;
 import com.example.rhizome.app.domain.model.SearchConditionEmployee;
 
-import java.util.List;
-
 public interface SearchEmployeeInfo {
 	List<EmployeeInfo> selectAll();
 

src/main/java/com/example/rhizome/app/domain/service/UpdateDepartment.java

@@ -0,0 +1,8 @@
+package com.example.rhizome.app.domain.service;
+
+import com.example.rhizome.app.domain.model.Department;
+
+public interface UpdateDepartment {
+	void updateDepartment(Department beforeDepartment, Department updateDepartment);
+
+}

src/main/java/com/example/rhizome/app/domain/service/impl/DeleteDepartmentImpl.java

@@ -0,0 +1,26 @@
+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.service.DeleteDepartment;
+import com.example.rhizome.app.infra.repository.DepartmentRepository;
+
+@Service
+@Transactional
+public class DeleteDepartmentImpl implements DeleteDepartment {
+
+	DepartmentRepository departmentRepository;
+
+	@Autowired
+	public DeleteDepartmentImpl(DepartmentRepository departmentRepository) {
+		this.departmentRepository = departmentRepository;
+	}
+
+	@Override
+	public void deleteDepartment(Integer idDepartment) {
+		departmentRepository.deleteById(idDepartment);
+	}
+
+}

src/main/java/com/example/rhizome/app/domain/service/impl/DeleteEmployeeImpl.java

@@ -1,14 +1,12 @@
 package com.example.rhizome.app.domain.service.impl;
 
-import com.example.rhizome.app.domain.service.DeleteEmployee;
-import com.example.rhizome.app.infra.repository.EmployeeRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-/**
- * Employee レコード削除関連の機能を持つサービス
- */
+import com.example.rhizome.app.domain.service.DeleteEmployee;
+import com.example.rhizome.app.infra.repository.EmployeeRepository;
+
 @Service
 @Transactional
 public class DeleteEmployeeImpl implements DeleteEmployee {
@@ -20,12 +18,6 @@ public class DeleteEmployeeImpl implements DeleteEmployee {
 		this.employeeRepository = employeeRepository;
 	}
 
-
-    /**
-     * idEmployee を元に employee データを削除
-     *
-     * @param idEmployee 削除対象のidEmployee
-     */
 	public void deleteEmployee(Integer idEmployee) {
 		employeeRepository.deleteById(idEmployee);
 	}

src/main/java/com/example/rhizome/app/domain/service/impl/LoginImpl.java

@@ -1,17 +1,15 @@
 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.LoginInfo;
 import com.example.rhizome.app.domain.model.LoginUser;
 import com.example.rhizome.app.domain.service.Login;
 import com.example.rhizome.app.infra.entity.EmployeeEntity;
 import com.example.rhizome.app.infra.repository.EmployeeRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
-/**
- * ログイン系の機能を集約させるサービスクラスです。
- */
 @Service
 @Transactional
 public class LoginImpl implements Login {
@@ -23,15 +21,7 @@ public class LoginImpl implements Login {
 		this.employeeRepository = employeeRepository;
 	}
 
-
-    /**
-     * メールアドレス、パスワードでログイン判定を行う
-     *
-     * @param loginInfo ログインを試みるアカウント
-     * @return loginUser のインスタンス
-     */
 	public LoginUser doLogin(LoginInfo loginInfo) {
-        // ログイン情報を元にログインユーザーを取得
 		return employeeRepository
 				.findByMailAddressAndPassword(loginInfo.getMailAddress(), loginInfo.getPassword())
 				.orElse(new EmployeeEntity())
@@ -39,14 +29,7 @@ public class LoginImpl implements Login {
 
 	}
 
-    /**
-     * メールアドレス、パスワードでログイン判定を行う
-     *
-     * @param loginInfo ログインを試みるアカウント
-     * @return loginUser のインスタンス
-     */
 	public boolean canLogin(LoginInfo loginInfo) {
-        // ログイン情報を元にログインユーザーを取得
 		return employeeRepository
 				.findByMailAddressAndPassword(loginInfo.getMailAddress(), loginInfo.getPassword())
 				.isPresent();

src/main/java/com/example/rhizome/app/domain/service/impl/RegisterDepartmentImpl.java

@@ -0,0 +1,27 @@
+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;
+
+@Service
+@Transactional
+public class RegisterDepartmentImpl implements RegisterDepartment {
+
+	DepartmentRepository departmentRepository;
+
+	@Autowired
+	public RegisterDepartmentImpl(DepartmentRepository departmentRepository) {
+		this.departmentRepository = departmentRepository;
+	}
+
+	@Override
+	public void registerDepartment(Department department) {
+		departmentRepository.save(DepartmentEntity.convertFrom(department));
+	}
+}

src/main/java/com/example/rhizome/app/domain/service/impl/RegisterEmployeeImpl.java

@@ -1,17 +1,14 @@
 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.Employee;
 import com.example.rhizome.app.domain.service.RegisterEmployee;
 import com.example.rhizome.app.infra.entity.EmployeeEntity;
 import com.example.rhizome.app.infra.repository.EmployeeRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
-/**
- * Employee テーブルの登録系の機能を集約させるサービスクラスです。
- */
 @Service
 @Transactional
 public class RegisterEmployeeImpl implements RegisterEmployee {
@@ -23,11 +20,6 @@ public class RegisterEmployeeImpl implements RegisterEmployee {
 		this.employeeRepository = employeeRepository;
 	}
 
-    /**
-     * employee インスタンスの内容を登録する
-     *
-     * @param employee 登録対象のデータ
-     */
 	public void registerEmployee(Employee employee) {
 		employeeRepository.save(EmployeeEntity.convertFrom(employee));
 	}

src/main/java/com/example/rhizome/app/domain/service/impl/SearchDepartmentImpl.java

@@ -1,82 +1,75 @@
 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;
-
-/**
- * 部署情報検索系の機能を集約させるサービスクラスです。
- */
 @Service
 @Transactional
 public class SearchDepartmentImpl implements SearchDepartment {
 
 	DepartmentRepository departmentRepository;
 
-    /**
-     * コンストラクタ
-     *
-     * @param departmentRepository DI対象
-     */
 	@Autowired
 	public SearchDepartmentImpl(DepartmentRepository departmentRepository) {
 		this.departmentRepository = departmentRepository;
 	}
 
-    /**
-     * 部署情報を全件取得する
-     *
-     * @return 取得した部署情報レコード全件
-     */
 	public List<Department> selectAll() {
 		return DepartmentEntity.createDepartmentList(departmentRepository.findAll());
 	}
 
-    /**
-     * searchConditionDepartment の情報を元に Department のレコードを取得
-     *
-     * @param searchConditionDepartment 検索条件
-     * @return 検索結果のレコード
-     */
 	public List<Department> searchBy(SearchConditionDepartment searchConditionDepartment) {
-        // 動的に検索条件を絞り込む
-        // Specification は Criteria API の Predicate をラップしたもの
 		return DepartmentEntity
 				.createDepartmentList(
 						departmentRepository.findAll(Specification
-                                .where(DepartmentRepository.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
-                                .and(DepartmentRepository.nmDepartmentEqual(searchConditionDepartment.getNmDepartment()))
-                        )
-                );
+								.where(DepartmentRepository
+										.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
+								.and(DepartmentRepository
+										.nmDepartmentEqual(searchConditionDepartment.getNmDepartment()))));
 
 	}
 
-    /**
-     * searchConditionDepartment の情報を元に Department のレコードを取得
-     * 部分一致検索
-     *
-     * @param searchConditionDepartment 検索条件
-     * @return 検索結果のレコード
-     */
 	public List<Department> searchByWithLike(SearchConditionDepartment searchConditionDepartment) {
-        // 動的に検索条件を絞り込む
-        // Specification は Criteria API の Predicate をラップしたもの
 		return DepartmentEntity
 				.createDepartmentList(
 						departmentRepository.findAll(Specification
-                                .where(DepartmentRepository.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
-                                .and(DepartmentRepository.nmDepartmentLike(searchConditionDepartment.getNmDepartment()))
-                        )
-                );
+								.where(DepartmentRepository
+										.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
+								.and(DepartmentRepository
+										.nmDepartmentLike(searchConditionDepartment.getNmDepartment()))));
 
 	}
+
+	@Override
+	public List<Department> searchByDepartmentName(SearchConditionDepartment searchConditionDepartment) {
+
+		return DepartmentEntity
+				.createDepartmentList(
+						departmentRepository.findAll(Specification
+								.where(DepartmentRepository
+										.nmDepartmentEqual(searchConditionDepartment.getNmDepartment()))));
+
+	}
+
+	@Override
+	public List<Department> searchByDepartmentId(SearchConditionDepartment searchConditionDepartment) {
+
+		return DepartmentEntity
+				.createDepartmentList(
+						departmentRepository.findAll(Specification
+								.where(DepartmentRepository
+										.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))));
+
+	}
+
 }

src/main/java/com/example/rhizome/app/domain/service/impl/SearchEmployeeImpl.java

@@ -1,19 +1,17 @@
 package com.example.rhizome.app.domain.service.impl;
 
+import java.util.List;
+
+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.Employee;
 import com.example.rhizome.app.domain.model.LoginUser;
 import com.example.rhizome.app.domain.service.SearchEmployee;
 import com.example.rhizome.app.infra.entity.EmployeeEntity;
 import com.example.rhizome.app.infra.repository.EmployeeRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
-import java.util.List;
-
-/**
- * Employee テーブル検索系の機能を集約させるサービスクラスです。
- */
 @Service
 @Transactional
 public class SearchEmployeeImpl implements SearchEmployee {
@@ -25,44 +23,19 @@ public class SearchEmployeeImpl implements SearchEmployee {
 		this.employeeRepository = employeeRepository;
 	}
 
-
-    /**
-     * mailAddress を元に Employee Table を検索します。
-     *
-     * @param mailAddress 検索対象の mailAddress
-     * @return Table から取得したレコードの情報
-     */
 	public List<Employee> searchEmployee(String mailAddress) {
 		return EmployeeEntity.createEmployeeList(employeeRepository.findByMailAddress(mailAddress).stream().toList());
 	}
 
-    /**
-     * mailAddress を元に ログイン者の情報 を検索します。
-     *
-     * @param mailAddress 検索対象の mailAddress
-     * @return login者の情報
-     */
 	public LoginUser searchLoginUser(String mailAddress) {
 		return employeeRepository.findByMailAddress(mailAddress).orElse(new EmployeeEntity()).createLoginUser();
 	}
 
-    /**
-     * idEmployee を元に Employee Table を検索します。
-     *
-     * @param idEmployee 検索対象の idEmployee
-     * @return Table から取得したレコードの情報
-     */
 	public Employee searchEmployeeByIdEmployee(Integer idEmployee) {
-        return EmployeeEntity.createEmployee(employeeRepository.findByIdEmployee(idEmployee).orElse(new EmployeeEntity()));
+		return EmployeeEntity
+				.createEmployee(employeeRepository.findByIdEmployee(idEmployee).orElse(new EmployeeEntity()));
 	}
 
-
-    /**
-     * idDepartment を元に Employee Table を検索します。
-     *
-     * @param idDepartment 部署ID
-     * @return Table から取得したレコードの情報
-     */
 	@Override
 	public List<Employee> searchEmployeeByIdDepartment(Integer idDepartment) {
 		return EmployeeEntity.createEmployeeList(employeeRepository.findByIdDepartment(idDepartment));

src/main/java/com/example/rhizome/app/domain/service/impl/SearchEmployeeInfoImpl.java

@@ -1,20 +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.EmployeeInfo;
 import com.example.rhizome.app.domain.model.SearchConditionEmployee;
 import com.example.rhizome.app.domain.service.SearchEmployeeInfo;
 import com.example.rhizome.app.infra.entity.EmployeeDepartmentEntity;
 import com.example.rhizome.app.infra.repository.EmployeeInfoRepository;
-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;
-
-/**
- * SearchEmployeeInfoImpl (employee join department) 検索系の機能を集約させるサービスクラスです
- */
 @Service
 @Transactional
 public class SearchEmployeeInfoImpl implements SearchEmployeeInfo {
@@ -26,27 +24,13 @@ public class SearchEmployeeInfoImpl implements SearchEmployeeInfo {
 		this.employeeInfoRepository = employeeInfoRepository;
 	}
 
-
-    /**
-     * EmployeeInfo (employee join department) のレコードを全件取得
-     *
-     * @return 取得したレコード全件
-     */
 	public List<EmployeeInfo> selectAll() {
 
 		return EmployeeDepartmentEntity.createEmployeeInfoList(employeeInfoRepository.findAll());
 
 	}
 
-    /**
-     * SearchConditionEmployee の情報を元に EmployeeInfo (employee join department) のレコードを取得
-     *
-     * @param searchConditionEmployee 検索条件
-     * @return 検索結果のレコードリスト
-     */
 	public List<EmployeeInfo> searchBy(SearchConditionEmployee searchConditionEmployee) {
-        // 動的に検索条件を絞り込む
-        // Specification は Criteria API の Predicate をラップしたもの
 		return EmployeeDepartmentEntity
 				.createEmployeeInfoList(
 						employeeInfoRepository.findAll(Specification
@@ -54,9 +38,8 @@ public class SearchEmployeeInfoImpl implements SearchEmployeeInfo {
 								.and(EmployeeInfoRepository.nmEmployeeEqual(searchConditionEmployee.getNmEmployee()))
 								.and(EmployeeInfoRepository.knEmployeeEqual(searchConditionEmployee.getKnEmployee()))
 								.and(EmployeeInfoRepository.mailAddressEqual(searchConditionEmployee.getMailAddress()))
-                                .and(EmployeeInfoRepository.idDepartmentEqual(searchConditionEmployee.getIdDepartment()))
-                        )
-                );
+								.and(EmployeeInfoRepository
+										.idDepartmentEqual(searchConditionEmployee.getIdDepartment()))));
 
 	}
 }

src/main/java/com/example/rhizome/app/domain/service/impl/UpdateDepartmentImpl.java

@@ -0,0 +1,37 @@
+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.UpdateDepartment;
+import com.example.rhizome.app.infra.entity.DepartmentEntity;
+import com.example.rhizome.app.infra.repository.DepartmentRepository;
+
+@Service
+@Transactional
+public class UpdateDepartmentImpl implements UpdateDepartment {
+
+	DepartmentRepository departmentRepository;
+
+	@Autowired
+	public UpdateDepartmentImpl(DepartmentRepository departmentRepository) {
+		this.departmentRepository = departmentRepository;
+	}
+
+	@Override
+	public void updateDepartment(Department beforeDepartment, Department updateDepartment) {
+
+		departmentRepository.save(DepartmentEntity.convertFrom(mergeDepartment(beforeDepartment, updateDepartment)));
+
+	}
+
+	private Department mergeDepartment(Department beforeDepartment, Department updateDepartment) {
+		return new Department(
+				updateDepartment.getIdDepartment(),
+				updateDepartment.getNmDepartment());
+
+	}
+
+}

src/main/java/com/example/rhizome/app/domain/service/impl/UpdateEmployeeImpl.java

@@ -1,16 +1,14 @@
 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.Employee;
 import com.example.rhizome.app.domain.service.UpdateEmployee;
 import com.example.rhizome.app.infra.entity.EmployeeEntity;
 import com.example.rhizome.app.infra.repository.EmployeeRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
-/**
- * employee の更新系の機能を集約させるサービスクラスです。
- */
 @Service
 @Transactional
 public class UpdateEmployeeImpl implements UpdateEmployee {
@@ -22,29 +20,13 @@ public class UpdateEmployeeImpl implements UpdateEmployee {
 		this.employeeRepository = employeeRepository;
 	}
 
-    /**
-     * employee の情報を元に employee table のレコードを更新する
-     *
-     * @param beforeEmployee 更新前のデータ
-     * @param updateEmployee 更新後のデータ
-     */
 	public void updateEmployee(Employee beforeEmployee, Employee updateEmployee) {
 
 		employeeRepository.save(EmployeeEntity.convertFrom(mergeEmployee(beforeEmployee, updateEmployee)));
 
 	}
 
-    /**
-     * 更新前のデータと更新対象のデータをマージする
-     *
-     * @param beforeEmployee 更新前のデータ
-     * @param updateEmployee 更新対象のデータ
-     * @return マージしたデータ
-     */
 	private Employee mergeEmployee(Employee beforeEmployee, Employee updateEmployee) {
-        // 更新対象のデータのパスワードが空文字の場合は、更新前のパスワードを使用する
-        // 更新対象のデータの管理者権限が null の場合は、更新前の管理者権限を使用する
-        // 更新対象のデータの部署IDが null の場合は、更新前の部署IDを使用する
 		return new Employee(
 				updateEmployee.getIdEmployee(),
 				updateEmployee.getNmEmployee(),
@@ -52,8 +34,8 @@ public class UpdateEmployeeImpl implements UpdateEmployee {
 				updateEmployee.getMailAddress(),
 				updateEmployee.getPassword().isBlank() ? beforeEmployee.getPassword() : updateEmployee.getPassword(),
 				updateEmployee.getAdminAuth() == null ? beforeEmployee.getAdminAuth() : updateEmployee.getAdminAuth(),
-                updateEmployee.getIdDepartment() == null ? beforeEmployee.getIdDepartment() : updateEmployee.getIdDepartment()
-        );
+				updateEmployee.getIdDepartment() == null ? beforeEmployee.getIdDepartment()
+						: updateEmployee.getIdDepartment());
 
 	}
 

src/main/java/com/example/rhizome/app/infra/entity/DepartmentEntity.java

@@ -1,25 +1,20 @@
-/*
- * Department.java
- *   作成	IT-College	2016
- *------------------------------------------------------------
- * Copyright(c) Rhizome Inc. All Rights Reserved.
- */
 package com.example.rhizome.app.infra.entity;
 
+import java.util.List;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 import com.example.rhizome.app.domain.model.Department;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.*;
-import java.util.List;
-
-/**
- * Department テーブルの Entity
- *
- * @author IT-College
- */
 @Entity
 @Table(name = "department")
 @Data
@@ -27,46 +22,26 @@ import java.util.List;
 @AllArgsConstructor
 public class DepartmentEntity {
 
-    /**
-     * 部署ID
-     */
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	@Column(name = "id_department", nullable = false)
 	private Integer idDepartment;
-    /**
-     * 部署名
-     */
 	@Column(name = "nm_department", nullable = false)
 	private String nmDepartment;
 
-    /**
-     * DepartmentEntity（DataAccess層依存）から Department（BusinessLogic層依存型）に変換します。
-     *
-     * @param departmentEntityList department Table のリスト
-     * @return List<Department> リスト
-     */
 	public static List<Department> createDepartmentList(List<DepartmentEntity> departmentEntityList) {
 
-        // Stream API を利用するとこうなります。
 		return departmentEntityList
 				.stream()
 				.map(departmentEntity -> new Department(
 						departmentEntity.getIdDepartment(),
-                        departmentEntity.getNmDepartment()
-                )).toList();
+						departmentEntity.getNmDepartment()))
+				.toList();
 	}
 
-    /**
-     * Department（BusinessLogic層依存型） から DepartmentEntity（DataAccess層依存）に変換します。
-     *
-     * @param department department モデルの値
-     * @return DepartmentEntity に変換したインスタンス
-     */
 	public static DepartmentEntity convertFrom(Department department) {
 		return new DepartmentEntity(
 				department.getIdDepartment(),
-                department.getNmDepartment()
-        );
+				department.getNmDepartment());
 	}
 }

src/main/java/com/example/rhizome/app/infra/entity/EmployeeDepartmentEntity.java

@@ -1,68 +1,53 @@
 package com.example.rhizome.app.infra.entity;
 
+import java.util.List;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.NamedEntityGraph;
+import javax.persistence.Table;
+
+import org.hibernate.annotations.Fetch;
+import org.hibernate.annotations.FetchMode;
+
 import com.example.rhizome.app.domain.model.Department;
 import com.example.rhizome.app.domain.model.Employee;
 import com.example.rhizome.app.domain.model.EmployeeInfo;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.hibernate.annotations.Fetch;
-import org.hibernate.annotations.FetchMode;
 
-import javax.persistence.*;
-import java.util.List;
-
-/**
- * Employee + Department の Join 情報を保持するEntity
- *
- * @author IT-College
- */
 @Entity
 @Table(name = "employee")
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@NamedEntityGraph(
-        name = "employee_with_department",
-        includeAllAttributes = true
-)
+@NamedEntityGraph(name = "employee_with_department", includeAllAttributes = true)
 public class EmployeeDepartmentEntity {
 
-    /**
-     * 社員ID
-     */
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	@Column(name = "id_employee", nullable = false)
 	private Integer idEmployee;
 
-    /**
-     * 社員名
-     */
 	@Column(name = "nm_employee", nullable = false)
 	private String nmEmployee;
 
-    /**
-     * 社員名カナ
-     */
 	@Column(name = "kn_employee", nullable = false)
 	private String knEmployee;
 
-    /**
-     * メールアドレス
-     */
 	@Column(name = "mail_address", nullable = false)
 	private String mailAddress;
 
-    /**
-     * パスワード
-     */
 	@Column(name = "password", nullable = false)
 	private String password;
 
-    /**
-     * 管理者権限
-     */
 	@Column(name = "admin_auth", nullable = false)
 	private Integer adminAuth;
 
@@ -71,17 +56,8 @@ public class EmployeeDepartmentEntity {
 	@Fetch(FetchMode.JOIN)
 	private DepartmentEntity department;
 
-    /**
-     * EmployeeDepartmentEntity（DataAccess層依存） を EmployeeInfo（BusinessLogic層依存） に変換します。
-     *
-     * @param employeeDepartmentEntity 　EmployeeDepartmentEntity のインスタンス
-     * @return EmployeeInfo のインスタンス
-     */
 	public static EmployeeInfo createEmployeeInfo(EmployeeDepartmentEntity employeeDepartmentEntity) {
 
-        // コンストラクタを使って書くとSetterを使用するより簡略化出来ます。
-        // 混乱してしまう人は落ち着いて EmployeeInfo のフィールドを見に行って、
-        // どうしてこの書き方が出来るのかを理解できる様になりましょう。
 		return new EmployeeInfo(
 				new Employee(
 						employeeDepartmentEntity.getIdEmployee(),
@@ -90,29 +66,21 @@ public class EmployeeDepartmentEntity {
 						employeeDepartmentEntity.getMailAddress(),
 						employeeDepartmentEntity.getPassword(),
 						employeeDepartmentEntity.getAdminAuth(),
-                        employeeDepartmentEntity.getDepartment() == null ? null : employeeDepartmentEntity.getDepartment().getIdDepartment()
-                ),
+						employeeDepartmentEntity.getDepartment() == null ? null
+								: employeeDepartmentEntity.getDepartment().getIdDepartment()),
 				new Department(
-                        employeeDepartmentEntity.getDepartment() == null ? null : employeeDepartmentEntity.getDepartment().getIdDepartment(),
-                        employeeDepartmentEntity.getDepartment() == null ? null : employeeDepartmentEntity.getDepartment().getNmDepartment()
-                )
-        );
+						employeeDepartmentEntity.getDepartment() == null ? null
+								: employeeDepartmentEntity.getDepartment().getIdDepartment(),
+						employeeDepartmentEntity.getDepartment() == null ? null
+								: employeeDepartmentEntity.getDepartment().getNmDepartment()));
 
 	}
 
-    /**
-     * EmployeeDepartmentEntity（DataAccess層依存） を EmployeeInfo（BusinessLogic層依存） に変換します。
-     * （リスト版）
-     *
-     * @param employeeDepartmentEntityList EmployeeDepartmentEntity インスタンスのリスト
-     * @return EmployeeInfo インスタンスのリスト
-     */
-    public static List<EmployeeInfo> createEmployeeInfoList(List<EmployeeDepartmentEntity> employeeDepartmentEntityList) {
+	public static List<EmployeeInfo> createEmployeeInfoList(
+			List<EmployeeDepartmentEntity> employeeDepartmentEntityList) {
 
-        // StreamAPI を使うとこうなります。
 		return employeeDepartmentEntityList.stream().map(EmployeeDepartmentEntity::createEmployeeInfo).toList();
 
 	}
 
-
 }

src/main/java/com/example/rhizome/app/infra/entity/EmployeeEntity.java

@@ -1,27 +1,22 @@
-/*
- * Employee.java
- *   作成	IT-College	2016
- *------------------------------------------------------------
- * Copyright(c) Rhizome Inc. All Rights Reserved.
- */
 package com.example.rhizome.app.infra.entity;
 
+import java.util.List;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 import com.example.rhizome.app.domain.model.Employee;
 import com.example.rhizome.app.domain.model.LoginUser;
 import com.example.rhizome.app.domain.model.SearchConditionEmployee;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.*;
-import java.util.List;
-
-/**
- * EmployeeテーブルのEntity
- *
- * @author IT-College
- */
 @Entity
 @Table(name = "employee")
 @Data
@@ -29,59 +24,30 @@ import java.util.List;
 @AllArgsConstructor
 public class EmployeeEntity {
 
-    /**
-     * 社員ID
-     */
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	@Column(name = "id_employee", nullable = false)
 	private Integer idEmployee;
 
-    /**
-     * 社員名
-     */
 	@Column(name = "nm_employee", nullable = false)
 	private String nmEmployee;
 
-    /**
-     * 社員名カナ
-     */
 	@Column(name = "kn_employee", nullable = false)
 	private String knEmployee;
 
-    /**
-     * メールアドレス
-     */
 	@Column(name = "mail_address", nullable = false)
 	private String mailAddress;
 
-    /**
-     * パスワード
-     */
 	@Column(name = "password", nullable = false)
 	private String password;
 
-    /**
-     * 管理者権限
-     */
 	@Column(name = "admin_auth", nullable = false)
 	private Integer adminAuth;
 
-    /**
-     * 部署ID
-     */
 	@Column(name = "id_department", nullable = false)
 	private Integer idDepartment;
 
-
-    /**
-     * Employee（BusinessLogic 依存）を EmployeeEntity（DataAccess層依存）に変換します。
-     *
-     * @param employee Employee Table の中身
-     * @return EmployeeEntity のインスタンス（１レコード分）
-     */
 	public static EmployeeEntity convertFrom(Employee employee) {
-        // 値を既に持ったインスタンスの生成に、コンストラクタを使用するとこうなります。
 		return new EmployeeEntity(
 				employee.getIdEmployee(),
 				employee.getNmEmployee(),
@@ -89,17 +55,9 @@ public class EmployeeEntity {
 				employee.getMailAddress(),
 				employee.getPassword(),
 				employee.getAdminAuth(),
-                employee.getIdDepartment()
-        );
+				employee.getIdDepartment());
 	}
 
-    /**
-     * SearchConditionEmployee（BusinessLogic 依存）を EmployeeEntity（DataAccess層依存）に変換します。
-     * (コンストラクタを使用せず、Setterを利用したパターン）
-     *
-     * @param searchConditionEmployee 検索条件
-     * @return EmployeeEntity のインスタンス（１レコード分）
-     */
 	public static EmployeeEntity convertFrom(SearchConditionEmployee searchConditionEmployee) {
 		EmployeeEntity employeeEntity = new EmployeeEntity();
 
@@ -109,19 +67,11 @@ public class EmployeeEntity {
 		employeeEntity.setMailAddress(searchConditionEmployee.getMailAddress());
 		employeeEntity.setIdDepartment(searchConditionEmployee.getIdDepartment());
 
-
 		return employeeEntity;
 
 	}
 
-    /**
-     * EmployeeEntity（DataAccess層依存）から Employee (BusinessLogic層依存型）に変換します。
-     *
-     * @param employeeEntity Employee Table のインスタンス
-     * @return employee インスタンス
-     */
 	public static Employee createEmployee(EmployeeEntity employeeEntity) {
-        // 値を既に持ったインスタンスの生成に、コンストラクタを使用するとこうなります。
 		return new Employee(
 				employeeEntity.getIdEmployee(),
 				employeeEntity.getNmEmployee(),
@@ -129,37 +79,14 @@ public class EmployeeEntity {
 				employeeEntity.getMailAddress(),
 				employeeEntity.getPassword(),
 				employeeEntity.getAdminAuth(),
-                employeeEntity.getIdDepartment()
-        );
+				employeeEntity.getIdDepartment());
 	}
 
-    /**
-     * EmployeeEntity（DataAccess層依存） から Employee (BusinessLogic層依存型）に変換します。（リスト版）
-     *
-     * @param employeeEntityList EmployeeEntity インスタンスのリスト
-     * @return Employee インスタンスのリスト
-     */
 	public static List<Employee> createEmployeeList(List<EmployeeEntity> employeeEntityList) {
-        /* 従来の書き方
-        List<Employee> employeeList = new ArrayList<>();
-        for(EmployeeEntity employeeEntity:employeeEntityList){
-            Employee employee = EmployeeEntity.createEmployee(employeeEntity);
-            employeeList.add(employee);
-        }
-        return employeeList;
-        */
-
-        // Stream APIを使用すると1行で書けます。
 		return employeeEntityList.stream().map(EmployeeEntity::createEmployee).toList();
 	}
 
-    /**
-     * EmployeeEntity（DataAccess層依存） から LoginUser (BusinessLogic層依存型）情報を作成します。
-     *
-     * @return loginUser （ログイン者の情報） インスタンス
-     */
 	public LoginUser createLoginUser() {
-        // 値を既に持ったインスタンスの生成に、コンストラクタを使用するとこうなります。
 		return new LoginUser(
 				getIdEmployee(),
 				getNmEmployee(),
@@ -167,8 +94,7 @@ public class EmployeeEntity {
 				getMailAddress(),
 				getPassword(),
 				getAdminAuth(),
-                getIdDepartment()
-        );
+				getIdDepartment());
 	}
 
 }

src/main/java/com/example/rhizome/app/infra/repository/DepartmentRepository.java

@@ -1,50 +1,31 @@
 package com.example.rhizome.app.infra.repository;
 
-import com.example.rhizome.app.infra.entity.DepartmentEntity;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;
 
+import com.example.rhizome.app.infra.entity.DepartmentEntity;
 
-/**
- * Specification:
- * 関数型インターフェースです。
- * JPAの一部として提供されていて、エンティティの情報を元に動的にクエリを生成し、DBからデータを取得します。
- * 使い方：
- * toPredicate をOverrideして使います。
- * パラメータ：
- * Root<T>：ルートエンティティを指します。<T>に指定したエンティティ（今回はDepartmentEntity）を用いてメンバにアクセスします。
- * CriteriaQuery<\?>：サブクエリを作成する際に使用します。※今回は使用しません
- * CriteriaBuilder:条件式（Where句以降の条件）の部分のクエリを作るためのビルダーです。
- * 戻り値はクエリを格納しているPredicateオブジェクトとなります。
- */
 @Repository
-public interface DepartmentRepository extends JpaRepository<DepartmentEntity, Integer>, JpaSpecificationExecutor<DepartmentEntity> {
-
+public interface DepartmentRepository
+		extends JpaRepository<DepartmentEntity, Integer>, JpaSpecificationExecutor<DepartmentEntity> {
 
 	static Specification<DepartmentEntity> idDepartmentEqual(Integer idDepartment) {
-        return idDepartment == null ?
-                null :
-                // 戻り値の型 Specification<DepartmentEntity> にキャスト
-                (Specification<DepartmentEntity>)
-                        // ラムダ式で記載しているが書いてあることは criteriaBuilder を使って Where句の後の "'idDepartment' = idDepartment(変数)"
-                        // を作成している
-                        (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder.equal(root.get("idDepartment"), idDepartment);
+		return idDepartment == null ? null
+				: (Specification<DepartmentEntity>) (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder
+						.equal(root.get("idDepartment"), idDepartment);
 	}
 
 	static Specification<DepartmentEntity> nmDepartmentEqual(String nmDepartment) {
-        return (nmDepartment == null || nmDepartment.isEmpty()) ?
-                null :
-                (Specification<DepartmentEntity>)
-                        (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder.like(root.get("nmDepartment"), nmDepartment);
+		return (nmDepartment == null || nmDepartment.isEmpty()) ? null
+				: (Specification<DepartmentEntity>) (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder
+						.like(root.get("nmDepartment"), nmDepartment);
 	}
 
-
 	static Specification<DepartmentEntity> nmDepartmentLike(String nmDepartment) {
-        return (nmDepartment == null || nmDepartment.isEmpty()) ?
-                null :
-                (Specification<DepartmentEntity>)
-                        (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder.like(root.get("nmDepartment"), "%" + nmDepartment + "%");
+		return (nmDepartment == null || nmDepartment.isEmpty()) ? null
+				: (Specification<DepartmentEntity>) (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder
+						.like(root.get("nmDepartment"), "%" + nmDepartment + "%");
 	}
 }

src/main/java/com/example/rhizome/app/infra/repository/EmployeeInfoRepository.java

@@ -1,61 +1,42 @@
 package com.example.rhizome.app.infra.repository;
 
-import com.example.rhizome.app.infra.entity.EmployeeDepartmentEntity;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;
 
-/**
- * ワンポイント情報（ここで登場する関数型インターフェース Specification について解説します）
- * Specification:
- * 関数型インターフェースです。
- * JPAの一部として提供されていて、エンティティの情報を元に動的にクエリを生成し、DBからデータを取得します。
- * 使い方：
- * toPredicate をOverrideして使います。
- * パラメータ：
- * Root<T>：ルートエンティティを指します。<T>に指定したエンティティ（今回はDepartmentEntity）を用いてメンバにアクセスします。
- * CriteriaQuery<\?>：サブクエリを作成する際に使用します。※今回は使用しません
- * CriteriaBuilder:条件式（Where句以降の条件）の部分のクエリを作るためのビルダーです。
- * 戻り値はクエリを格納しているPredicateオブジェクトとなります。
- */
+import com.example.rhizome.app.infra.entity.EmployeeDepartmentEntity;
+
 @Repository
-public interface EmployeeInfoRepository extends JpaRepository<EmployeeDepartmentEntity, Integer>, JpaSpecificationExecutor<EmployeeDepartmentEntity> {
+public interface EmployeeInfoRepository
+		extends JpaRepository<EmployeeDepartmentEntity, Integer>, JpaSpecificationExecutor<EmployeeDepartmentEntity> {
 
 	static Specification<EmployeeDepartmentEntity> idEmployeeEqual(Integer idEmployee) {
-        return idEmployee == null ?
-                null :
-                // 戻り値の型 Specification<EmployeeDepartmentEntity> にキャスト
-                (Specification<EmployeeDepartmentEntity>)
-                        // ラムダ式で記載しているが書いてあることは criteriaBuilder を使って Where句の後の "'idEmployee' = idEmployee(変数)"
-                        // を作成している
-                        (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder.equal(root.get("idEmployee"), idEmployee);
+		return idEmployee == null ? null
+				: (Specification<EmployeeDepartmentEntity>) (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder
+						.equal(root.get("idEmployee"), idEmployee);
 	}
 
 	static Specification<EmployeeDepartmentEntity> nmEmployeeEqual(String nmEmployee) {
-        return (nmEmployee == null || nmEmployee.isEmpty()) ?
-                null :
-                (Specification<EmployeeDepartmentEntity>)
-                        (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder.like(root.get("nmEmployee"), "%" + nmEmployee + "%");
+		return (nmEmployee == null || nmEmployee.isEmpty()) ? null
+				: (Specification<EmployeeDepartmentEntity>) (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder
+						.like(root.get("nmEmployee"), "%" + nmEmployee + "%");
 	}
 
 	static Specification<EmployeeDepartmentEntity> knEmployeeEqual(String knEmployee) {
-        return (knEmployee == null || knEmployee.isEmpty()) ?
-                null :
-                (Specification<EmployeeDepartmentEntity>)
-                        (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder.like(root.get("knEmployee"), "%" + knEmployee + "%");
+		return (knEmployee == null || knEmployee.isEmpty()) ? null
+				: (Specification<EmployeeDepartmentEntity>) (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder
+						.like(root.get("knEmployee"), "%" + knEmployee + "%");
 	}
 
 	static Specification<EmployeeDepartmentEntity> mailAddressEqual(String mailAddress) {
-        return (mailAddress == null || mailAddress.isEmpty()) ?
-                null :
-                (Specification<EmployeeDepartmentEntity>)
-                        (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder.like(root.get("mailAddress"), "%" + mailAddress + "%");
+		return (mailAddress == null || mailAddress.isEmpty()) ? null
+				: (Specification<EmployeeDepartmentEntity>) (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder
+						.like(root.get("mailAddress"), "%" + mailAddress + "%");
 	}
 
 	static Specification<EmployeeDepartmentEntity> idDepartmentEqual(Integer idDepartment) {
-        return (root, query, criteriaBuilder) ->
-                idDepartment == null ? null :
-                        criteriaBuilder.equal(root.join("department").get("idDepartment"), idDepartment);
+		return (root, query, criteriaBuilder) -> idDepartment == null ? null
+				: criteriaBuilder.equal(root.join("department").get("idDepartment"), idDepartment);
 	}
 }

src/main/java/com/example/rhizome/app/infra/repository/EmployeeRepository.java

@@ -1,28 +1,20 @@
 package com.example.rhizome.app.infra.repository;
 
-import com.example.rhizome.app.infra.entity.EmployeeEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
 import java.util.List;
 import java.util.Optional;
 
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import com.example.rhizome.app.infra.entity.EmployeeEntity;
+
 @Repository
 public interface EmployeeRepository extends JpaRepository<EmployeeEntity, Integer> {
 	Optional<EmployeeEntity> findByMailAddressAndPassword(String mailAddress, String password);
 
-    /**
-     * メールアドレスで検索
-     **/
 	Optional<EmployeeEntity> findByMailAddress(String mail);
 
-    /**
-     * IDで検索
-     **/
 	Optional<EmployeeEntity> findByIdEmployee(Integer idEmployee);
 
-    /**
-     * IDで検索
-     **/
 	List<EmployeeEntity> findByIdDepartment(Integer idDepartment);
 }

src/main/java/com/example/rhizome/app/presentation/controller/DeleteDepartmentController.java

@@ -0,0 +1,100 @@
+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.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.Employee;
+import com.example.rhizome.app.domain.model.SearchConditionDepartment;
+import com.example.rhizome.app.domain.service.DeleteDepartment;
+import com.example.rhizome.app.domain.service.SearchDepartment;
+import com.example.rhizome.app.domain.service.SearchEmployee;
+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.MessageForm;
+
+@Controller
+public class DeleteDepartmentController {
+
+	private final static Logger LOGGER = Logger.getLogger(DeleteDepartmentController.class.getName());
+
+	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
+
+	HttpSession httpSession;
+	DeleteDepartment deleteDepartment;
+	SearchDepartment searchDepartment;
+	SearchEmployee searchEmployee;
+
+	@Autowired
+	public DeleteDepartmentController(DeleteDepartment deleteDepartment, HttpSession httpSession,
+			SearchDepartment searchDepartment, SearchEmployee searchEmployee) {
+		this.httpSession = httpSession;
+		this.deleteDepartment = deleteDepartment;
+		this.searchDepartment = searchDepartment;
+		this.searchEmployee = searchEmployee;
+	}
+
+	@PermissionCheck
+	@SessionCheck
+	@RequestMapping(value = DELETE_DEPARTMENT, method = RequestMethod.POST)
+	public String deleteD(@RequestParam("idDepartment") Integer idDepartment, Model model) {
+
+		try {
+
+			List<DepartmentForm> list = DepartmentForm.convertFrom(
+					searchDepartment.searchByDepartmentId(new SearchConditionDepartment(idDepartment, null)));
+
+			deleteExec(
+					model,
+					idDepartment,
+					list);
+
+			return "forward:" + TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO_FORM_EMPTY;
+
+		} catch (Exception e) {
+			httpSession.invalidate();
+
+			e.printStackTrace();
+			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
+			return TransitionTargetPageNameKeyword.ERROR_HTML;
+		}
+	}
+
+	private void deleteExec(Model model, Integer idDepartment, List<DepartmentForm> list) {
+
+		final String DELETE_ID_NOT_EXISTS = "削除対象のIDが不明です。";
+		final String DELETE_TARGET_ID_CAN_NOT_DELETE = "1名以上が所属している部署は削除出来ません。";
+		final String DELETE_COMPLETE = "削除しました。";
+
+		if (list.isEmpty()) {
+			model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(DELETE_ID_NOT_EXISTS));
+		}
+
+		List<Employee> employee = searchEmployee.searchEmployeeByIdDepartment(list.get(0).getIdDepartment());
+
+		if (!employee.isEmpty()) {
+			model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
+					new MessageForm(DELETE_TARGET_ID_CAN_NOT_DELETE));
+			return;
+		}
+
+		deleteDepartment.deleteDepartment(idDepartment);
+
+		model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(DELETE_COMPLETE));
+
+	}
+}

src/main/java/com/example/rhizome/app/presentation/controller/DeleteEmployeeController.java

@@ -1,5 +1,19 @@
 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;
@@ -12,30 +26,12 @@ 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 {
 
-    // ログ出力用インスタンス
 	private final static Logger LOGGER = Logger.getLogger(DeleteEmployeeController.class.getName());
 
-    // エラーメッセージ用の定数フィールド
 	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
 
 	HttpSession httpSession;
@@ -43,78 +39,52 @@ public class DeleteEmployeeController {
 	SearchDepartment searchDepartment;
 
 	@Autowired
-    public DeleteEmployeeController(DeleteEmployee deleteEmployee, SearchDepartment searchDepartment, HttpSession httpSession) {
+	public DeleteEmployeeController(DeleteEmployee deleteEmployee, SearchDepartment searchDepartment,
+			HttpSession httpSession) {
 		this.httpSession = httpSession;
 		this.deleteEmployee = deleteEmployee;
 		this.searchDepartment = searchDepartment;
 	}
 
-    /**
-     * 削除処理のコントローラ
-     *
-     * @param idEmployee 削除対象のemployeeId
-     * @param model      ビューにデータを渡すためのコンテナ
-     * @return 遷移先の画面
-     */
 	@PermissionCheck
 	@SessionCheck
 	@RequestMapping(value = DELETE_EMPLOYEE, method = RequestMethod.POST)
 	public String deleteEmployee(@RequestParam("idEmployee") Integer idEmployee, Model model) {
 
 		try {
-            // 部署一覧を取得し、画面に返す用のクラスに詰め替える
-            // 作成した部署一覧をセット
 			model.addAttribute(
 					PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-                    DepartmentForm.convertFrom(searchDepartment.selectAll())
-            );
+					DepartmentForm.convertFrom(searchDepartment.selectAll()));
 
-            // 削除処理実施
 			deleteExec(
 					model,
 					idEmployee,
 					LoginUserForm.convertTo((LoginUserForm) httpSession.getAttribute(SessionKeyword.LOGIN_USER)));
 
-            // 検索画面に遷移
 			return "forward:" + TransitionTargetPageNameKeyword.SELECT_EMPLOYEE_INFO_FORM_EMPTY;
 
 		} catch (Exception e) {
-            // ログイン情報の破棄
 			httpSession.invalidate();
 
 			e.printStackTrace();
-            // エラーログ出力
 			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-            // エラー画面遷移
 			return TransitionTargetPageNameKeyword.ERROR_HTML;
 		}
 	}
 
-    /**
-     * 削除処理実施
-     *
-     * @param model      ビューにデータを渡すためのコンテナ
-     * @param idEmployee 削除対象のemployeeId
-     * @param loginUser  ログインユーザー情報
-     */
 	private void deleteExec(Model model, Integer idEmployee, LoginUser loginUser) {
 
 		final String DELETE_TARGET_ID_CAN_NOT_DELETE = "ログイン者自身は削除出来ません。";
 		final String DELETE_COMPLETE = "削除しました。";
 
-        // ログインしている人が、削除対象かチェック
 		if (Objects.equals(loginUser.getIdEmployee(), idEmployee)) {
-            // 削除対象だった場合
-            // エラーメッセージをセット
-            model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(DELETE_TARGET_ID_CAN_NOT_DELETE));
-            // 検索画面に遷移
+			model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
+					new MessageForm(DELETE_TARGET_ID_CAN_NOT_DELETE));
 			return;
 		}
 
-        // 削除を実施
 		deleteEmployee.deleteEmployee(idEmployee);
 
-        // 削除完了したメッセージをセット
 		model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(DELETE_COMPLETE));
 
 	}

src/main/java/com/example/rhizome/app/presentation/controller/IndexController.java

@@ -1,17 +1,18 @@
 package com.example.rhizome.app.presentation.controller;
 
-import com.example.rhizome.app.domain.service.impl.LoginImpl;
-import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
-import com.example.rhizome.app.presentation.form.LoginUserForm;
+import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.*;
+
+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 javax.servlet.http.HttpSession;
-
-import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.*;
+import com.example.rhizome.app.domain.service.impl.LoginImpl;
+import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
+import com.example.rhizome.app.presentation.form.LoginUserForm;
 
 @Controller
 public class IndexController {
@@ -28,23 +29,14 @@ public class IndexController {
 		return new LoginUserForm();
 	}
 
-    /**
-     * ログイン画面表示処理
-     *
-     * @param model ビューにデータを渡すためのコンテナ
-     * @return 遷移先の画面
-     */
-    @RequestMapping(value = {INDEX_BLANK, INDEX_SLASH, INDEX_LOGIN})
+	@RequestMapping(value = { INDEX_BLANK, INDEX_SLASH, INDEX_LOGIN })
 	public String index(Model model) {
-        // セッション情報を破棄
 		if (httpSession != null) {
 			httpSession.invalidate();
 		}
 
-        // 空のFormをSessionに用意
 		model.addAttribute(PageReturnAttributeKeyword.LOGIN_INFO_FORM, loginUserForm());
 
-        // ログイン画面に遷移
 		return LOGIN_HTML;
 	}
 }

src/main/java/com/example/rhizome/app/presentation/controller/InsertDepartmentConfirmController.java

@@ -0,0 +1,66 @@
+package com.example.rhizome.app.presentation.controller;
+
+import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.*;
+
+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.InsertDepartmentForm;
+
+@Controller
+public class InsertDepartmentConfirmController {
+
+	private final static Logger LOGGER = Logger.getLogger(InsertDepartmentConfirmController.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();
+	}
+
+	@PermissionCheck
+	@SessionCheck
+	@RequestMapping(value = INSERT_DEPARTMENT_CONFIRM, method = RequestMethod.POST)
+	public String insertDepartmentConfirm(InsertDepartmentForm insertDepartmentForm, Model model) {
+
+		try {
+			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;
+		}
+	}
+}

src/main/java/com/example/rhizome/app/presentation/controller/InsertDepartmentController.java

@@ -0,0 +1,120 @@
+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.model.Department;
+import com.example.rhizome.app.domain.model.SearchConditionDepartment;
+import com.example.rhizome.app.domain.service.RegisterDepartment;
+import com.example.rhizome.app.domain.service.SearchDepartment;
+import com.example.rhizome.app.domain.service.impl.RegisterDepartmentImpl;
+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.InsertDepartmentForm;
+import com.example.rhizome.app.presentation.form.MessageForm;
+
+@Controller
+public class InsertDepartmentController {
+
+	private final static Logger LOGGER = Logger.getLogger(InsertDepartmentController.class.getName());
+
+	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
+
+	HttpSession httpSession;
+	RegisterDepartment registerDepartment;
+	SearchDepartment searchDepartment;
+
+	@Autowired
+	public InsertDepartmentController(HttpSession httpSession, RegisterDepartmentImpl registerEmployee,
+			SearchDepartment searchDepartment) {
+		this.httpSession = httpSession;
+		this.registerDepartment = registerEmployee;
+		this.searchDepartment = searchDepartment;
+	}
+
+	@ModelAttribute
+	public InsertDepartmentForm insertDepartmentForm() {
+		return new InsertDepartmentForm();
+	}
+
+	@PermissionCheck
+	@SessionCheck
+	@RequestMapping(value = INSERT_DEPARTMENT, method = RequestMethod.POST)
+	public String insertDepartment(InsertDepartmentForm insertDepartmentForm, Model model) {
+
+		try {
+			List<String> error = validateParameter(
+					insertDepartmentForm.getNmDepartment());
+
+			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;
+			}
+
+			final String DUPLICATION = "既に同名の部署が存在します。";
+
+			SearchConditionDepartment searchConditionDepartment = new SearchConditionDepartment(null,
+					insertDepartmentForm.getNmDepartment());
+
+			List<Department> departmentList = searchDepartment.searchByDepartmentName(searchConditionDepartment);
+
+			if (!departmentList.isEmpty()) {
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(DUPLICATION));
+				model.addAttribute(PageReturnAttributeKeyword.INSERT_DEPARTMENT_FORM, insertDepartmentForm);
+				return TransitionTargetPageNameKeyword.INSERT_DEPARTMENT_INPUT_HTML;
+			}
+
+			registerDepartment.registerDepartment(InsertDepartmentForm.convertTo(insertDepartmentForm));
+			return TransitionTargetPageNameKeyword.INSERT_DEPARTMENT_RESULT_HTML;
+
+		} catch (Exception e) {
+			httpSession.invalidate();
+
+			e.printStackTrace();
+
+			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
+			return TransitionTargetPageNameKeyword.ERROR_HTML;
+		}
+	}
+
+	private List<String> validateParameter(
+			String departmentName) {
+
+		final String DEPARTMENT_NAME_NULL_BLANK = "部署名";
+
+		List<String> error = new ArrayList<>();
+
+		if (isNullOrBlank(departmentName)) {
+			error.add(DEPARTMENT_NAME_NULL_BLANK);
+		}
+
+		return error;
+
+	}
+
+	private static boolean isNullOrBlank(String str) {
+		if (null == str) {
+			return true;
+		}
+
+		return str.isBlank();
+	}
+
+}

src/main/java/com/example/rhizome/app/presentation/controller/InsertDepartmentInputController.java

@@ -0,0 +1,64 @@
+package com.example.rhizome.app.presentation.controller;
+
+import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.*;
+
+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.RegisterDepartment;
+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.InsertDepartmentForm;
+
+@Controller
+public class InsertDepartmentInputController {
+
+	private final static Logger LOGGER = Logger.getLogger(InsertDepartmentInputController.class.getName());
+
+	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
+
+	HttpSession httpSession;
+	RegisterDepartment registerDepartment;
+
+	@Autowired
+	public InsertDepartmentInputController(HttpSession httpSession, RegisterDepartment registerDepartment) {
+		this.httpSession = httpSession;
+		this.registerDepartment = registerDepartment;
+	}
+
+	@ModelAttribute
+	public InsertDepartmentForm insertDepartmentForm() {
+		return new InsertDepartmentForm();
+	}
+
+	@SessionCheck
+	@PermissionCheck
+	@RequestMapping(value = INSERT_DEPARTMENT_INPUT, method = RequestMethod.POST)
+	public String insertInput(InsertDepartmentForm insertDepartmentForm, Model model) {
+
+		try {
+			model.addAttribute(PageReturnAttributeKeyword.INSERT_DEPARTMENT_FORM, insertDepartmentForm);
+
+			return TransitionTargetPageNameKeyword.INSERT_DEPARTMENT_INPUT_HTML;
+
+		} catch (Exception e) {
+			httpSession.invalidate();
+
+			e.printStackTrace();
+
+			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
+			return TransitionTargetPageNameKeyword.ERROR_HTML;
+		}
+	}
+}

src/main/java/com/example/rhizome/app/presentation/controller/InsertEmployeeConfirmController.java

@@ -1,5 +1,20 @@
 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;
@@ -12,30 +27,12 @@ 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.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;
@@ -46,8 +43,7 @@ public class InsertEmployeeConfirmController {
 	public InsertEmployeeConfirmController(
 			HttpSession httpSession,
 			SearchDepartmentImpl searchDepartment,
-            SearchEmployeeImpl searchEmployee
-    ) {
+			SearchEmployeeImpl searchEmployee) {
 		this.httpSession = httpSession;
 		this.searchDepartment = searchDepartment;
 		this.searchEmployee = searchEmployee;
@@ -58,76 +54,46 @@ public class InsertEmployeeConfirmController {
 		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()
-                    ));
+							searchDepartment.selectAll()));
 
-            // 登録用パラメータチェック
 			List<String> error = insertEmployeeForm.validateParameter();
 
-            // 入力内容に誤りがあるか
 			if (!error.isEmpty()) {
-                // 誤りがあった場合
-                // 誤りがあった箇所のエラーメッセージを表示
-                model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(String.join(", ", error) + "が不正です。"));
-                // 画面に返す為の登録情報をセット
+				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;
 		}
 	}
 }
-
-
-

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,31 +27,12 @@ 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;
-
-/**
- * 新規登録用のコントローラ
- */
 @Controller
 public class InsertEmployeeController {
 
-    // ログ出力用インスタンス
 	private final static Logger LOGGER = Logger.getLogger(InsertEmployeeController.class.getName());
 
-    // エラーメッセージ用の定数フィールド
 	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
 
 	HttpSession httpSession;
@@ -43,7 +40,8 @@ public class InsertEmployeeController {
 	SearchDepartment searchDepartment;
 
 	@Autowired
-    public InsertEmployeeController(HttpSession httpSession, RegisterEmployeeImpl registerEmployee, SearchDepartmentImpl searchDepartment) {
+	public InsertEmployeeController(HttpSession httpSession, RegisterEmployeeImpl registerEmployee,
+			SearchDepartmentImpl searchDepartment) {
 		this.httpSession = httpSession;
 		this.registerEmployee = registerEmployee;
 		this.searchDepartment = searchDepartment;
@@ -54,80 +52,51 @@ public class InsertEmployeeController {
 		return new InsertEmployeeForm();
 	}
 
-    /**
-     * 新規登録画面表示処理
-     *
-     * @param insertEmployeeForm 登録情報
-     * @param model              ビューにデータを渡すためのコンテナ
-     * @return 遷移先の画面
-     */
 	@PermissionCheck
 	@SessionCheck
 	@RequestMapping(value = INSERT_EMPLOYEE, method = RequestMethod.POST)
 	public String insertEmployee(InsertEmployeeForm insertEmployeeForm, Model model) {
 
 		try {
-            // 部署一覧を取得し、画面に返す用のクラスに詰め替える
-            // 作成した部署一覧をセット
 			model.addAttribute(
 					PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
 					DepartmentForm.convertFrom(
-                            searchDepartment.selectAll()
-                    ));
+							searchDepartment.selectAll()));
 
-            // Confirm画面から渡ってきた値をチェック
 			List<String> error = validateParameter(
 					insertEmployeeForm.getNmEmployee(),
 					insertEmployeeForm.getKnEmployee(),
 					insertEmployeeForm.getMailAddress(),
 					insertEmployeeForm.getPassword(),
 					insertEmployeeForm.getAdminAuth(),
-                    insertEmployeeForm.getIdDepartment()
-            );
+					insertEmployeeForm.getIdDepartment());
 
-            // エラーが1件以上有る場合
 			if (!error.isEmpty()) {
-                // エラー内容を画面に表示
-                model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(String.join(", ", error) + "が不正です。"));
-                // 登録画面に遷移
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
+						new MessageForm(String.join(", ", error) + "が不正です。"));
 				return TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_INPUT_HTML;
 			}
 
-            // 登録処理
 			registerEmployee.registerEmployee(InsertEmployeeForm.convertTo(insertEmployeeForm));
-            // 登録結果画面に遷移
 			return TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_RESULT_HTML;
 
 		} catch (Exception e) {
-            // ログイン情報の破棄
 			httpSession.invalidate();
 
 			e.printStackTrace();
 
-            // エラーログ出力
 			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-            // エラー画面遷移
 			return TransitionTargetPageNameKeyword.ERROR_HTML;
 		}
 	}
 
-    /**
-     * @param employeeName 登録対象の名前
-     * @param employeeKana 登録対象のカナ
-     * @param mailAddress  登録対象のメールアドレス
-     * @param password     登録対象のパスワード
-     * @param management   システム権限
-     * @param departmentId 部署ID
-     * @return エラーが有った場合はエラー文言、無ければ空のリストが返る
-     */
 	private List<String> validateParameter(
 			String employeeName,
 			String employeeKana,
 			String mailAddress,
 			String password,
 			Integer management,
-            Integer departmentId
-    ) {
+			Integer departmentId) {
 
 		final String EMPLOYEE_NAME_NULL_BLANK = "社員名";
 		final String EMPLOYEE_KANA_NULL_BLANK = "社員名フリガナ";
@@ -138,39 +107,27 @@ public class InsertEmployeeController {
 
 		List<String> error = new ArrayList<>();
 
-        // null or 空文字判定
 		if (isNullOrBlank(employeeName)) {
-            // エラー内容を追加
 			error.add(EMPLOYEE_NAME_NULL_BLANK);
 		}
 
-        // null or 空文字判定
 		if (isNullOrBlank(employeeKana)) {
-            // エラー内容を追加
 			error.add(EMPLOYEE_KANA_NULL_BLANK);
 		}
 
-        // null or 空文字判定
 		if (isNullOrBlank(mailAddress)) {
-            // エラー内容を追加
 			error.add(MAIL_ADDRESS_NULL_BLANK);
 		}
 
-        // null or 空文字判定
 		if (isNullOrBlank(password)) {
-            // エラー内容を追加
 			error.add(PASSWORD_NULL_BLANK);
 		}
 
-        // 管理者権限の値が不正か
 		if (management == null) {
-            // エラー内容を追加
 			error.add(MANAGEMENT_ERROR);
 		}
 
-        // 所属部署の値が不正か
 		if (departmentId == null) {
-            // エラー内容を追加
 			error.add(DEPARTMENT_ID_NULL_BLANK);
 		}
 
@@ -178,12 +135,6 @@ public class InsertEmployeeController {
 
 	}
 
-    /**
-     * 仮引数を null or 空 判定する
-     *
-     * @param str 判定対象の文字列
-     * @return true:null or 空 false:null or 空 では無い
-     */
 	private static boolean isNullOrBlank(String str) {
 		if (null == str) {
 			return true;
@@ -193,6 +144,3 @@ public class InsertEmployeeController {
 	}
 
 }
-
-
-

src/main/java/com/example/rhizome/app/presentation/controller/InsertEmployeeInputController.java

@@ -1,5 +1,19 @@
 package com.example.rhizome.app.presentation.controller;
 
+import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.*;
+
+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;
@@ -8,29 +22,12 @@ import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAt
 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 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;
-
-import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_INPUT;
-
-/**
- * 登録画面表示用コントローラ
- */
 @Controller
 public class InsertEmployeeInputController {
 
-    // ログ出力用インスタンス
 	private final static Logger LOGGER = Logger.getLogger(InsertEmployeeInputController.class.getName());
 
-    // エラーメッセージ用の定数フィールド
 	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
 
 	HttpSession httpSession;
@@ -38,7 +35,8 @@ public class InsertEmployeeInputController {
 	SearchDepartment searchDepartment;
 
 	@Autowired
-    public InsertEmployeeInputController(HttpSession httpSession, RegisterEmployee registerEmployee, SearchDepartment searchDepartment) {
+	public InsertEmployeeInputController(HttpSession httpSession, RegisterEmployee registerEmployee,
+			SearchDepartment searchDepartment) {
 		this.httpSession = httpSession;
 		this.registerEmployee = registerEmployee;
 		this.searchDepartment = searchDepartment;
@@ -49,42 +47,26 @@ public class InsertEmployeeInputController {
 		return new InsertEmployeeForm();
 	}
 
-
-    /**
-     * 登録画面表示処理
-     *
-     * @param insertEmployeeForm 登録画面のフォーム
-     * @param model              ビューにデータを渡すためのコンテナ
-     * @return 遷移先の画面
-     */
 	@SessionCheck
 	@PermissionCheck
 	@RequestMapping(value = INSERT_EMPLOYEE_INPUT, method = RequestMethod.POST)
 	public String insertInput(InsertEmployeeForm insertEmployeeForm, Model model) {
 
 		try {
-            // 部署コードリストを作成し、画面に返す値としてセット
-            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(searchDepartment.selectAll()));
+			model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+					DepartmentForm.convertFrom(searchDepartment.selectAll()));
 
-            // パラメータをセット
 			model.addAttribute(PageReturnAttributeKeyword.INSERT_EMPLOYEE_FORM, insertEmployeeForm);
 
-            // 登録画面に遷移
 			return TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_INPUT_HTML;
 
 		} catch (Exception e) {
-            // ログイン情報の破棄
 			httpSession.invalidate();
 
 			e.printStackTrace();
 
-            // エラーログ出力
 			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-            // エラー画面遷移
 			return TransitionTargetPageNameKeyword.ERROR_HTML;
 		}
 	}
 }
-
-
-

src/main/java/com/example/rhizome/app/presentation/controller/LoginController.java

@@ -1,5 +1,18 @@
 package com.example.rhizome.app.presentation.controller;
 
+import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.*;
+
+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.app.domain.model.LoginInfo;
 import com.example.rhizome.app.domain.model.LoginUser;
@@ -11,29 +24,12 @@ import com.example.rhizome.app.presentation.form.LoginInfoForm;
 import com.example.rhizome.app.presentation.form.LoginUserForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
 import com.example.rhizome.app.presentation.form.UpdatePersonalUserForm;
-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;
-
-import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.DO_LOGIN;
-
-/**
- * ログイン関連のコントローラ
- */
 @Controller
 public class LoginController {
 
-    // ログ出力用インスタンス
 	private final static Logger LOGGER = Logger.getLogger(LoginController.class.getName());
 
-    // エラーメッセージ用の定数フィールド
 	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
 
 	HttpSession httpSession;
@@ -50,99 +46,59 @@ public class LoginController {
 		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));
+				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));
-                // 個人の情報更新ページに遷移
+				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()
-        );
+				loginInfoForm.getPassword());
 	}
 }

src/main/java/com/example/rhizome/app/presentation/controller/LogoutController.java

@@ -1,10 +1,12 @@
 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.presentation.controller.pageproperty.PageReturnAttributeKeyword;
-import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.LoginUserForm;
+import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.*;
+
+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;
@@ -12,21 +14,16 @@ 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;
+import com.example.rhizome.aop.aspect.PermissionCheck;
+import com.example.rhizome.aop.aspect.SessionCheck;
+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.LoginUserForm;
 
-import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.LOGOUT;
-
-/**
- * ログアウト処理のコントローラ
- */
 @Controller
 public class LogoutController {
 
-    // ログ出力用インスタンス
 	private final static Logger LOGGER = Logger.getLogger(LogoutController.class.getName());
-    // エラーメッセージ用の定数フィールド
 	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
 
 	HttpSession httpSession;
@@ -41,30 +38,19 @@ public class LogoutController {
 		return new LoginUserForm();
 	}
 
-    /**
-     * ログアウト処理
-     *
-     * @param model ビューにデータを渡すためのコンテナ
-     * @return 遷移先の画面
-     */
 	@PermissionCheck
 	@SessionCheck
 	@RequestMapping(value = LOGOUT, method = RequestMethod.POST)
 	public String doLogout(Model model) {
 		try {
-            // セッション情報の破棄
 			httpSession.invalidate();
 
-            // ログイン画面に遷移するための情報を設定
 			model.addAttribute(PageReturnAttributeKeyword.LOGIN_INFO_FORM, loginUserForm());
-            // login.html に遷移
 			return TransitionTargetPageNameKeyword.LOGIN_HTML;
 
 		} catch (Exception e) {
 
-            // エラーログ出力
 			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-            // エラーページに遷移
 			return TransitionTargetPageNameKeyword.ERROR_HTML;
 		}
 

src/main/java/com/example/rhizome/app/presentation/controller/MenuController.java

@@ -1,16 +1,14 @@
 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.RequestMapping;
+
 import com.example.rhizome.aop.aspect.PermissionCheck;
 import com.example.rhizome.aop.aspect.SessionCheck;
 import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
 import com.example.rhizome.app.presentation.form.MessageForm;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
 
-/**
- * メニュー画面表示用コントローラ
- */
 @Controller
 public class MenuController {
 
@@ -19,14 +17,10 @@ public class MenuController {
 		return new MessageForm();
 	}
 
-    /**
-     * メニュー画面に遷移
-     */
 	@PermissionCheck
 	@SessionCheck
 	@RequestMapping(value = TransitionTargetPageNameKeyword.SHOW_MENU)
 	public String showMenu() {
-        // メニュー画面遷移
 		return TransitionTargetPageNameKeyword.MENU_HTML;
 	}
 

src/main/java/com/example/rhizome/app/presentation/controller/SelectDepartmentController.java

@@ -0,0 +1,82 @@
+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;
+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 {
+
+	private final static Logger LOGGER = Logger.getLogger(SelectDepartmentController.class.getName());
+
+	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
+
+	HttpSession httpSession;
+	SearchDepartment searchDepartment;
+	SearchEmployeeInfo searchEmployeeInfo;
+
+	@Autowired
+	public SelectDepartmentController(HttpSession httpSession, SearchDepartment searchDepartment,
+			SearchEmployeeInfo searchEmployeeInfo) {
+		this.httpSession = httpSession;
+		this.searchDepartment = searchDepartment;
+		this.searchEmployeeInfo = searchEmployeeInfo;
+	}
+
+	@ModelAttribute
+	public SearchConditionDepartmentForm searchConditionDepartmentForm() {
+		return new SearchConditionDepartmentForm();
+	}
+
+	@SessionCheck
+	@PermissionCheck
+	@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT, method = RequestMethod.POST)
+	public String select(SearchConditionDepartmentForm searchConditionDepartmentForm, Model model) {
+		try {
+
+			model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(
+					searchDepartment
+							.searchByWithLike(SearchConditionDepartmentForm.convertTo(searchConditionDepartmentForm))));
+
+			return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
+
+		} catch (Exception e) {
+			httpSession.invalidate();
+
+			e.printStackTrace();
+
+			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
+			return TransitionTargetPageNameKeyword.ERROR_HTML;
+		}
+
+	}
+
+	@SessionCheck
+	@PermissionCheck
+	@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO_FORM_EMPTY, method = RequestMethod.POST)
+	public String select(Model model) {
+
+		model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(
+				searchDepartment.searchBy(SearchConditionDepartmentForm.convertTo(searchConditionDepartmentForm()))));
+
+		return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
+	}
+
+}

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,26 +21,11 @@ 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;
-
-/**
- * 社員検索画面用コントローラ　リスト全件表示、検索表示、更新、削除が可能
- */
 @Controller
 public class SelectEmployeeController {
 
-    // ログ出力用インスタンス
 	private final static Logger LOGGER = Logger.getLogger(SelectEmployeeController.class.getName());
-    // エラーメッセージ用の定数フィールド
 	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
 
 	HttpSession httpSession;
@@ -36,7 +33,8 @@ public class SelectEmployeeController {
 	SearchEmployeeInfo searchEmployeeInfo;
 
 	@Autowired
-    public SelectEmployeeController(HttpSession httpSession, SearchDepartment searchDepartment, SearchEmployeeInfo searchEmployeeInfo) {
+	public SelectEmployeeController(HttpSession httpSession, SearchDepartment searchDepartment,
+			SearchEmployeeInfo searchEmployeeInfo) {
 		this.httpSession = httpSession;
 		this.searchDepartment = searchDepartment;
 		this.searchEmployeeInfo = searchEmployeeInfo;
@@ -47,75 +45,42 @@ public class SelectEmployeeController {
 		return new SearchConditionEmployeeForm();
 	}
 
-    /**
-     * 社員検索画面表示処理コントローラ
-     *
-     * @param searchConditionEmployeeForm 検索画面のフォーム
-     * @param model                       ビューにデータを渡すためのコンテナ
-     * @return 遷移先の画面
-     */
 	@PermissionCheck
 	@SessionCheck
 	@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_EMPLOYEE_INFO, method = RequestMethod.POST)
 	public String select(SearchConditionEmployeeForm searchConditionEmployeeForm, Model model) {
-
 		try {
 
-            // 部署一覧を取得し、画面に返す用のクラスに詰め替える
-            // 作成した部署一覧をセット
 			model.addAttribute(
 					PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-                    DepartmentForm.convertFrom(searchDepartment.selectAll())
-            );
+					DepartmentForm.convertFrom(searchDepartment.selectAll()));
 
-            // 検索条件を元に検索を実施
-            // 取得した EmployeeInfo（ employee + department ）の情報を画面に返す用の型に詰め替えてセット
-            model.addAttribute(PageReturnAttributeKeyword.EMPLOYEE_INFO_FORM_LIST, EmployeeInfoForm.convertFrom(searchEmployeeInfo.searchBy(SearchConditionEmployeeForm.convertTo(searchConditionEmployeeForm))));
-            // 検索ページに遷移
+			model.addAttribute(PageReturnAttributeKeyword.EMPLOYEE_INFO_FORM_LIST, EmployeeInfoForm.convertFrom(
+					searchEmployeeInfo.searchBy(SearchConditionEmployeeForm.convertTo(searchConditionEmployeeForm))));
 			return TransitionTargetPageNameKeyword.SELECT_EMPLOYEE_HTML;
 
-
 		} catch (Exception e) {
-            // ログイン情報の破棄
 			httpSession.invalidate();
 
 			e.printStackTrace();
 
-            // エラーログ出力
 			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-            // エラー画面遷移
 			return TransitionTargetPageNameKeyword.ERROR_HTML;
 		}
 
 	}
 
-    /**
-     * 社員検索画面表示処理コントローラ
-     * 検索条件無しの状態を作るため、空の検索条件で検索した結果を画面に返す
-     *
-     * @param model ビューにデータを渡すためのコンテナ
-     * @return 遷移先の画面
-     */
-    @PermissionCheck
-    @SessionCheck
 	@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_EMPLOYEE_INFO_FORM_EMPTY, method = RequestMethod.POST)
 	public String select(Model model) {
-
-        // 部署一覧を取得し、画面に返す用のクラスに詰め替える
-        // 作成した部署一覧をセット
 		model.addAttribute(
 				PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-                DepartmentForm.convertFrom(searchDepartment.selectAll())
-        );
+				DepartmentForm.convertFrom(searchDepartment.selectAll()));
 
-        // 検索条件を元に検索を実施
 		model.addAttribute(PageReturnAttributeKeyword.EMPLOYEE_INFO_FORM_LIST,
 				EmployeeInfoForm.convertFrom(
 						searchEmployeeInfo.searchBy(
-                                SearchConditionEmployeeForm.convertTo(searchConditionEmployeeForm())
-                        )));
+								SearchConditionEmployeeForm.convertTo(searchConditionEmployeeForm()))));
 
-        // 検索ページに遷移
 		return TransitionTargetPageNameKeyword.SELECT_EMPLOYEE_HTML;
 	}
 }

src/main/java/com/example/rhizome/app/presentation/controller/UpdateDepartmentController.java

@@ -0,0 +1,83 @@
+package com.example.rhizome.app.presentation.controller;
+
+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 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.Department;
+import com.example.rhizome.app.domain.model.SearchConditionDepartment;
+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.MessageForm;
+import com.example.rhizome.app.presentation.form.SearchConditionDepartmentForm;
+import com.example.rhizome.app.presentation.form.UpdateDepartmentForm;
+
+@Controller
+public class UpdateDepartmentController {
+
+	private final static Logger LOGGER = Logger.getLogger(UpdateDepartmentController.class.getName());
+	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
+
+	HttpSession httpSession;
+	SearchDepartment searchDepartment;
+	SearchEmployeeInfo searchEmployeeInfo;
+
+	@Autowired
+	public UpdateDepartmentController(HttpSession httpSession, SearchDepartment searchDepartment) {
+		this.httpSession = httpSession;
+		this.searchDepartment = searchDepartment;
+	}
+
+	@ModelAttribute
+	public SearchConditionDepartmentForm searchConditionDepartmentForm() {
+		return new SearchConditionDepartmentForm();
+	}
+
+	@PermissionCheck
+	@SessionCheck
+	@RequestMapping(value = TransitionTargetPageNameKeyword.SHOW_UPDATE_DEPARTMENT, method = RequestMethod.POST)
+	public String showUpdateDepartment(@RequestParam("idDepartment") Integer idDepartment, Model model) {
+		LOGGER.info("showUpdateDepartment 실행");
+		final String NO_TARGET = "更新対象のデータが見つかりません。";
+
+		try {
+
+			List<Department> departmentList = searchDepartment.searchByDepartmentId(
+					new SearchConditionDepartment(idDepartment,
+							null));
+
+			if (departmentList.isEmpty()) {
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(NO_TARGET));
+				return "forward:" + TransitionTargetPageNameKeyword.SELECT_DEPARTMENT;
+			}
+
+			model.addAttribute(PageReturnAttributeKeyword.UPDATE_DEPARTMENT_FORM,
+					UpdateDepartmentForm.convertFrom(departmentList.get(0)));
+
+			return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
+
+		} catch (Exception e) {
+			httpSession.invalidate();
+
+			e.printStackTrace();
+
+			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
+			return TransitionTargetPageNameKeyword.ERROR_HTML;
+
+		}
+	}
+}

src/main/java/com/example/rhizome/app/presentation/controller/UpdateDepartmentResultController.java

@@ -0,0 +1,116 @@
+package com.example.rhizome.app.presentation.controller;
+
+import java.util.List;
+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.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.Department;
+import com.example.rhizome.app.domain.model.SearchConditionDepartment;
+import com.example.rhizome.app.domain.service.SearchDepartment;
+import com.example.rhizome.app.domain.service.UpdateDepartment;
+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.LoginUserForm;
+import com.example.rhizome.app.presentation.form.MessageForm;
+import com.example.rhizome.app.presentation.form.UpdateDepartmentForm;
+import com.example.rhizome.app.presentation.form.UpdateEmployeeInfoForm;
+
+@Controller
+public class UpdateDepartmentResultController {
+
+	private final static Logger LOGGER = Logger.getLogger(UpdateEmployeeController.class.getName());
+	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
+
+	HttpSession httpSession;
+	SearchDepartment searchDepartment;
+	UpdateDepartment updateDepartment;
+
+	@Autowired
+	public UpdateDepartmentResultController(HttpSession httpSession, SearchDepartment searchDepartment,
+			UpdateDepartment updateDepartment) {
+		this.httpSession = httpSession;
+		this.searchDepartment = searchDepartment;
+		this.updateDepartment = updateDepartment;
+	}
+
+	private static boolean checkDuplicateDepartmentName(List<Department> departmentList,
+			UpdateDepartmentForm updateDepartmentForm) {
+		if (!departmentList.isEmpty()) {
+			return Objects.equals(departmentList.get(0).getNmDepartment(), updateDepartmentForm.getNmDepartment());
+		}
+		return true;
+	}
+
+	@PermissionCheck
+	@SessionCheck
+	@RequestMapping(value = TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_RESULT, method = RequestMethod.POST)
+	public String departmentUpdateResult(@ModelAttribute UpdateDepartmentForm updateDepartmentForm, Model model) {
+
+		final String DUPLICATION = "既に同名の部署が存在するか、値が変更されていません。";
+		final String NOTHING = "項目が空欄です。";
+
+		final String UPDATE_COMPLETE = "更新が完了しました。";
+
+		try {
+
+			List<Department> departmentList = searchDepartment
+					.searchByDepartmentId(new SearchConditionDepartment(updateDepartmentForm.getIdDepartment(), null));
+
+			if (checkDuplicateDepartmentName(departmentList, updateDepartmentForm)) {
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(DUPLICATION));
+				model.addAttribute(PageReturnAttributeKeyword.UPDATE_DEPARTMENT_FORM, updateDepartmentForm);
+
+				return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
+			}
+
+			if (!UpdateDepartmentForm.hasErrorParameter(updateDepartmentForm)) {
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(NOTHING));
+				model.addAttribute(PageReturnAttributeKeyword.UPDATE_DEPARTMENT_FORM, updateDepartmentForm);
+
+				return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
+			}
+
+			List<Department> beforeDepartment = searchDepartment
+					.searchByDepartmentId(new SearchConditionDepartment(updateDepartmentForm.getIdDepartment(), null));
+
+			updateDepartment.updateDepartment(beforeDepartment.get(0),
+					UpdateDepartmentForm.convertTo(updateDepartmentForm));
+
+			model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(UPDATE_COMPLETE));
+
+			return "forward:" + TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO_FORM_EMPTY;
+
+		} catch (Exception e) {
+			httpSession.invalidate();
+
+			e.printStackTrace();
+			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
+			return TransitionTargetPageNameKeyword.ERROR_HTML;
+		}
+
+	}
+
+	private boolean isUpdateTargetLoginUserAdminToNormal(UpdateEmployeeInfoForm updateEmployeeInfoForm,
+			LoginUserForm loginUserForm) {
+
+		if (!Objects.equals(updateEmployeeInfoForm.getIdEmployee(), loginUserForm.getIdEmployee())) {
+			return false;
+		}
+
+		return updateEmployeeInfoForm.getAdminAuth().equals(0);
+
+	}
+
+}

src/main/java/com/example/rhizome/app/presentation/controller/UpdateEmployeeController.java

@@ -1,5 +1,19 @@
 package com.example.rhizome.app.presentation.controller;
 
+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 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.EmployeeInfo;
@@ -12,28 +26,11 @@ import com.example.rhizome.app.presentation.form.DepartmentForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
 import com.example.rhizome.app.presentation.form.SearchConditionEmployeeForm;
 import com.example.rhizome.app.presentation.form.UpdateEmployeeInfoForm;
-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 org.springframework.web.bind.annotation.RequestParam;
 
-import javax.servlet.http.HttpSession;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * 更新対象の employee が存在するか確認する為のコントローラ
- */
 @Controller
 public class UpdateEmployeeController {
 
-    // ログ出力用インスタンス
 	private final static Logger LOGGER = Logger.getLogger(UpdateEmployeeController.class.getName());
-    // エラーメッセージ用の定数フィールド
 	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
 
 	HttpSession httpSession;
@@ -41,7 +38,8 @@ public class UpdateEmployeeController {
 	SearchEmployeeInfo searchEmployeeInfo;
 
 	@Autowired
-    public UpdateEmployeeController(HttpSession httpSession, SearchDepartment searchDepartment, SearchEmployeeInfo searchEmployeeInfo) {
+	public UpdateEmployeeController(HttpSession httpSession, SearchDepartment searchDepartment,
+			SearchEmployeeInfo searchEmployeeInfo) {
 		this.httpSession = httpSession;
 		this.searchDepartment = searchDepartment;
 		this.searchEmployeeInfo = searchEmployeeInfo;
@@ -52,13 +50,6 @@ public class UpdateEmployeeController {
 		return new SearchConditionEmployeeForm();
 	}
 
-    /**
-     * 更新対象の employee が存在するか確認する為のコントローラ
-     *
-     * @param idEmployee 更新対象の employee の id
-     * @param model      ビューにデータを渡すためのコンテナ
-     * @return 遷移先の画面
-     */
 	@PermissionCheck
 	@SessionCheck
 	@RequestMapping(value = TransitionTargetPageNameKeyword.SHOW_UPDATE_EMPLOYEE, method = RequestMethod.POST)
@@ -66,10 +57,9 @@ public class UpdateEmployeeController {
 		final String UPDATE_TARGET_ID_NOT_FOUND = "更新対象のデータが見つかりません。";
 
 		try {
-            // 部署一覧を取得し画面に返す値としてセット
-            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(searchDepartment.selectAll()));
+			model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+					DepartmentForm.convertFrom(searchDepartment.selectAll()));
 
-            // id を条件に更新対象のレコードを検索、取得する
 			List<EmployeeInfo> employeeInfoList = searchEmployeeInfo.searchBy(
 					new SearchConditionEmployee(idEmployee,
 							null,
@@ -77,29 +67,23 @@ public class UpdateEmployeeController {
 							null,
 							null));
 
-            // DBに更新対象のデータがあるか
 			if (employeeInfoList.isEmpty()) {
-                // ない場合はエラーメッセージをセットして検索画面に戻る
-                model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(UPDATE_TARGET_ID_NOT_FOUND));
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
+						new MessageForm(UPDATE_TARGET_ID_NOT_FOUND));
 				return "forward:" + TransitionTargetPageNameKeyword.SELECT_EMPLOYEE_INFO;
 			}
 
-            // 更新画面に遷移
-            model.addAttribute(PageReturnAttributeKeyword.UPDATE_EMPLOYEE_INFO_FORM, UpdateEmployeeInfoForm.convertFrom(employeeInfoList.get(0)));
+			model.addAttribute(PageReturnAttributeKeyword.UPDATE_EMPLOYEE_INFO_FORM,
+					UpdateEmployeeInfoForm.convertFrom(employeeInfoList.get(0)));
 
-            // Update画面に遷移
 			return TransitionTargetPageNameKeyword.UPDATE_EMPLOYEE_INPUT_HTML;
 
-
 		} catch (Exception e) {
-            // ログイン情報の破棄
 			httpSession.invalidate();
 
 			e.printStackTrace();
 
-            // エラーログ出力
 			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-            // エラー画面遷移
 			return TransitionTargetPageNameKeyword.ERROR_HTML;
 
 		}

src/main/java/com/example/rhizome/app/presentation/controller/UpdateEmployeeResultController.java

@@ -1,5 +1,18 @@
 package com.example.rhizome.app.presentation.controller;
 
+import java.util.List;
+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.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;
@@ -15,28 +28,11 @@ 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 com.example.rhizome.app.presentation.form.UpdateEmployeeInfoForm;
-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.Objects;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * employee を更新して結果を返す為のコントローラ
- */
 @Controller
 public class UpdateEmployeeResultController {
 
-    // ログ出力用インスタンス
 	private final static Logger LOGGER = Logger.getLogger(UpdateEmployeeController.class.getName());
-    // エラーメッセージ用の定数フィールド
 	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
 
 	HttpSession httpSession;
@@ -45,36 +41,22 @@ public class UpdateEmployeeResultController {
 	UpdateEmployee updateEmployee;
 
 	@Autowired
-    public UpdateEmployeeResultController(HttpSession httpSession, SearchDepartment searchDepartment, SearchEmployee searchEmployee, UpdateEmployee updateEmployee) {
+	public UpdateEmployeeResultController(HttpSession httpSession, SearchDepartment searchDepartment,
+			SearchEmployee searchEmployee, UpdateEmployee updateEmployee) {
 		this.httpSession = httpSession;
 		this.searchDepartment = searchDepartment;
 		this.searchEmployee = searchEmployee;
 		this.updateEmployee = updateEmployee;
 	}
 
-    /**
-     * メールアドレスの重複チェック
-     *
-     * @param employeeList           元の employeeList
-     * @param updateEmployeeInfoForm 更新対象のデータ
-     * @return true:重複無し  false:重複あり
-     */
-    private static boolean checkDuplicateMailAddress(List<Employee> employeeList, UpdateEmployeeInfoForm updateEmployeeInfoForm) {
-        // メールアドレスが既に使われていた場合
+	private static boolean checkDuplicateMailAddress(List<Employee> employeeList,
+			UpdateEmployeeInfoForm updateEmployeeInfoForm) {
 		if (!employeeList.isEmpty()) {
-            // 重複が有った場合に、同一人物のものであれば上書きOKとする
 			return Objects.equals(employeeList.get(0).getIdEmployee(), updateEmployeeInfoForm.getIdEmployee());
 		}
 		return true;
 	}
 
-    /**
-     * 更新結果画面表示処理
-     *
-     * @param updateEmployeeInfoForm 更新画面のフォーム
-     * @param model                  ビューにデータを渡すためのコンテナ
-     * @return 遷移先の画面
-     */
 	@PermissionCheck
 	@SessionCheck
 	@RequestMapping(value = TransitionTargetPageNameKeyword.UPDATE_EMPLOYEE_RESULT, method = RequestMethod.POST)
@@ -87,51 +69,39 @@ public class UpdateEmployeeResultController {
 
 		final String UPDATE_COMPLETE = "更新が完了しました。";
 
-
 		try {
 
-            // 部署一覧取得
-            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(searchDepartment.selectAll()));
+			model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+					DepartmentForm.convertFrom(searchDepartment.selectAll()));
 
-            // パスワードが仕様を満たしているか確認
 			String error = UpdateEmployeeInfoForm.validatePassword(
 					updateEmployeeInfoForm.getPassword(),
-                    updateEmployeeInfoForm.getPasswordConfirm()
-            );
+					updateEmployeeInfoForm.getPasswordConfirm());
 
-            // エラーが存在するか
 			if (!error.isBlank()) {
-                // エラーが存在する場合、更新画面に遷移
 				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(error));
 				model.addAttribute(PageReturnAttributeKeyword.UPDATE_EMPLOYEE_INFO_FORM, updateEmployeeInfoForm);
 
 				return TransitionTargetPageNameKeyword.UPDATE_EMPLOYEE_INPUT_HTML;
 			}
 
-            // メールアドレスを元に検索
 			List<Employee> employeeList = searchEmployee.searchEmployee(updateEmployeeInfoForm.getMailAddress());
 
-            // 既に登録済みのメールアドレスが存在するか
 			if (!checkDuplicateMailAddress(employeeList, updateEmployeeInfoForm)) {
-                // 存在する場合はエラーメッセージを設定して更新入力画面に遷移
 				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(DUPLICATION));
 				model.addAttribute(PageReturnAttributeKeyword.UPDATE_EMPLOYEE_INFO_FORM, updateEmployeeInfoForm);
 
 				return TransitionTargetPageNameKeyword.UPDATE_EMPLOYEE_INPUT_HTML;
 			}
 
-            // session 情報からログイン者の情報を取得
 			LoginUserForm loginUserForm = (LoginUserForm) httpSession.getAttribute(SessionKeyword.LOGIN_USER);
 
-            // ログイン者が更新対象で、権限を管理者権限から一般権限に変更しようとしているかチェック
 			if (isUpdateTargetLoginUserAdminToNormal(updateEmployeeInfoForm, loginUserForm)) {
-                // 存在する場合はエラーメッセージを設定して更新入力画面に遷移
 				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(ADMIN_USER));
 				model.addAttribute(PageReturnAttributeKeyword.UPDATE_EMPLOYEE_INFO_FORM, updateEmployeeInfoForm);
 				return TransitionTargetPageNameKeyword.UPDATE_EMPLOYEE_INPUT_HTML;
 			}
 
-            //　画面から渡ってきた値が必須を満たしているか
 			if (!UpdateEmployeeInfoForm.hasErrorParameter(updateEmployeeInfoForm)) {
 				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(NOTHING));
 				model.addAttribute(PageReturnAttributeKeyword.UPDATE_EMPLOYEE_INFO_FORM, updateEmployeeInfoForm);
@@ -139,7 +109,6 @@ public class UpdateEmployeeResultController {
 				return TransitionTargetPageNameKeyword.UPDATE_EMPLOYEE_INPUT_HTML;
 			}
 
-            // 更新前のデータを取得
 			Employee beforeEmployee = searchEmployee.searchEmployeeByIdEmployee(updateEmployeeInfoForm.getIdEmployee());
 			if (beforeEmployee.getIdEmployee() == null) {
 				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(NO_TARGET));
@@ -148,59 +117,37 @@ public class UpdateEmployeeResultController {
 				return TransitionTargetPageNameKeyword.UPDATE_EMPLOYEE_INPUT_HTML;
 			}
 
-            // 画面用の型からビジネスロジック用のモデルに変換し、Updateを実行
 			updateEmployee.updateEmployee(beforeEmployee, UpdateEmployeeInfoForm.convertTo(updateEmployeeInfoForm));
 
-            // Update後の情報を再取得
 			LoginUser updatedTargetEmployee = searchEmployee.searchLoginUser(updateEmployeeInfoForm.getMailAddress());
 
-            // ログイン者と更新した対象が同じアカウントだった場合、session情報を更新
 			if (Objects.equals(updatedTargetEmployee.getIdEmployee(), loginUserForm.getIdEmployee())) {
-                // ログイン者の情報をセッション情報に格納
 				httpSession.setAttribute(SessionKeyword.LOGIN_USER, LoginUserForm.convertFrom(updatedTargetEmployee));
 			}
 
-            // 更新結果のメッセージを画面にセットし一覧画面に遷移
 			model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(UPDATE_COMPLETE));
 
-            // forward 先で不用意な動作をしないために UpdateEmployeeInfoForm をクリア
 			return "forward:" + TransitionTargetPageNameKeyword.SELECT_EMPLOYEE_INFO_FORM_EMPTY;
 
-
 		} catch (Exception e) {
-            // ログイン情報の破棄
 			httpSession.invalidate();
 
 			e.printStackTrace();
-            // エラーログ出力
 			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-            // エラー画面遷移
 			return TransitionTargetPageNameKeyword.ERROR_HTML;
 		}
 
 	}
 
-    /**
-     * ログイン者がログイン者自身を更新する際
-     * 管理者権限から一般権限に変更する内容も含まれているかチェックする
-     *
-     * @param updateEmployeeInfoForm 更新対象データ
-     * @param loginUserForm          ログイン者情報
-     * @return true:ログイン者自身のデータをUpdate管理者→一般に権限変更しようとしている。
-     * false:Update対象者がログイン者自身ではない or 管理者権限 → 一般権限 への更新は含まれていない
-     */
-    private boolean isUpdateTargetLoginUserAdminToNormal(UpdateEmployeeInfoForm updateEmployeeInfoForm, LoginUserForm loginUserForm) {
+	private boolean isUpdateTargetLoginUserAdminToNormal(UpdateEmployeeInfoForm updateEmployeeInfoForm,
+			LoginUserForm loginUserForm) {
 
-        // ログイン者が今回の更新対象か
 		if (!Objects.equals(updateEmployeeInfoForm.getIdEmployee(), loginUserForm.getIdEmployee())) {
-            // 今回の対象者はログイン者ではない
 			return false;
 		}
 
-        // 管理者から一般権限への変更があるか
 		return updateEmployeeInfoForm.getAdminAuth().equals(0);
 
 	}
 
-
 }

src/main/java/com/example/rhizome/app/presentation/controller/UpdatePersonalEmployeeResultController.java

@@ -1,5 +1,18 @@
 package com.example.rhizome.app.presentation.controller;
 
+import java.util.List;
+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.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;
@@ -12,29 +25,12 @@ import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTa
 import com.example.rhizome.app.presentation.form.LoginUserForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
 import com.example.rhizome.app.presentation.form.UpdatePersonalUserForm;
-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.Objects;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * 個人情報更新用コントローラ
- */
 @Controller
 public class UpdatePersonalEmployeeResultController {
 
-    // ログ出力用インスタンス
 	private final static Logger LOGGER = Logger.getLogger(UpdatePersonalEmployeeResultController.class.getName());
 
-    // エラーメッセージ用の定数フィールド
 	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
 
 	HttpSession httpSession;
@@ -42,23 +38,16 @@ public class UpdatePersonalEmployeeResultController {
 	UpdateEmployee updateEmployee;
 
 	@Autowired
-    public UpdatePersonalEmployeeResultController(HttpSession httpSession, SearchEmployee searchEmployee, UpdateEmployee updateEmployee) {
+	public UpdatePersonalEmployeeResultController(HttpSession httpSession, SearchEmployee searchEmployee,
+			UpdateEmployee updateEmployee) {
 		this.httpSession = httpSession;
 		this.searchEmployee = searchEmployee;
 		this.updateEmployee = updateEmployee;
 	}
 
-    /**
-     * メールアドレスの重複チェック
-     *
-     * @param employeeList           元の employeeList
-     * @param updatePersonalUserForm 更新対象のデータ
-     * @return true:重複無し  false:重複あり
-     */
-    private static boolean checkDuplicateMailAddress(List<Employee> employeeList, UpdatePersonalUserForm updatePersonalUserForm) {
-        // メールアドレスが既に使われていた場合
+	private static boolean checkDuplicateMailAddress(List<Employee> employeeList,
+			UpdatePersonalUserForm updatePersonalUserForm) {
 		if (!employeeList.isEmpty()) {
-            // 更新対象のデータと同じIDの場合は重複していないとみなす
 			return Objects.equals(employeeList.get(0).getIdEmployee(), updatePersonalUserForm.getIdEmployee());
 		}
 		return true;
@@ -69,13 +58,6 @@ public class UpdatePersonalEmployeeResultController {
 		return new UpdatePersonalUserForm();
 	}
 
-    /**
-     * 個人情報更新結果画面表示処理
-     *
-     * @param updatePersonalUserForm 個人情報更新画面のフォーム
-     * @param model                  ビューにデータを渡すためのコンテナ
-     * @return 遷移先の画面
-     */
 	@PermissionCheck
 	@SessionCheck
 	@RequestMapping(value = TransitionTargetPageNameKeyword.PERSONAL_UPDATE_RESULT, method = RequestMethod.POST)
@@ -86,77 +68,59 @@ public class UpdatePersonalEmployeeResultController {
 
 		try {
 
-            // 更新完了画面からの遷移の場合
 			if (updatePersonalUserForm.getIdEmployee() == null) {
-                // ログイン者の情報を取得
 				LoginUserForm loginUserForm = (LoginUserForm) httpSession.getAttribute(SessionKeyword.LOGIN_USER);
-                // ログイン者の情報を元に個人情報更新画面の初期表示用のインスタンスを作成
-                model.addAttribute(PageReturnAttributeKeyword.UPDATE_PERSONAL_EMPLOYEE_USER_FORM, UpdatePersonalUserForm.convertFrom(searchEmployee.searchLoginUser(loginUserForm.getMailAddress())));
+				model.addAttribute(PageReturnAttributeKeyword.UPDATE_PERSONAL_EMPLOYEE_USER_FORM, UpdatePersonalUserForm
+						.convertFrom(searchEmployee.searchLoginUser(loginUserForm.getMailAddress())));
 
 				return TransitionTargetPageNameKeyword.UPDATE_PERSONAL_EMPLOYEE_INPUT_HTML;
 			}
 
-            // パスワードが仕様を満たしているかチェック
 			String error = UpdatePersonalUserForm.validatePassword(
 					updatePersonalUserForm.getPassword(),
-                    updatePersonalUserForm.getPasswordConfirm()
-            );
+					updatePersonalUserForm.getPasswordConfirm());
 
-            // エラーがあるか
 			if (!error.isBlank()) {
-                // エラーが有る場合メッセージをセットして個人情報更新入力画面に遷移
 				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(error));
-                model.addAttribute(PageReturnAttributeKeyword.UPDATE_PERSONAL_EMPLOYEE_USER_FORM, updatePersonalUserForm);
+				model.addAttribute(PageReturnAttributeKeyword.UPDATE_PERSONAL_EMPLOYEE_USER_FORM,
+						updatePersonalUserForm);
 
 				return TransitionTargetPageNameKeyword.UPDATE_PERSONAL_EMPLOYEE_INPUT_HTML;
 			}
 
-            // 入力必須を満たしているか
 			if (!UpdatePersonalUserForm.hasErrorParameter(updatePersonalUserForm)) {
-                // 満たしていない場合、メッセージをセットして個人情報更新入力画面に遷移
 				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(NOTHING));
-                model.addAttribute(PageReturnAttributeKeyword.UPDATE_PERSONAL_EMPLOYEE_USER_FORM, updatePersonalUserForm);
+				model.addAttribute(PageReturnAttributeKeyword.UPDATE_PERSONAL_EMPLOYEE_USER_FORM,
+						updatePersonalUserForm);
 
 				return TransitionTargetPageNameKeyword.UPDATE_PERSONAL_EMPLOYEE_INPUT_HTML;
 			}
 
-            // メールアドレス重複チェック
 			if (!checkDuplicateMailAddress(
 					searchEmployee.searchEmployee(updatePersonalUserForm.getMailAddress()),
-                    updatePersonalUserForm)
-            ) {
-                // メールアドレスが既に使われていた場合
-                // 個人情報更新ページに遷移
+					updatePersonalUserForm)) {
 				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(DUPLICATION));
-                model.addAttribute(PageReturnAttributeKeyword.UPDATE_PERSONAL_EMPLOYEE_USER_FORM, updatePersonalUserForm);
+				model.addAttribute(PageReturnAttributeKeyword.UPDATE_PERSONAL_EMPLOYEE_USER_FORM,
+						updatePersonalUserForm);
 
 				return TransitionTargetPageNameKeyword.UPDATE_PERSONAL_EMPLOYEE_INPUT_HTML;
 			}
 
-            //更新前のEmployeeの情報を取得
-            // 画面用のインスタンスから更新用のインスタンスに変換し、Update実施
 			updateEmployee.updateEmployee(
 					searchEmployee.searchEmployeeByIdEmployee(updatePersonalUserForm.getIdEmployee()),
-                    UpdatePersonalUserForm.convertTo(updatePersonalUserForm)
-            );
+					UpdatePersonalUserForm.convertTo(updatePersonalUserForm));
 
-            // ログイン者の情報をセッション情報に格納
 			httpSession.setAttribute(
 					SessionKeyword.LOGIN_USER,
 					LoginUserForm.convertFrom(
-                            searchEmployee.searchLoginUser(updatePersonalUserForm.getMailAddress()))
-            );
+							searchEmployee.searchLoginUser(updatePersonalUserForm.getMailAddress())));
 
-            // 更新結果画面に遷移
 			return TransitionTargetPageNameKeyword.UPDATE_PERSONAL_RESULT_HTML;
 
 		} catch (Exception e) {
-            // ログイン情報の破棄
 			httpSession.invalidate();
 
-            // エラーログ出力
 			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-            // エラー画面遷移
 			return TransitionTargetPageNameKeyword.ERROR_HTML;
 		}
 	}

src/main/java/com/example/rhizome/app/presentation/controller/pageproperty/PageReturnAttributeKeyword.java

@@ -1,18 +1,17 @@
 package com.example.rhizome.app.presentation.controller.pageproperty;
 
-/**
- * Servlet から Servlet に返却する際に使用する文字列を管理するクラス
- */
 public class PageReturnAttributeKeyword {
 
 	public static final String MESSAGE_ERROR = "messageError";
 	public static final String MESSAGE_INFO = "messageInfo";
 
-    public static final String DEPARTMENT_FORM_LIST = "departmentFormList";
 	public static final String UPDATE_EMPLOYEE_INFO_FORM = "updateEmployeeInfoForm";
 	public static final String INSERT_EMPLOYEE_FORM = "insertEmployeeForm";
 	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_FORM_LIST = "departmentFormList";
+	public static final String INSERT_DEPARTMENT_FORM = "insertDepartmentForm";
+	public static final String UPDATE_DEPARTMENT_FORM = "updateDepartmentForm";
 }

src/main/java/com/example/rhizome/app/presentation/controller/pageproperty/SessionKeyword.java

@@ -1,9 +1,5 @@
 package com.example.rhizome.app.presentation.controller.pageproperty;
 
-/**
- * Sessionキーを管理する
- */
 public class SessionKeyword {
-    // SESSION情報として格納したいログイン者の情報
 	public static final String LOGIN_USER = "loginUser";
 }

src/main/java/com/example/rhizome/app/presentation/controller/pageproperty/TransitionTargetPageNameKeyword.java

@@ -2,19 +2,13 @@ package com.example.rhizome.app.presentation.controller.pageproperty;
 
 import java.util.Set;
 
-/**
- * システムで利用しているJSPのリスト
- */
 public class TransitionTargetPageNameKeyword {
 
-    // 共通
 	public static final String LOGIN_HTML = "login";
 
-    // 一般向け
 	public static final String UPDATE_PERSONAL_EMPLOYEE_INPUT_HTML = "updatePersonalEmployeeInput";
 	public static final String UPDATE_PERSONAL_RESULT_HTML = "updatePersonalEmployeeResult";
 
-    // 管理者向け
 	public static final String MENU_HTML = "menu";
 	public static final String SELECT_EMPLOYEE_HTML = "selectEmployee";
 	public static final String INSERT_EMPLOYEE_INPUT_HTML = "insertEmployeeInput";
@@ -22,19 +16,18 @@ public class TransitionTargetPageNameKeyword {
 	public static final String INSERT_EMPLOYEE_RESULT_HTML = "insertEmployeeResult";
 	public static final String UPDATE_EMPLOYEE_INPUT_HTML = "updateEmployeeInput";
 
+	public static final String SELECT_DEPARTMENT_HTML = "selectDepartment";
+
 	public static final String ERROR_HTML = "error";
 
-    // 共通(Controller)
 	public static final String INDEX_BLANK = "";
 	public static final String INDEX_SLASH = "/";
 	public static final String INDEX_LOGIN = "/login";
 	public static final String LOGOUT = "/logout";
 	public static final String DO_LOGIN = "/doLogin";
 
-    // 一般向け(Controller)
 	public static final String PERSONAL_UPDATE_RESULT = "/updatePersonalEmployeeResult";
 
-    // 管理者向け(Controller)
 	public static final String DELETE_EMPLOYEE = "/deleteEmployee";
 	public static final String INSERT_EMPLOYEE_INPUT = "/insertEmployeeInput";
 	public static final String INSERT_EMPLOYEE_CONFIRM = "/insertEmployeeConfirm";
@@ -45,15 +38,21 @@ public class TransitionTargetPageNameKeyword {
 	public static final String SHOW_UPDATE_EMPLOYEE = "/showUpdateEmployee";
 	public static final String UPDATE_EMPLOYEE_RESULT = "/updateEmployeeResult";
 
-    // Department
-    // HTML
-    // Controller
+	public static final String SELECT_DEPARTMENT = "/selectDepartment";
+	public static final String SELECT_DEPARTMENT_INFO_FORM_EMPTY = "/selectDepartmentAll";
+	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 DELETE_DEPARTMENT = "/deleteDepartment";
+	public static final String SHOW_UPDATE_DEPARTMENT = "/showUpdateDepartment";
+	public static final String UPDATE_DEPARTMENT_RESULT = "/updateDepartmentResult";
+
+	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 UPDATE_DEPARTMENT_INPUT_HTML = "updateDepartmentInput";
 
-    /**
-     * 管理者向けのページリストを返す
-     *
-     * @return 管理者向けのページリスト
-     */
 	public static Set<String> getAdminPageList() {
 
 		return Set.of(
@@ -70,15 +69,17 @@ public class TransitionTargetPageNameKeyword {
 				SELECT_EMPLOYEE_INFO,
 				SELECT_EMPLOYEE_INFO_FORM_EMPTY,
 				SHOW_UPDATE_EMPLOYEE,
-                UPDATE_EMPLOYEE_RESULT
-        );
+				UPDATE_EMPLOYEE_RESULT,
+				SELECT_DEPARTMENT,
+				SELECT_DEPARTMENT_INFO_FORM_EMPTY,
+				INSERT_DEPARTMENT_INPUT,
+				INSERT_DEPARTMENT_CONFIRM,
+				INSERT_DEPARTMENT,
+				DELETE_DEPARTMENT,
+				SHOW_UPDATE_DEPARTMENT,
+				UPDATE_DEPARTMENT_RESULT);
 	}
 
-    /**
-     * 一般向けのページリストを返す
-     *
-     * @return 一般向けのページリスト
-     */
 	public static Set<String> getUserPageList() {
 		return Set.of(
 				INDEX_BLANK,
@@ -86,8 +87,7 @@ public class TransitionTargetPageNameKeyword {
 				INDEX_LOGIN,
 				LOGOUT,
 				DO_LOGIN,
-                PERSONAL_UPDATE_RESULT
-        );
+				PERSONAL_UPDATE_RESULT);
 	}
 
 }

src/main/java/com/example/rhizome/app/presentation/form/DepartmentForm.java

@@ -1,46 +1,24 @@
 package com.example.rhizome.app.presentation.form;
 
+import java.util.List;
+
 import com.example.rhizome.app.domain.model.Department;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.List;
-
-/**
- * 画面の表示に使う部署コード管理用のクラス
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 public class DepartmentForm {
-    /**
-     * 部署ID
-     */
 	private Integer idDepartment;
-    /**
-     * 部署名
-     */
 	private String nmDepartment;
 
-    /**
-     * business 層の Department クラスから画面用（presentation 層）の DepartmentForm に
-     * 変換します。
-     *
-     * @param department business 層の Department インスタンス
-     * @return 画面用（presentation 層）の DepartmentForm インスタンス
-     */
 	public static DepartmentForm convertFrom(Department department) {
 		return new DepartmentForm(department.getIdDepartment(), department.getNmDepartment());
 	}
 
-    /**
-     * business 層の Department クラスから画面用（presentation 層）の DepartmentForm に
-     * 変換します。（リスト版）
-     *
-     * @param departmentList business 層の Department インスタンスのリスト
-     * @return 画面用（presentation 層）の DepartmentForm インスタンスのリスト
-     */
 	public static List<DepartmentForm> convertFrom(List<Department> departmentList) {
 		return departmentList.stream().map(DepartmentForm::convertFrom).toList();
 	}

src/main/java/com/example/rhizome/app/presentation/form/EmployeeInfoForm.java

@@ -1,61 +1,27 @@
 package com.example.rhizome.app.presentation.form;
 
+import java.util.List;
 
 import com.example.rhizome.app.domain.model.EmployeeInfo;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.List;
-
-/**
- * 画面に表示するために employee と department を Join した構造を扱うクラス
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 public class EmployeeInfoForm {
 
-    /**
-     * 社員ID
-     */
 	private Integer idEmployee;
-    /**
-     * 社員名
-     */
 	private String nmEmployee;
-    /**
-     * 社員名カナ
-     */
 	private String knEmployee;
-    /**
-     * メールアドレス
-     */
 	private String mailAddress;
-    /**
-     * パスワード
-     */
 	private String password;
-    /**
-     * パスワード
-     */
 	private Integer adminAuth;
-    /**
-     * 部署ID
-     */
 	private Integer idDepartment;
-    /**
-     * 部署名
-     */
 	private String nmDepartment;
 
-    /**
-     * business 層の EmployeeInfo クラスから画面用（presentation 層）の EmployeeInfoForm に
-     * 変換します。
-     *
-     * @param employeeInfo business 層の EmployeeInfo インスタンス
-     * @return クラスから画面用（presentation 層）の EmployeeInfoForm インスタンス
-     */
 	public static EmployeeInfoForm convertFrom(EmployeeInfo employeeInfo) {
 		return new EmployeeInfoForm(
 				employeeInfo.getEmployee().getIdEmployee(),
@@ -65,17 +31,9 @@ public class EmployeeInfoForm {
 				employeeInfo.getEmployee().getPassword(),
 				employeeInfo.getEmployee().getAdminAuth(),
 				employeeInfo.getDepartment().getIdDepartment(),
-                employeeInfo.getDepartment().getNmDepartment()
-        );
+				employeeInfo.getDepartment().getNmDepartment());
 	}
 
-    /**
-     * business 層の EmployeeInfo クラスから画面用（presentation 層）の EmployeeInfoForm に
-     * 変換します。（リスト版）
-     *
-     * @param employeeInfoList business 層の EmployeeInfo インスタンスのリスト
-     * @return クラスから画面用（presentation 層）の EmployeeInfoForm インスタンスのリスト
-     */
 	public static List<EmployeeInfoForm> convertFrom(List<EmployeeInfo> employeeInfoList) {
 		return employeeInfoList.stream().map(EmployeeInfoForm::convertFrom).toList();
 	}

src/main/java/com/example/rhizome/app/presentation/form/InsertDepartmentForm.java

@@ -0,0 +1,46 @@
+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;
+
+	private static boolean isNullOrBlank(String str) {
+		if (null == str) {
+			return true;
+		}
+
+		return str.isBlank();
+	}
+
+	public static Department convertTo(InsertDepartmentForm insertDepartmentForm) {
+		return new Department(
+				null,
+				insertDepartmentForm.getNmDepartment());
+	}
+
+	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;
+
+	}
+
+}

src/main/java/com/example/rhizome/app/presentation/form/InsertEmployeeForm.java

@@ -1,64 +1,33 @@
 package com.example.rhizome.app.presentation.form;
 
-import com.example.rhizome.app.domain.model.Employee;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * 画面から渡ってきた登録内容をまとめ、再度画面に表示する為のクラス
- */
+import com.example.rhizome.app.domain.model.Employee;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 public class InsertEmployeeForm {
 
-    /**
-     * 社員名
-     */
 	private String nmEmployee;
 
-    /**
-     * 社員名カナ
-     */
 	private String knEmployee;
 
-    /**
-     * メールアドレス
-     */
 	private String mailAddress;
 
-    /**
-     * パスワード
-     */
 	private String password;
 
-    /**
-     * 確認用パスワード
-     */
 	private String passwordConfirm;
 
-    /**
-     * 管理者権限
-     */
 	private Integer adminAuth;
 
-    /**
-     * 部署ID
-     */
 	private Integer idDepartment;
 
-    /**
-     * パスワードのValidation
-     * チェック対象にエラーが有った場合エラーリストに文言を追加する
-     *
-     * @param password        登録対象のパスワード
-     * @param passwordConfirm 登録対象のパスワード再入力
-     * @param error           エラーリスト
-     */
 	private static void checkPassword(String password, String passwordConfirm, List<String> error) {
 		final String PASSWORD_NULL_BLANK = "パスワード が未入力です。";
 		final String PASSWORD_CONFIRM_NULL_BLANK = "パスワード確認用 が未入力です。";
@@ -78,12 +47,6 @@ public class InsertEmployeeForm {
 		}
 	}
 
-    /**
-     * 仮引数を null or 空 判定する
-     *
-     * @param str 判定対象の文字列
-     * @return true:null or 空 false:null or 空 では無い
-     */
 	private static boolean isNullOrBlank(String str) {
 		if (null == str) {
 			return true;
@@ -92,12 +55,6 @@ public class InsertEmployeeForm {
 		return str.isBlank();
 	}
 
-    /**
-     * 画面から渡ってきた登録内容をまとめ、ビジネスモデルに変換
-     *
-     * @param insertEmployeeForm 画面から渡ってきた登録内容
-     * @return ビジネスモデルのインスタンス
-     */
 	public static Employee convertTo(InsertEmployeeForm insertEmployeeForm) {
 		return new Employee(
 				null,
@@ -106,15 +63,9 @@ public class InsertEmployeeForm {
 				insertEmployeeForm.getMailAddress(),
 				insertEmployeeForm.getPassword(),
 				insertEmployeeForm.getAdminAuth(),
-                insertEmployeeForm.getIdDepartment()
-        );
+				insertEmployeeForm.getIdDepartment());
 	}
 
-    /**
-     * 登録データのValidationを行う
-     *
-     * @return エラーが有った場合はエラー文言、無ければ空のリストが返る
-     */
 	public List<String> validateParameter() {
 		final String EMPLOYEE_NAME_NULL_BLANK = "社員名";
 		final String EMPLOYEE_KANA_NULL_BLANK = "社員名フリガナ";
@@ -134,7 +85,6 @@ public class InsertEmployeeForm {
 			error.add(MAIL_ADDRESS_NULL_BLANK);
 		}
 
-        // パスワードが仕様を満たしているか確認
 		checkPassword(password, passwordConfirm, error);
 
 		if (adminAuth == null) {

src/main/java/com/example/rhizome/app/presentation/form/LoginInfoForm.java

@@ -4,20 +4,10 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-/**
- * ログインを試みる人を表現するモデルクラスです
- */
-
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 public class LoginInfoForm {
-    /**
-     * メールアドレス
-     */
 	private String mailAddress;
-    /**
-     * パスワード
-     */
 	private String password;
 }

src/main/java/com/example/rhizome/app/presentation/form/LoginUserForm.java

@@ -1,7 +1,7 @@
 package com.example.rhizome.app.presentation.form;
 
-
 import com.example.rhizome.app.domain.model.LoginUser;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -10,44 +10,16 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 public class LoginUserForm {
-    /**
-     * 社員ID
-     */
 	private Integer idEmployee;
-    /**
-     * 社員名
-     */
 	private String nmEmployee;
-    /**
-     * 社員名カナ
-     */
 	private String knEmployee;
-    /**
-     * メールアドレス
-     */
 	private String mailAddress;
-    /**
-     * パスワード
-     */
 	private String password;
 
-    /**
-     * 管理者権限
-     */
 	private Integer adminAuth;
 
-    /**
-     * 部署ID
-     */
 	private Integer idDepartment;
 
-    /**
-     * business 層の LoginUser クラスから画面用（presentation 層）の LoginUserForm に
-     * 変換します。
-     *
-     * @param loginUser business 層の LoginUser インスタンス
-     * @return クラスから画面用（presentation 層）の LoginUserForm
-     */
 	public static LoginUserForm convertFrom(LoginUser loginUser) {
 		return new LoginUserForm(
 				loginUser.getIdEmployee(),
@@ -56,17 +28,9 @@ public class LoginUserForm {
 				loginUser.getMailAddress(),
 				loginUser.getPassword(),
 				loginUser.getAdminAuth(),
-                loginUser.getIdDepartment()
-        );
+				loginUser.getIdDepartment());
 	}
 
-    /**
-     * 画面用（presentation 層）の LoginUserForm クラスから business 層の LoginUser クラスに
-     * 変換します。
-     *
-     * @param loginUserForm 画面用（presentation 層）の LoginUserForm インスタンス
-     * @return business 層の LoginUser インスタンス
-     */
 	public static LoginUser convertTo(LoginUserForm loginUserForm) {
 		return new LoginUser(
 				loginUserForm.getIdEmployee(),
@@ -75,16 +39,9 @@ public class LoginUserForm {
 				loginUserForm.getMailAddress(),
 				loginUserForm.getPassword(),
 				loginUserForm.getAdminAuth(),
-                loginUserForm.getIdDepartment()
-        );
+				loginUserForm.getIdDepartment());
 	}
 
-    /**
-     * 画面から渡ってきた必須の値が仕様を満たしているか確認
-     *
-     * @param loginInfoForm 画面から渡ってきた mailAddress, password を格納しているインスタンス
-     * @return true:仕様を満たしている , false:仕様を満たしていない
-     */
 	public static boolean checkParameter(LoginInfoForm loginInfoForm) {
 		if (null == loginInfoForm.getMailAddress()) {
 			return false;
@@ -102,11 +59,6 @@ public class LoginUserForm {
 
 	}
 
-    /**
-     * 管理者権限を持っているか確認
-     *
-     * @return true:管理者権限を持っている , false:管理者権限を持っていない
-     */
 	public boolean isAdminUser() {
 		return getAdminAuth() == 1;
 	}

src/main/java/com/example/rhizome/app/presentation/form/MessageForm.java

@@ -4,9 +4,6 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-/**
- * 画面に表示するエラーメッセージを管理するクラスです。
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

src/main/java/com/example/rhizome/app/presentation/form/SearchConditionDepartmentForm.java

@@ -0,0 +1,28 @@
+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
+@NoArgsConstructor
+@AllArgsConstructor
+public class SearchConditionDepartmentForm {
+
+	private Integer idDepartment;
+	private String nmDepartment;
+
+	public static SearchConditionDepartmentForm convertFrom(SearchConditionDepartment searchConditionDepartment) {
+		return new SearchConditionDepartmentForm(
+				searchConditionDepartment.getIdDepartment(),
+				searchConditionDepartment.getNmDepartment());
+	}
+
+	public static SearchConditionDepartment convertTo(SearchConditionDepartmentForm searchConditionDepartmentForm) {
+		return new SearchConditionDepartment(
+				searchConditionDepartmentForm.getIdDepartment(),
+				searchConditionDepartmentForm.getNmDepartment());
+	}
+}

src/main/java/com/example/rhizome/app/presentation/form/SearchConditionEmployeeForm.java

@@ -1,70 +1,37 @@
 package com.example.rhizome.app.presentation.form;
 
 import com.example.rhizome.app.domain.model.SearchConditionEmployee;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-/**
- * 画面から渡ってきた検索条件をまとめ、再度画面に表示する為のクラス
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 public class SearchConditionEmployeeForm {
 
-    /**
-     * 社員ID
-     */
 	private Integer idEmployee;
-    /**
-     * 社員名
-     */
 	private String nmEmployee;
-    /**
-     * 社員名カナ
-     */
 	private String knEmployee;
-    /**
-     * メールアドレス
-     */
 	private String mailAddress;
-    /**
-     * 部署ID
-     */
 	private Integer idDepartment;
 
-    /**
-     * business 層の SearchConditionEmployee クラスから画面用（presentation 層）の SearchConditionEmployeeForm に
-     * 変換します。
-     *
-     * @param searchConditionEmployee business 層の SearchConditionEmployee インスタンス
-     * @return 画面用（presentation 層）の SearchConditionEmployeeForm インスタンス
-     */
 	public static SearchConditionEmployeeForm convertFrom(SearchConditionEmployee searchConditionEmployee) {
 		return new SearchConditionEmployeeForm(
 				searchConditionEmployee.getIdEmployee(),
 				searchConditionEmployee.getNmEmployee(),
 				searchConditionEmployee.getKnEmployee(),
 				searchConditionEmployee.getMailAddress(),
-                searchConditionEmployee.getIdDepartment()
-        );
+				searchConditionEmployee.getIdDepartment());
 	}
 
-    /**
-     * 画面用（presentation 層）の SearchConditionEmployeeForm クラスから business 層の SearchConditionEmployee クラスに
-     * 変換します。
-     *
-     * @param searchConditionEmployeeForm 画面用（presentation 層）の SearchConditionEmployeeForm インスタンス
-     * @return business 層の SearchConditionEmployee インスタンス
-     */
 	public static SearchConditionEmployee convertTo(SearchConditionEmployeeForm searchConditionEmployeeForm) {
 		return new SearchConditionEmployee(
 				searchConditionEmployeeForm.getIdEmployee(),
 				searchConditionEmployeeForm.getNmEmployee(),
 				searchConditionEmployeeForm.getKnEmployee(),
 				searchConditionEmployeeForm.getMailAddress(),
-                searchConditionEmployeeForm.getIdDepartment()
-        );
+				searchConditionEmployeeForm.getIdDepartment());
 	}
 }

src/main/java/com/example/rhizome/app/presentation/form/UpdateDepartmentForm.java

@@ -0,0 +1,53 @@
+package com.example.rhizome.app.presentation.form;
+
+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 UpdateDepartmentForm {
+
+	private Integer idDepartment;
+	private String nmDepartment;
+
+	public static UpdateDepartmentForm convertFrom(Department department) {
+		return new UpdateDepartmentForm(
+				department.getIdDepartment(),
+				department.getNmDepartment());
+	}
+
+	public static List<UpdateDepartmentForm> convertFrom(List<Department> departmentList) {
+		return departmentList.stream().map(UpdateDepartmentForm::convertFrom).toList();
+	}
+
+	public static Department convertTo(UpdateDepartmentForm updateDepartmentForm) {
+		return new Department(
+				updateDepartmentForm.getIdDepartment(),
+				updateDepartmentForm.getNmDepartment());
+	}
+
+	public static boolean hasErrorParameter(UpdateDepartmentForm updateDepartmentForm) {
+
+		boolean errorFlag = !isNullOrBlank(updateDepartmentForm.getNmDepartment());
+
+		if (!isNullOrBlank(updateDepartmentForm.getNmDepartment())) {
+			errorFlag = true;
+		}
+
+		return errorFlag;
+	}
+
+	private static boolean isNullOrBlank(String str) {
+		if (null == str) {
+			return true;
+		}
+		return str.isBlank();
+	}
+
+}

src/main/java/com/example/rhizome/app/presentation/form/UpdateEmployeeInfoForm.java

@@ -1,61 +1,28 @@
 package com.example.rhizome.app.presentation.form;
 
+import java.util.List;
+
 import com.example.rhizome.app.domain.model.Employee;
 import com.example.rhizome.app.domain.model.EmployeeInfo;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.List;
-
-/**
- * 画面から渡ってきた更新内容をまとめ、再度画面に表示する為のクラス
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 public class UpdateEmployeeInfoForm {
 
-    /**
-     * 社員ID
-     */
 	private Integer idEmployee;
-    /**
-     * 社員名
-     */
 	private String nmEmployee;
-    /**
-     * 社員名カナ
-     */
 	private String knEmployee;
-    /**
-     * メールアドレス
-     */
 	private String mailAddress;
-    /**
-     * パスワード
-     */
 	private String password;
-    /**
-     * パスワード確認用
-     */
 	private String passwordConfirm;
-    /**
-     * 管理者権限
-     */
 	private Integer adminAuth;
-    /**
-     * 部署ID
-     */
 	private Integer idDepartment;
 
-    /**
-     * business 層の EmployeeInfo クラスから画面用（presentation 層）の UpdateEmployeeInfoForm に
-     * 変換します。
-     *
-     * @param employeeInfo business 層の EmployeeInfo インスタンス
-     * @return 画面用（presentation 層）の UpdateEmployeeInfoForm インスタンス
-     */
 	public static UpdateEmployeeInfoForm convertFrom(EmployeeInfo employeeInfo) {
 		return new UpdateEmployeeInfoForm(
 				employeeInfo.getEmployee().getIdEmployee(),
@@ -65,28 +32,13 @@ public class UpdateEmployeeInfoForm {
 				employeeInfo.getEmployee().getPassword(),
 				null,
 				employeeInfo.getEmployee().getAdminAuth(),
-                employeeInfo.getDepartment().getIdDepartment()
-        );
+				employeeInfo.getDepartment().getIdDepartment());
 	}
 
-    /**
-     * business 層の EmployeeInfo クラスから画面用（presentation 層）の UpdateEmployeeInfoForm に
-     * 変換します。（リスト版）
-     *
-     * @param employeeInfoList business 層の EmployeeInfo インスタンスのリスト
-     * @return 画面用（presentation 層）の UpdateEmployeeInfoForm インスタンスのリスト
-     */
 	public static List<UpdateEmployeeInfoForm> convertFrom(List<EmployeeInfo> employeeInfoList) {
 		return employeeInfoList.stream().map(UpdateEmployeeInfoForm::convertFrom).toList();
 	}
 
-    /**
-     * 画面用（presentation 層）の UpdateEmployeeInfoForm クラスから business 層の Employee クラスに
-     * 変換します。
-     *
-     * @param updateEmployeeInfoForm 画面用（presentation 層）の UpdateEmployeeInfoForm インスタンス
-     * @return business 層の Employee インスタンス
-     */
 	public static Employee convertTo(UpdateEmployeeInfoForm updateEmployeeInfoForm) {
 		return new Employee(
 				updateEmployeeInfoForm.getIdEmployee(),
@@ -95,16 +47,9 @@ public class UpdateEmployeeInfoForm {
 				updateEmployeeInfoForm.getMailAddress(),
 				updateEmployeeInfoForm.getPassword(),
 				updateEmployeeInfoForm.getAdminAuth(),
-                updateEmployeeInfoForm.getIdDepartment()
-        );
+				updateEmployeeInfoForm.getIdDepartment());
 	}
 
-    /**
-     * 画面から渡ってきたパラメータのチェック
-     *
-     * @param updateEmployeeInfoForm 画面から渡ってきたパラメータ
-     * @return true: エラー無し　false:エラーあり（必須を満たしていない）
-     */
 	public static boolean hasErrorParameter(UpdateEmployeeInfoForm updateEmployeeInfoForm) {
 
 		boolean errorFlag = !isNullOrBlank(updateEmployeeInfoForm.getNmEmployee());
@@ -119,33 +64,21 @@ public class UpdateEmployeeInfoForm {
 			errorFlag = true;
 		}
 
-
 		return errorFlag;
 	}
 
-    /**
-     * パスワードの仕様チェック
-     * パスワードが仕様を満たしてないか確認
-     *
-     * @param password        更新対象のパスワード
-     * @param passwordConfirm 更新対象の確認用パスワード
-     * @return 空文字: エラー無し　それ以外:エラー内容
-     */
 	public static String validatePassword(String password, String passwordConfirm) {
 
 		final String ERROR = "パスワードが一致していません";
 
 		if (areBothBlank(password, passwordConfirm)) {
-            // どちらもnullまたは空白の場合はOK
 			return "";
 		}
 
-        // どちらかがnullまたは空白の場合のエラーハンドリング
 		if (isEitherBlank(password, passwordConfirm)) {
 			return ERROR;
 		}
 
-        // 値が異なった場合はエラーハンドリング
 		if (!password.equals(passwordConfirm)) {
 			return ERROR;
 		}
@@ -153,12 +86,6 @@ public class UpdateEmployeeInfoForm {
 
 	}
 
-    /**
-     * 仮引数を null or 空 判定する
-     *
-     * @param str 判定対象の文字列
-     * @return true:null or 空 false:null or 空 では無い
-     */
 	private static boolean isNullOrBlank(String str) {
 		if (null == str) {
 			return true;
@@ -166,25 +93,10 @@ public class UpdateEmployeeInfoForm {
 		return str.isBlank();
 	}
 
-    /**
-     * パスワードが今回更新対象に含まれているかチェック
-     *
-     * @param password        更新対象のパスワード
-     * @param passwordConfirm 更新対象の確認用パスワード
-     * @return true:どちらもnullまたは空白の場合 false:それ以外
-     */
 	private static boolean areBothBlank(String password, String passwordConfirm) {
 		return (password == null || password.isBlank()) && (passwordConfirm == null || passwordConfirm.isBlank());
 	}
 
-    /**
-     * パスワードが今回更新対象に含まれているかチェック　その2
-     *
-     * @param password        更新対象のパスワード
-     * @param passwordConfirm 更新対象の確認用パスワード
-     * @return true: 問題なし false:どちらかがnullまたは空白の場合
-     */
-    // どちらかがnullまたは空白の場合のエラーハンドリング
 	private static boolean isEitherBlank(String password, String passwordConfirm) {
 		return password == null || password.isBlank() || passwordConfirm == null || passwordConfirm.isBlank();
 	}

src/main/java/com/example/rhizome/app/presentation/form/UpdatePersonalUserForm.java

@@ -2,50 +2,22 @@ package com.example.rhizome.app.presentation.form;
 
 import com.example.rhizome.app.domain.model.Employee;
 import com.example.rhizome.app.domain.model.LoginUser;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-/**
- * 個人情報更新画面のフォームクラスです。
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 public class UpdatePersonalUserForm {
-    /**
-     * 社員ID
-     */
 	private Integer idEmployee;
-    /**
-     * 社員名
-     */
 	private String nmEmployee;
-    /**
-     * 社員名カナ
-     */
 	private String knEmployee;
-    /**
-     * メールアドレス
-     */
 	private String mailAddress;
-    /**
-     * パスワード
-     */
 	private String password;
-    /**
-     * パスワード確認用
-     */
 	private String passwordConfirm;
 
-
-    /**
-     * 画面用（presentation 層）の UpdatePersonalUserForm クラスから business 層の Employee クラスに
-     * 変換します。
-     *
-     * @param updatePersonalUserForm 画面用（presentation 層）の UpdatePersonalUserForm インスタンス
-     * @return business 層の Employee インスタンス
-     */
 	public static Employee convertTo(UpdatePersonalUserForm updatePersonalUserForm) {
 		return new Employee(
 				updatePersonalUserForm.getIdEmployee(),
@@ -54,17 +26,9 @@ public class UpdatePersonalUserForm {
 				updatePersonalUserForm.getMailAddress(),
 				updatePersonalUserForm.getPassword(),
 				null,
-                null
-        );
+				null);
 	}
 
-    /**
-     * business 層の Employee クラスから画面用（presentation 層）の UpdatePersonalUserForm に
-     * 変換します。（リスト版）
-     *
-     * @param employee business 層の employee インスタンスのリスト
-     * @return クラスから画面用（presentation 層）の UpdatePersonalUserForm インスタンスのリスト
-     */
 	public static UpdatePersonalUserForm convertFrom(Employee employee) {
 		return new UpdatePersonalUserForm(
 				employee.getIdEmployee(),
@@ -72,17 +36,9 @@ public class UpdatePersonalUserForm {
 				employee.getKnEmployee(),
 				employee.getMailAddress(),
 				employee.getPassword(),
-                null
-        );
+				null);
 	}
 
-    /**
-     * business 層の Employee クラスから画面用（presentation 層）の UpdatePersonalUserForm に
-     * 変換します。（リスト版）
-     *
-     * @param loginUser business 層の loginUser インスタンスのリスト
-     * @return クラスから画面用（presentation 層）の UpdatePersonalUserForm インスタンスのリスト
-     */
 	public static UpdatePersonalUserForm convertFrom(LoginUser loginUser) {
 		return new UpdatePersonalUserForm(
 				loginUser.getIdEmployee(),
@@ -90,16 +46,9 @@ public class UpdatePersonalUserForm {
 				loginUser.getKnEmployee(),
 				loginUser.getMailAddress(),
 				loginUser.getPassword(),
-                null
-        );
+				null);
 	}
 
-    /**
-     * 画面から渡ってきたパラメータのチェック
-     *
-     * @param updatePersonalUserForm 画面から渡ってきたパラメータ
-     * @return true: エラー無し　false:エラーあり（必須を満たしていない）
-     */
 	public static boolean hasErrorParameter(UpdatePersonalUserForm updatePersonalUserForm) {
 
 		boolean errorFlag = !isNullOrBlank(updatePersonalUserForm.getNmEmployee());
@@ -114,33 +63,21 @@ public class UpdatePersonalUserForm {
 			errorFlag = true;
 		}
 
-
 		return errorFlag;
 	}
 
-    /**
-     * パスワードの仕様チェック
-     * パスワードが仕様を満たしてないか確認
-     *
-     * @param password        更新対象のパスワード
-     * @param passwordConfirm 更新対象の確認用パスワード
-     * @return 空文字: エラー無し　それ以外:エラー内容
-     */
 	public static String validatePassword(String password, String passwordConfirm) {
 
 		final String ERROR = "パスワードが一致していません";
 
 		if (areBothBlank(password, passwordConfirm)) {
-            // どちらもnullまたは空白の場合はOK
 			return "";
 		}
 
-        // どちらかがnullまたは空白の場合のエラーハンドリング
 		if (isEitherBlank(password, passwordConfirm)) {
 			return ERROR;
 		}
 
-        // 値が異なった場合はエラーハンドリング
 		if (!password.equals(passwordConfirm)) {
 			return ERROR;
 		}
@@ -148,12 +85,6 @@ public class UpdatePersonalUserForm {
 
 	}
 
-    /**
-     * 仮引数を null or 空 判定する
-     *
-     * @param str 判定対象の文字列
-     * @return true:null or 空 false:null or 空 では無い
-     */
 	private static boolean isNullOrBlank(String str) {
 		if (null == str) {
 			return true;
@@ -161,24 +92,10 @@ public class UpdatePersonalUserForm {
 		return str.isBlank();
 	}
 
-    /**
-     * パスワードが今回更新対象に含まれているかチェック
-     *
-     * @param password        更新対象のパスワード
-     * @param passwordConfirm 更新対象の確認用パスワード
-     * @return true:どちらもnullまたは空白の場合 false:それ以外
-     */
 	private static boolean areBothBlank(String password, String passwordConfirm) {
 		return (password == null || password.isBlank()) && (passwordConfirm == null || passwordConfirm.isBlank());
 	}
 
-    /**
-     * パスワードが今回更新対象に含まれているかチェック　その2
-     *
-     * @param password        更新対象のパスワード
-     * @param passwordConfirm 更新対象の確認用パスワード
-     * @return true: 問題なし false:どちらかがnullまたは空白の場合
-     */
 	private static boolean isEitherBlank(String password, String passwordConfirm) {
 		return password == null || password.isBlank() || passwordConfirm == null || passwordConfirm.isBlank();
 	}

src/main/java/com/example/rhizome/exception/InsufficientPermissionException.java

@@ -1,8 +1,5 @@
 package com.example.rhizome.exception;
 
-/**
- * 権限不足の例外を表現するクラスです。
- */
 public class InsufficientPermissionException extends RuntimeException {
 
 	public InsufficientPermissionException(String message) {

src/main/java/com/example/rhizome/exception/NoSessionException.java

@@ -1,8 +1,5 @@
 package com.example.rhizome.exception;
 
-/**
- * 権限不足の例外を表現するクラスです。
- */
 public class NoSessionException extends RuntimeException {
 
 	public NoSessionException(String message) {

src/main/resources/application.properties

@@ -1,3 +1,10 @@
-spring.datasource.url=jdbc:mysql://localhost:3306/rezodb
+spring.datasource.url=jdbc:mysql://localhost:3306/springdb
 spring.datasource.username=rezouser
 spring.datasource.password=Rezo_0000
+
+spring.jpa.hibernate.ddl-auto=update
+
+spring.jpa.properties.hibernate.format_sql=true
+spring.jpa.show-sql=true
+
+logging.level.org.hibernate.type.descriptor.sql=trace

src/main/resources/static/css/style.css

@@ -14,25 +14,21 @@ h1 {
     min-width: 640px;
     font-size: 15pt;
     font-weight: bold;
-    display: flex; /* フレックスボックスを使う */
-    justify-content: space-between; /* 左右の要素を端に寄せる */
-    align-items: center; /* 上下中央に配置 */
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
 }
 
 .rightSection {
-    display: flex; /* フレックスボックスを使う */
-    align-items: center; /* 上下中央に配置 */
+    display: flex;
+    align-items: center;
 }
 
 
-/* 入力フォーム */
 
 input, button, select {
     padding: 5px 15px 5px 15px;
     margin: 3px;
-    /*    border-radius: 5px;        /* CSS3草案 */
-    /*    -webkit-border-radius: 5px;    /* Safari,Google Chrome用 */
-    /*    -moz-border-radius: 5px;   /* Firefox用 */
 }
 
 input.readOnly {
@@ -40,7 +36,6 @@ input.readOnly {
     color: #ffffff;
 }
 
-/* メッセージボックスデザイン */
 
 .msgBox {
     font-weight: bold;
@@ -64,7 +59,6 @@ input.readOnly {
     color: #000000;
 }
 
-/* 個別デザイン */
 
 th.header {
     width: 150px;
@@ -74,7 +68,7 @@ th.header {
 .loginInfo {
     font-size: 9pt;
     color: #008080;
-    margin-right: 10px; /* ログアウトボタンとの間隔 */
+    margin-right: 10px;
 }
 
 .logoutButton {
@@ -91,10 +85,9 @@ td.btnArea {
 }
 
 .header-spacing {
-    margin-top: 20px; /* 上部に20ピクセルのマージン */
+    margin-top: 20px;
 }
 
-/* グリッドラインの追加 */
 .table-grid {
     width: 100%;
     border-collapse: collapse;
@@ -110,17 +103,14 @@ td.btnArea {
     background-color: #f2f2f2;
 }
 
-/* ストライプ効果（奇数行と偶数行で色を交互に） */
 .table-striped tbody tr:nth-child(odd) {
     background-color: #f2f2f2;
 }
 
-/* ホバー効果（マウスオーバー時に行の色を変更） */
 .table-hover tbody tr:hover {
-    background-color: #ccffcc; /* パステルグリーンの背景色 */
+    background-color: #ccffcc;
 }
 
-/* レスポンシブデザイン（小さい画面でスクロール） */
 .table-responsive {
     overflow-x: auto;
     display: block;
@@ -155,17 +145,17 @@ table.menuClass td.description {
 }
 
 input[type="submit"], input[type="reset"], button {
-    color: #008080; /* ターコイズ色 */
-    text-decoration: none; /* 下線をなくす */
-    padding: 10px 20px; /* パディングを追加 */
-    border: 1px solid #008080; /* 枠線を追加 */
-    border-radius: 5px; /* 角を丸くする */
-    background-color: transparent; /* 背景色を透明に */
-    cursor: pointer; /* カーソルをポインターに */
-    transition: 0.3s; /* アニメーション効果 */
+    color: #008080;
+    text-decoration: none;
+    padding: 10px 20px;
+    border: 1px solid #008080;
+    border-radius: 5px;
+    background-color: transparent;
+    cursor: pointer;
+    transition: 0.3s;
 }
 
 input[type="submit"]:hover, input[type="reset"]:hover, button:hover {
-    background-color: #008080; /* マウスオーバー時の背景色 */
-    color: #ffffff; /* マウスオーバー時の文字色 */
+    background-color: #008080;
+    color: #ffffff;
 }

src/main/resources/static/js/common.js

@@ -1,8 +1,6 @@
 function convertToKatakana(input) {
-    // 漢字とローマ字を削除
     const valueWithoutKanjiAndRomaji = input.value.replace(/[\u4E00-\u9FFF\u0041-\u009F]/g, '');
 
-    // ひらがなをカタカナに変換
     const katakanaValue = valueWithoutKanjiAndRomaji.replace(/[\u3041-\u3096]/g, function (match) {
         const chr = match.charCodeAt(0) + 0x60;
         return String.fromCharCode(chr);
@@ -16,15 +14,12 @@ function logoutSubmit() {
     form.setAttribute('method', 'post');
     form.setAttribute('action', 'logout');
 
-    // 動的送信用のHidden
-    // 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
     const inputField = document.createElement("input");
     inputField.setAttribute("type", "hidden");
     inputField.setAttribute("value", "logout");
 
     form.appendChild(inputField);
 
-    // フォームをDOMに追加
     document.body.appendChild(form);
 
     form.submit();

src/main/resources/templates/error.html

@@ -15,6 +15,11 @@
 <h1>エラーが発生しました。</h1>
 
 <div>ログインからやり直してください。</div>
+<div class="msgBox error" th:if="${messageError} != null">
+        <span class="error" th:text="${messageError.message}"></span>
+    </div>
+
+
 <a href="login">ログイン</a>
 </body>
 </html>

src/main/resources/templates/insertDepartmentConfirm.html

@@ -0,0 +1,86 @@
+<!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="dptId"
+                           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);
+
+        document.body.appendChild(form);
+
+        form.submit();
+    }
+</script>
+
+</body>
+</html>

src/main/resources/templates/insertDepartmentInput.html

@@ -0,0 +1,67 @@
+<!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>

src/main/resources/templates/insertDepartmentResult.html

@@ -0,0 +1,35 @@
+<!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>
+<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');
+
+        const inputField = document.createElement("input");
+        inputField.setAttribute("type", "hidden");
+        inputField.setAttribute("value", "select");
+
+        form.appendChild(inputField);
+
+        document.body.appendChild(form);
+
+        form.submit();
+    }
+</script>
+</html>

src/main/resources/templates/insertEmployeeConfirm.html

@@ -4,9 +4,7 @@
 <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>
@@ -138,7 +136,6 @@
         form.setAttribute('method', 'post');
         form.setAttribute('action', 'insertEmployeeInput');
 
-        // 確認画面から編集画面に戻ってきたときのフラグ（未使用）
         const inputField = document.createElement("input");
         inputField.setAttribute("type", "hidden");
         inputField.setAttribute("name", "backFlg");
@@ -146,7 +143,6 @@
 
         form.appendChild(inputField);
 
-        // フォームをDOMに追加
         document.body.appendChild(form);
 
         form.submit();

src/main/resources/templates/insertEmployeeResult.html

@@ -4,9 +4,7 @@
 <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>
@@ -23,15 +21,12 @@
         form.setAttribute('method', 'post');
         form.setAttribute('action', 'insertEmployeeInput');
 
-        // 動的送信用の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();

src/main/resources/templates/login.html

@@ -30,7 +30,7 @@
                        required="required"
                        style="width: 100%;"
                        th:field="*{mailAddress}"
-                       type="text"/>
+                       type="email"/>
             </td>
         </tr>
         <tr>

src/main/resources/templates/menu.html

@@ -4,9 +4,7 @@
 <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>
@@ -32,6 +30,15 @@
         <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">登録済みの部署覧表示と</br>更新、削除を行います。</td>
+	    </tr>
+		<tr>
+		        <td><a class="menuClass" href="javascript:insertDepartmentSubmit()"><i class="fas fa-plus"></i> 部署登録 </a></td>
+		        <td class="description">新規で部署追加を行います。</td>
+		    </tr>
 
 </table>
 </body>
@@ -42,15 +49,12 @@
         form.setAttribute('method', 'post');
         form.setAttribute('action', 'selectEmployeeInfo');
 
-        // 動的送信用のHidden
-        // 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
         const inputField = document.createElement("input");
         inputField.setAttribute("type", "hidden");
         inputField.setAttribute("value", "selectEmployeeInfo");
 
         form.appendChild(inputField);
 
-        // フォームをDOMに追加
         document.body.appendChild(form);
 
         form.submit();
@@ -61,15 +65,12 @@
         form.setAttribute('method', 'post');
         form.setAttribute('action', 'selectDepartment');
 
-        // 動的送信用のHidden
-        // 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
         const inputField = document.createElement("input");
         inputField.setAttribute("type", "hidden");
         inputField.setAttribute("value", "selectDepartment");
 
         form.appendChild(inputField);
 
-        // フォームをDOMに追加
         document.body.appendChild(form);
 
         form.submit();
@@ -80,15 +81,12 @@
         form.setAttribute('method', 'post');
         form.setAttribute('action', 'insertEmployeeInput');
 
-        // 動的送信用のHidden
-        // 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
         const inputField = document.createElement("input");
         inputField.setAttribute("type", "hidden");
         inputField.setAttribute("value", "insertEmployeeInput");
 
         form.appendChild(inputField);
 
-        // フォームをDOMに追加
         document.body.appendChild(form);
 
         form.submit();
@@ -99,15 +97,12 @@
         form.setAttribute('method', 'post');
         form.setAttribute('action', 'insertDepartmentInput');
 
-        // 動的送信用のHidden
-        // 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
         const inputField = document.createElement("input");
         inputField.setAttribute("type", "hidden");
         inputField.setAttribute("value", "insertDepartmentInput");
 
         form.appendChild(inputField);
 
-        // フォームをDOMに追加
         document.body.appendChild(form);
 
         form.submit();

src/main/resources/templates/selectDepartment.html

@@ -0,0 +1,115 @@
+<!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="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>
+            <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>
+<div class="header-spacing"></div>
+<a href="showMenu">メニューに戻る</a>
+<div class="header-spacing"></div>
+<h1><span>検索結果</span></h1>
+<div class="header-spacing"></div>
+<th:block th:if="${messageInfo != null}">
+    <script th:inline="javascript">
+        alert([[${messageInfo.message}]]);
+    </script>
+</th:block>
+<div class="header-spacing"></div>
+<th:block th:if="${departmentFormList != null and departmentFormList.size() > 0}">
+    <!-- 検索結果が1件以上ある場合 -->
+    <table class="table-grid table-striped table-hover">
+        <thead>
+        <tr>
+            <th style="width: 100px;">部署ID</th>
+            <th style="width: 150px;">部署名</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>
+            <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>
+    </table>
+</th:block>
+<th:block th:if="${departmentFormList == null or departmentFormList.size() == 0}">
+    <!-- 検索結果が0件の場合 -->
+    検索結果はありません。
+</th:block>
+
+</body>
+<script type="text/javascript">
+
+    function clearInput() {
+        document.getElementById('idDepartment').value = '';
+        document.getElementById('nmDepartment').value = '';
+    }
+
+
+</script>
+</html>

src/main/resources/templates/updateDepartmentInput.html

@@ -0,0 +1,83 @@
+<!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="/updateDepartmentResult"
+      method="post"
+      onsubmit="return confirm('本当によろしいですか？');"
+      th:object="${updateDepartmentForm}"
+>
+    <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"
+                           readonly="readonly"
+                           th:field="*{idDepartment}"
+                           type="text"
+                    />
+                </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="javascript:selectSubmit()">一覧に戻る</a>
+</body>
+
+<script>
+    function selectSubmit() {
+        const form = document.createElement('form');
+        form.setAttribute('method', 'post');
+        form.setAttribute('action', 'selectDepartmentAll');
+
+        const inputField = document.createElement("input");
+        inputField.setAttribute("type", "hidden");
+        inputField.setAttribute("value", "selectDepartmentAll");
+
+        form.appendChild(inputField);
+
+        document.body.appendChild(form);
+
+        form.submit();
+    }
+
+</script>
+</html>

src/main/resources/templates/updateEmployeeInput.html

@@ -4,9 +4,7 @@
 <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>
@@ -93,7 +91,6 @@
                 </label>
             </td>
         </tr>
-        <!-- *** Chrome等のブラウザの場合自動でセットされる可能性があるので注意書きを外にも *** -->
         <tr>
             <th></th>
             <td>
@@ -163,15 +160,12 @@
         form.setAttribute('method', 'post');
         form.setAttribute('action', 'selectAll');
 
-        // 動的送信用のHidden
-        // 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
         const inputField = document.createElement("input");
         inputField.setAttribute("type", "hidden");
         inputField.setAttribute("value", "selectAll");
 
         form.appendChild(inputField);
 
-        // フォームをDOMに追加
         document.body.appendChild(form);
 
         form.submit();

src/main/resources/templates/updatePersonalDepartmentResult.html

@@ -0,0 +1,37 @@
+<!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>
+<h2>更新が完了しました</h2>
+<br/>
+<a href="javascript:backSubmit()">戻る</a>
+</body>
+
+<script type="text/javascript">
+    function backSubmit() {
+        const form = document.createElement('form');
+        form.setAttribute('method', 'post');
+        form.setAttribute('action', 'updatePersonalDepartmentResult');
+
+        const inputField = document.createElement("input");
+        inputField.setAttribute("type", "hidden");
+        inputField.setAttribute("value", "updatePersonalDepartmentResult");
+
+        form.appendChild(inputField);
+
+        document.body.appendChild(form);
+
+        form.submit();
+    }
+</script>
+
+</html>

src/main/resources/templates/updatePersonalEmployeeResult.html

@@ -4,9 +4,7 @@
 <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>
@@ -24,15 +22,12 @@
         form.setAttribute('method', 'post');
         form.setAttribute('action', 'updatePersonalEmployeeResult');
 
-        // 動的送信用のHidden
-        // 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
         const inputField = document.createElement("input");
         inputField.setAttribute("type", "hidden");
         inputField.setAttribute("value", "updatePersonalEmployeeResult");
 
         form.appendChild(inputField);
 
-        // フォームをDOMに追加
         document.body.appendChild(form);
 
         form.submit();