[edit] 部署登録、更新の際のNmDepartmentに.strip()を追加

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

@@ -15,15 +15,7 @@ public class SearchConditionDepartment {
     private final Integer idDepartment;
     /**
      * 部署名
-     * 
      */
     private final String nmDepartment;
 
-    
-    
-	public static SearchConditionDepartment convertTo(SearchConditionDepartment searchConditionDepartment) {
-		// TODO 自動生成されたメソッド・スタブ
-		return null;
-	}
-
 }

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

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

@@ -6,6 +6,8 @@ import com.example.rhizome.app.domain.model.Department;
 import com.example.rhizome.app.domain.model.SearchConditionDepartment;
 
 public interface SearchDepartment {
+	Department searchDepartmentById(Integer idDepartment);
+	
     List<Department> selectAll();
 
     List<Department> searchBy(SearchConditionDepartment searchConditionDepartment);

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

@@ -1,7 +0,0 @@
-package com.example.rhizome.app.domain.service;
-
-public interface SearchDepartmentInfo {
-//    List<DepartmentInfo> selectAll();
-//
-//    List<DepartmentInfo> searchBy(SearchConditionEmployee searchConditionEmployee);
-}

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

@@ -1,57 +0,0 @@
-//package com.example.rhizome.app.domain.service;
-//
-//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.infra.entity.EmployeeDepartmentEntity;
-//import com.example.rhizome.app.infra.repository.EmployeeInfoRepository;
-//
-//@Service
-//@Transactional
-//public class SearchDepartmentInfoImpl implements SearchDepartmentInfo{
-//
-//	DepartmentInfoRepository departmentInfoRepository;
-//
-//	    @Autowired
-//	    public SearchDepartmentInfoImpl(EmployeeInfoRepository employeeInfoRepository) {
-//	        this.departmentInfoRepository = departmentInfoRepository;
-//	    }
-//
-//
-//	    /**
-//	     * EmployeeInfo (employee join department) のレコードを全件取得
-//	     *
-//	     * @return 取得したレコード全件
-//	     */
-//	    public List<DepartmentInfo> selectAll() {
-//
-//	        return EmployeeDepartmentEntity.createEmployeeInfoList(departmentInfoRepository.findAll());
-//
-//	    }
-//
-//	    /**
-//	     * SearchConditionEmployee の情報を元に EmployeeInfo (employee join department) のレコードを取得
-//	     *
-//	     * @param searchConditionEmployee 検索条件
-//	     * @return 検索結果のレコードリスト
-//	     */
-//	    public List<DepartmentInfo> searchBy(SearchConditionEmployee searchConditionEmployee) {
-//	        // 動的に検索条件を絞り込む
-//	        // Specification は Criteria API の Predicate をラップしたもの
-//	        return EmployeeDepartmentEntity
-//	                .createEmployeeInfoList(
-//	                        employeeInfoRepository.findAll(Specification
-//	                                .where(EmployeeInfoRepository.idEmployeeEqual(searchConditionEmployee.getIdEmployee()))
-//	                                .and(EmployeeInfoRepository.nmEmployeeEqual(searchConditionEmployee.getNmEmployee()))
-//	                               
-//	                        )
-//	                );
-//
-//	    }
-//	}

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

@@ -0,0 +1,7 @@
+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,30 @@
+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 departmentReposirtory;
+	
+	@Autowired
+	public DeleteDepartmentImpl(DepartmentRepository departmentReposirtory) {
+		this.departmentReposirtory = departmentReposirtory;
+	}
+	
+	/**
+     * idDepartment を元に Department データを削除
+     *
+     * @param idDepartment 削除対象のidDepartment
+     */
+	public void deleteDepartment(Integer idDepartment) {
+		departmentReposirtory.deleteById(idDepartment);
+	}
+	
+}

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

@@ -0,0 +1,33 @@
+package com.example.rhizome.app.domain.service.impl;
+
+import javax.transaction.Transactional;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+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;
+	}
+	
+	/**
+     * employee インスタンスの内容を登録する
+     *
+     * @param Department 登録対象のデータ
+     */
+	@Override
+	public void registerDepartment(Department department) {
+		departmentRepository.save(DepartmentEntity.convertFrom(department));
+	}
+}

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

@@ -1,17 +1,18 @@
 package com.example.rhizome.app.domain.service.impl;
 
 
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 import com.example.rhizome.app.domain.model.Department;
 import com.example.rhizome.app.domain.model.SearchConditionDepartment;
 import com.example.rhizome.app.domain.service.SearchDepartment;
 import com.example.rhizome.app.infra.entity.DepartmentEntity;
 import com.example.rhizome.app.infra.repository.DepartmentRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
 
 /**
  * 部署情報検索系の機能を集約させるサービスクラスです。
@@ -32,6 +33,22 @@ public class SearchDepartmentImpl implements SearchDepartment {
         this.departmentRepository = departmentRepository;
     }
     
+    
+    /**
+     * 部署名を元にDepartment Table を検索します。
+     * 
+     * @param nmDepartment 検索対象の nmDepartment
+     * @return Table から取得したレコードの情報
+     */
+    public List<Department> searchDepartmentByName(String nmDepartment) {
+    	return DepartmentEntity.createDepartmentList(departmentRepository.findByNmDepartment(nmDepartment).stream().toList());
+    }
+    
+    @Override
+    public Department searchDepartmentById(Integer idDepartment) {
+    	return DepartmentEntity.createDepartment(departmentRepository.findByIdDepartment(idDepartment).orElse(new DepartmentEntity()));
+    }
+
     /**
      * 部署情報を全件取得する
      *

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

@@ -0,0 +1,35 @@
+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;
+	}
+	
+	
+	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/infra/entity/DepartmentEntity.java

@@ -7,14 +7,21 @@
 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
  *
@@ -40,6 +47,11 @@ public class DepartmentEntity {
     @Column(name = "nm_department", nullable = false)
     private String nmDepartment;
     
+    
+    public static Department createDepartment(DepartmentEntity departmentEntity) {
+    	return new Department(departmentEntity.getIdDepartment(), departmentEntity.getNmDepartment());
+    }
+    
     /**
      * DepartmentEntity（DataAccess層依存）から Department（BusinessLogic層依存型）に変換します。
      *

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

@@ -1,11 +1,14 @@
 package com.example.rhizome.app.infra.repository;
 
-import com.example.rhizome.app.infra.entity.DepartmentEntity;
+import java.util.Optional;
+
 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:
@@ -21,7 +24,8 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public interface DepartmentRepository extends JpaRepository<DepartmentEntity, Integer>, JpaSpecificationExecutor<DepartmentEntity> {
-
+	Optional<DepartmentEntity> findByNmDepartment(String nmDepartment);
+	Optional<DepartmentEntity> findByIdDepartment(Integer idDepartment);
 
     static Specification<DepartmentEntity> idDepartmentEqual(Integer idDepartment) {
         return idDepartment == null ?

src/main/java/com/example/rhizome/app/presentation/controller/DeleteDepartmentController.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.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.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.MessageForm;
+
+@Controller
+public class DeleteDepartmentController {
+
+	// ログ出力用インスタンス
+    private final static Logger LOGGER = Logger.getLogger(DeleteEmployeeController.class.getName());
+
+    // エラーメッセージ用の定数フィールド
+    private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
+
+    HttpSession httpSession;
+    DeleteDepartment deleteDepartment;
+    SearchDepartment searchDepartment;
+    SearchEmployee searchEmployee;
+
+    @Autowired
+    public DeleteDepartmentController(DeleteDepartment deleteDepartment, SearchDepartment searchDepartment, SearchEmployee searchEmployee, HttpSession httpSession) {
+        this.httpSession = httpSession;
+        this.deleteDepartment = deleteDepartment;
+        this.searchDepartment = searchDepartment;
+        this.searchEmployee = searchEmployee;
+    }
+
+    /**
+     * 削除処理のコントローラ
+     *
+     * @param idDepartment 削除対象のdepartmentId
+     * @param model      ビューにデータを渡すためのコンテナ
+     * @return 遷移先の画面
+     */
+    @PermissionCheck
+    @SessionCheck
+    @RequestMapping(value = DELETE_DEPARTMENT, method = RequestMethod.POST)
+    public String deleteDepartment(@RequestParam("idDepartment") Integer idDepartment, Model model) {
+
+        try {
+
+            // 削除処理実施
+            deleteExec(
+                    model,
+                    idDepartment);
+
+            // 検索画面に遷移
+            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;
+        }
+    }
+
+    /**
+     * 削除処理実施
+     *
+     * @param model      ビューにデータを渡すためのコンテナ
+     * @param idDepartment 削除対象のdepartmentId
+     */
+    private void deleteExec(Model model, Integer idDepartment) {
+
+        final String DELETE_TARGET_ID_NOT_FIND = "削除対象のIDが不明です。";
+        final String DELETE_TARGET_HAS_MEMBERS = "1名以上が所属している部署は削除できません。";
+        final String DELETE_COMPLETE = "削除しました。";
+
+        // 削除対象の部署IDが存在するかチェック
+        if (searchDepartment.searchDepartmentById(idDepartment)==null) {
+            // 削除対象だった場合
+            // エラーメッセージをセット
+            model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(DELETE_TARGET_ID_NOT_FIND));
+            // 検索画面に遷移
+            return;
+        }
+        
+        // 削除対象の部署に所属している社員が1人以上いるか確認
+        if (searchEmployee.searchEmployeeByIdDepartment(idDepartment).size() > 0) {
+        	// 削除対象だった場合
+            // エラーメッセージをセット
+            model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(DELETE_TARGET_HAS_MEMBERS));
+            // 検索画面に遷移
+            return;
+        }
+        
+
+        // 削除を実施
+        deleteDepartment.deleteDepartment(idDepartment);
+
+        // 削除完了したメッセージをセット
+        model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(DELETE_COMPLETE));
+
+    }
+}

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

@@ -0,0 +1,118 @@
+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.Department;
+import com.example.rhizome.app.domain.model.SearchConditionDepartment;
+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;
+import com.example.rhizome.app.presentation.form.MessageForm;
+
+@Controller
+public class InsertDepartmentConfirmController {
+	
+	   // ログ出力用インスタンス
+    private final static Logger LOGGER = Logger.getLogger(InsertEmployeeConfirmController.class.getName());
+
+    // エラーメッセージ用の定数フィールド
+    private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
+
+    HttpSession httpSession;
+    SearchDepartment searchDepartment;
+
+    @Autowired
+    public InsertDepartmentConfirmController(
+            HttpSession httpSession,
+            SearchDepartmentImpl searchDepartment
+    ) {
+        this.httpSession = httpSession;
+        this.searchDepartment = searchDepartment;
+    }
+
+    @ModelAttribute
+    public InsertDepartmentForm insertDepartmentForm() {
+        return new InsertDepartmentForm();
+    }
+    
+    /**
+     * 登録情報のチェックを行う
+     *
+     * @param insertDepartmentForm 登録情報
+     * @param model              ビューにデータを渡すためのコンテナ
+     * @return 遷移先の画面
+     */
+    @PermissionCheck
+    @SessionCheck
+    @RequestMapping(value = INSERT_DEPARTMENT_CONFIRM, method = RequestMethod.POST)
+    public String insertDepartmentConfirm(InsertDepartmentForm insertDepartmentForm, Model model) {
+
+        try {
+        	insertDepartmentForm.setNmDepartment(insertDepartmentForm.getNmDepartment().strip());
+        	
+            // 登録用パラメータチェック
+            List<String> error = insertDepartmentForm.validateParameter();
+
+            // 入力内容に誤りがあるか
+            if (!error.isEmpty()) {
+                // 誤りがあった場合
+                // 誤りがあった箇所のエラーメッセージを表示
+                model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(String.join(", ", error) + "が不正です。"));
+                // 画面に返す為の登録情報をセット
+                model.addAttribute(PageReturnAttributeKeyword.INSERT_DEPARTMENT_FORM, insertDepartmentForm);
+                // 登録画面に遷移
+                return TransitionTargetPageNameKeyword.INSERT_DEPARTMENT_INPUT_HTML;
+            }
+
+            final String DUPLICATION = "既に登録済みの部署名です。";
+
+            // 登録対象の部署名を元に検索
+            List<Department> departmentList = searchDepartment.searchBy(new SearchConditionDepartment(null, insertDepartmentForm.getNmDepartment()));
+
+            // 検索結果があるか
+            if (!departmentList.isEmpty()) {
+                // 検索した結果0件ではない場合
+                // 重複を許さないため、エラー処理
+                model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(DUPLICATION));
+                // 画面に返す為の登録情報をセット
+                model.addAttribute(PageReturnAttributeKeyword.INSERT_DEPARTMENT_FORM, insertDepartmentForm);
+                // 登録画面に遷移
+                return TransitionTargetPageNameKeyword.INSERT_DEPARTMENT_INPUT_HTML;
+            }
+
+            // 登録確認ページに遷移
+            model.addAttribute(PageReturnAttributeKeyword.INSERT_DEPARTMENT_FORM, insertDepartmentForm);
+            // 登録確認画面に遷移
+            return TransitionTargetPageNameKeyword.INSERT_DEPARTMENT_CONFIRM_HTML;
+
+
+        } catch (Exception e) {
+            // ログイン情報の破棄
+            httpSession.invalidate();
+
+            e.printStackTrace();
+
+            // エラーログ出力
+            LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
+            // エラー画面遷移
+            return TransitionTargetPageNameKeyword.ERROR_HTML;
+        }
+    }
+}

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

@@ -0,0 +1,131 @@
+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.RegisterDepartment;
+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(InsertEmployeeController.class.getName());
+
+    // エラーメッセージ用の定数フィールド
+    private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
+
+    HttpSession httpSession;
+    RegisterDepartment registerDepartment;
+    
+    @Autowired
+    public InsertDepartmentController(HttpSession httpSession, RegisterDepartmentImpl registerDepartment) {
+        this.httpSession = httpSession;
+        this.registerDepartment = registerDepartment;
+    }
+    
+    @ModelAttribute
+    public InsertDepartmentForm insertDeaprtmentForm() {
+    	return new InsertDepartmentForm();
+    }
+    
+    /**
+     * 新規登録画面表示処理
+     *
+     * @param insertDepartmentForm 登録情報
+     * @param model              ビューにデータを渡すためのコンテナ
+     * @return 遷移先の画面
+     */
+    @PermissionCheck
+    @SessionCheck
+    @RequestMapping(value = INSERT_DEPARTMENT, method = RequestMethod.POST)
+    public String insertDepartment(InsertDepartmentForm insertDepartmentForm, Model model) {
+
+        try {
+            
+            // Confirm画面から渡ってきた値をチェック
+            List<String> error = validateParameter(
+                    insertDepartmentForm.getNmDepartment()
+            );
+
+            // エラーが1件以上有る場合
+            if (!error.isEmpty()) {
+                // エラー内容を画面に表示
+                model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(String.join(", ", error) + "が不正です。"));
+                // 登録画面に遷移
+                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;
+        }
+    }
+    
+    /**
+     * @param departmentName 登録対象の名前
+     * @return エラーが有った場合はエラー文言、無ければ空のリストが返る
+     */
+    private List<String> validateParameter(String departmentName) {
+
+        final String DEPARTMENT_NAME_NULL_BLANK = "部署名";
+
+        List<String> error = new ArrayList<>();
+
+        // null or 空文字判定
+        if (isNullOrBlank(departmentName)) {
+            // エラー内容を追加
+            error.add(DEPARTMENT_NAME_NULL_BLANK);
+        }
+
+        return error;
+
+    }
+
+    /**
+     * 仮引数を null or 空 判定する
+     *
+     * @param str 判定対象の文字列
+     * @return true:null or 空 false:null or 空 では無い
+     */
+    private static boolean isNullOrBlank(String str) {
+        if (null == str) {
+            return true;
+        }
+
+        return str.isBlank();
+    }
+
+    
+}

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

@@ -9,77 +9,71 @@ import javax.servlet.http.HttpSession;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
 import com.example.rhizome.aop.aspect.PermissionCheck;
 import com.example.rhizome.aop.aspect.SessionCheck;
-import com.example.rhizome.app.domain.service.RegisterEmployee;
-import com.example.rhizome.app.domain.service.SearchDepartment;
+import com.example.rhizome.app.domain.service.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.InsertEmployeeForm;
+import com.example.rhizome.app.presentation.form.InsertDepartmentForm;
 
-
-/**
- * 登録画面表示用コントローラ
- */
 @Controller
 public class InsertDepartmentInputController {
 	
+	// ログ出力用インスタンス
+    private final static Logger LOGGER = Logger.getLogger(InsertEmployeeInputController.class.getName());
 
-	    // ログ出力用インスタンス
-	    private final static Logger LOGGER = Logger.getLogger(InsertEmployeeInputController.class.getName());
+    // エラーメッセージ用の定数フィールド
+    private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
 
-	    // エラーメッセージ用の定数フィールド
-	    private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
+    HttpSession httpSession;
+    RegisterDepartment registerDepartment;
     
-	    HttpSession httpSession;
-	    RegisterEmployee registerEmployee;
-	    SearchDepartment searchDepartment;
+    @Autowired
+    public InsertDepartmentInputController(HttpSession httpSession, RegisterDepartment registerDepartment) {
+        this.httpSession = httpSession;
+        this.registerDepartment = registerDepartment;
+    }
 
-	    @Autowired
-	    public InsertDepartmentInputController(HttpSession httpSession, RegisterEmployee registerEmployee, SearchDepartment searchDepartment) {
-	        this.httpSession = httpSession;
-	        this.registerEmployee = registerEmployee;
-	        this.searchDepartment = searchDepartment;
-	    }
+    @ModelAttribute
+    public InsertDepartmentForm insertDepartmentForm() {
+        return new InsertDepartmentForm();
+    }
     
-	    @ModelAttribute
-	    public InsertEmployeeForm insertEmployeeForm() {
-	        return new InsertEmployeeForm();
-	    }
+    /**
+     * 登録画面表示処理
+     *
+     * @param insertDepartmentForm 登録画面のフォーム
+     * @param model              ビューにデータを渡すためのコンテナ
+     * @return 遷移先の画面
+     */
+    @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);
 
-	    /**
-	     * 登録画面表示処理
-	     *
-	     * @param insertEmployeeForm 登録画面のフォーム
-	     * @param model              ビューにデータを渡すためのコンテナ
-	     * @return 遷移先の画面
-	     */
-	    @SessionCheck
-	    @PermissionCheck
-	    @RequestMapping(value = INSERT_DEPARTMENT_INPUT, method = RequestMethod.POST)
-	    public String insertInput() {
+            // 登録画面に遷移
+            return TransitionTargetPageNameKeyword.INSERT_DEPARTMENT_INPUT_HTML;
 
-	        try {
+        } catch (Exception e) {
+            // ログイン情報の破棄
+            httpSession.invalidate();
 
+            e.printStackTrace();
 
+            // エラーログ出力
+            LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
+            // エラー画面遷移
+            return TransitionTargetPageNameKeyword.ERROR_HTML;
+        }
+    }
 
-	            // 登録画面に遷移
-	            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/SelectDepartmentController.java

@@ -14,32 +14,28 @@ 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.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.DepartmentForm;
 import com.example.rhizome.app.presentation.form.SearchConditionDepartmentForm;
 
-
 @Controller
-public class SelectDepartmentController {
+class SelectDepartmentController {
 
-	// ログ出力用インスタンス
-    private final static Logger LOGGER = Logger.getLogger(SelectEmployeeController.class.getName());
+    // ログ出力用インスタンス
+    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) {
+    public SelectDepartmentController(HttpSession httpSession, SearchDepartment searchDepartment) {
         this.httpSession = httpSession;
         this.searchDepartment = searchDepartment;
-        this.searchEmployeeInfo = searchEmployeeInfo;
     }
 
     @ModelAttribute
@@ -47,35 +43,31 @@ public class SelectDepartmentController {
         return new SearchConditionDepartmentForm();
     }
 
-    
     /**
      * 部署検索画面表示処理コントローラ
      *
-     * @param searchConditionEmployeeForm 検索画面のフォーム
+     * @param searchConditionDepartmentForm 検索画面のフォーム
      * @param model                       ビューにデータを渡すためのコンテナ
      * @return 遷移先の画面
      */
-    
     @PermissionCheck
     @SessionCheck
-    @RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO, method = RequestMethod.POST)
-    public String select(SearchConditionDepartment searchConditionDepartment, Model model) {
+    @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.selectAll())
-//            );
+            model.addAttribute(
+                    PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+                    DepartmentForm.convertFrom(searchDepartment.selectAll())
+            );
             
             // 検索条件を元に検索を実施
-            // 取得した EmployeeInfo（ employee + department ）の情報を画面に返す用の型に詰め替えてセット
-            model.addAttribute(
-            		PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-            		DepartmentForm.convertFrom(searchDepartment.searchByWithLike(searchConditionDepartment)));
-            // 検索ページに遷移
+            // 取得した DepartmentInfoの情報を画面に返す用の型に詰め替えてセット
+            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(searchDepartment.searchByWithLike(SearchConditionDepartmentForm.convertTo(searchConditionDepartmentForm))));
+
             return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
 
 
@@ -93,40 +85,34 @@ public class SelectDepartmentController {
 
     }
 
-    
-    
+    /**
+     * 部署検索画面表示処理コントローラ
+     * 検索条件無しの状態を作るため、空の検索条件で検索した結果を画面に返す
+     *
+     * @param model ビューにデータを渡すためのコンテナ
+     * @return 遷移先の画面
+     */
     @PermissionCheck
     @SessionCheck
-    @RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT, method = RequestMethod.POST)
-    public String select1(SearchConditionDepartment searchConditionDepartment, Model model) {
+    @RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO_FORM_EMPTY, method = RequestMethod.POST)
+    public String select(Model model) {
 
-        try {
+        // 部署一覧を取得し、画面に返す用のクラスに詰め替える
+        // 作成した部署一覧をセット
+        model.addAttribute(
+                PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+                DepartmentForm.convertFrom(searchDepartment.selectAll())
+        );
 
-        	 model.addAttribute(
-                     PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-                     DepartmentForm.convertFrom(searchDepartment.selectAll())
-             );
-        	 
-            // 検索ページに遷移
-            return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
-
-
-        } catch (Exception e) {
-            // ログイン情報の破棄
-            httpSession.invalidate();
-
-            e.printStackTrace();
-
-            // エラーログ出力
-            LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-            // エラー画面遷移
-            return TransitionTargetPageNameKeyword.ERROR_HTML;
-        }
+        // 検索条件を元に検索を実施
+        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,17 +1,5 @@
 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;
@@ -21,6 +9,16 @@ 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;
 
 /**
  * 社員検索画面用コントローラ　リスト全件表示、検索表示、更新、削除が可能
@@ -72,9 +70,7 @@ public class SelectEmployeeController {
 
             // 検索条件を元に検索を実施
             // 取得した 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;
 

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

@@ -0,0 +1,87 @@
+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.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(UpdateEmployeeController.class.getName());
+    // エラーメッセージ用の定数フィールド
+    private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
+
+    HttpSession httpSession;
+    SearchDepartment searchDepartment;
+    
+    @Autowired
+    public UpdateDepartmentController(HttpSession httpSession,
+    SearchDepartment searchDepartment) {
+		this.httpSession = httpSession;
+		this.searchDepartment = searchDepartment;
+	}
+    
+    @ModelAttribute
+    public SearchConditionDepartmentForm searchConditionDepartmentForm() {
+    	return new SearchConditionDepartmentForm();
+    }
+    
+    /**
+     * 更新対象の department が存在するか確認する為のコントローラ
+     *
+     * @param idDepartment 更新対象の department の id
+     * @param model      ビューにデータを渡すためのコンテナ
+     * @return 遷移先の画面
+     */
+    @PermissionCheck
+    @SessionCheck
+    @RequestMapping(value = TransitionTargetPageNameKeyword.SHOW_UPDATE_DEPARTMENT, method=RequestMethod.POST)
+    public String showUpdateDepartment(@RequestParam("idDepartment") Integer idDepartment, Model model) {
+        final String UPDATE_TARGET_ID_NOT_FOUND = "更新対象のデータが見つかりません。";
+        
+        try {
+        	List<Department> departmentList = searchDepartment.searchBy(new SearchConditionDepartment(idDepartment, null));
+        	
+        	if (departmentList.isEmpty()) {
+        		model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(UPDATE_TARGET_ID_NOT_FOUND));
+        		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,107 @@
+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.MessageForm;
+import com.example.rhizome.app.presentation.form.UpdateDepartmentForm;
+
+@Controller
+public class UpdateDepartmentResultController {
+	
+	private final static Logger LOGGER = Logger.getLogger(UpdateDepartmentController.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 checkDuplicateNmDepartment(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 NO_TARGET = "更新対象のデータが見つかりません。";
+		
+		final String UPDATE_COMPLETE = "更新が完了しました。";
+		
+		try {
+			updateDepartmentForm.setNmDepartment(updateDepartmentForm.getNmDepartment().strip());
+			List<Department> departmentList = searchDepartment.searchBy(new SearchConditionDepartment(null, updateDepartmentForm.getNmDepartment()));
+			
+			if (!checkDuplicateNmDepartment(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;
+			}
+			
+			Department beforeDepartment = searchDepartment.searchDepartmentById(updateDepartmentForm.getIdDepartment());
+			if (beforeDepartment.getIdDepartment() == null) {
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(NO_TARGET));
+				model.addAttribute(PageReturnAttributeKeyword.UPDATE_DEPARTMENT_FORM, updateDepartmentForm);
+				
+				return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
+			}
+			
+			updateDepartment.updateDepartment(beforeDepartment, UpdateDepartmentForm.counvertTo(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;
+		}
+	}
+	
+}

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

@@ -10,10 +10,11 @@ public class PageReturnAttributeKeyword {
 
     public static final String DEPARTMENT_FORM_LIST = "departmentFormList";
     public static final String UPDATE_EMPLOYEE_INFO_FORM = "updateEmployeeInfoForm";
+    public static final String UPDATE_DEPARTMENT_FORM = "updateDepartmentForm";
     public static final String INSERT_EMPLOYEE_FORM = "insertEmployeeForm";
+    public static final String INSERT_DEPARTMENT_FORM = "insertDepartmentForm";
     public static final String LOGIN_INFO_FORM = "loginInfoForm";
     public static final String UPDATE_PERSONAL_EMPLOYEE_USER_FORM = "updatePersonalEmployeeUserForm";
     public static final String EMPLOYEE_INFO_FORM_LIST = "employeeInfoFormList";
-    public static final String DEPARTMENT_INFO_FORM_LIST = "departmentInfoFormList";
 
 }

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

@@ -19,10 +19,13 @@ public class TransitionTargetPageNameKeyword {
     public static final String SELECT_EMPLOYEE_HTML = "selectEmployee";
     public static final String SELECT_DEPARTMENT_HTML = "selectDepartment";
     public static final String INSERT_EMPLOYEE_INPUT_HTML = "insertEmployeeInput";
+    public static final String INSERT_DEPARTMENT_INPUT_HTML = "insertDepartmentInput";
     public static final String INSERT_EMPLOYEE_CONFIRM_HTML = "insertEmployeeConfirm";
+    public static final String INSERT_DEPARTMENT_CONFIRM_HTML = "insertDepartmentConfirm";
     public static final String INSERT_EMPLOYEE_RESULT_HTML = "insertEmployeeResult";
-    public static final String INSERT_DEPARTMENT_INPUT_HTML = "/insertDepartmentInput";
+    public static final String INSERT_DEPARTMENT_RESULT_HTML = "insertDepartmentResult";
     public static final String UPDATE_EMPLOYEE_INPUT_HTML = "updateEmployeeInput";
+    public static final String UPDATE_DEPARTMENT_INPUT_HTML = "updateDepartmentInput";
 
     public static final String ERROR_HTML = "error";
 
@@ -38,17 +41,22 @@ public class TransitionTargetPageNameKeyword {
 
     // 管理者向け(Controller)
     public static final String DELETE_EMPLOYEE = "/deleteEmployee";
+    public static final String DELETE_DEPARTMENT = "/deleteDepartment";
     public static final String INSERT_EMPLOYEE_INPUT = "/insertEmployeeInput";
     public static final String INSERT_EMPLOYEE_CONFIRM = "/insertEmployeeConfirm";
     public static final String INSERT_EMPLOYEE = "/insertEmployee";
     public static final String INSERT_DEPARTMENT_INPUT = "/insertDepartmentInput";
+    public static final String INSERT_DEPARTMENT_CONFIRM = "/insertDepartmentConfirm";
+    public static final String INSERT_DEPARTMENT = "/insertDepartment";
     public static final String SHOW_MENU = "/showMenu";
     public static final String SELECT_EMPLOYEE_INFO = "/selectEmployeeInfo";
     public static final String SELECT_DEPARTMENT = "/selectDepartment";
-    public static final String SELECT_DEPARTMENT_INFO = "/selectDepartmentInfo";
     public static final String SELECT_EMPLOYEE_INFO_FORM_EMPTY = "/selectAll";
+    public static final String SELECT_DEPARTMENT_INFO_FORM_EMPTY = "/selectAllDepartment";
     public static final String SHOW_UPDATE_EMPLOYEE = "/showUpdateEmployee";
     public static final String UPDATE_EMPLOYEE_RESULT = "/updateEmployeeResult";
+    public static final String SHOW_UPDATE_DEPARTMENT = "/showUpdateDepartment";
+    public static final String UPDATE_DEPARTMENT_RESULT = "/updateDepartmentResult";
 
     // Department
     // HTML
@@ -68,17 +76,22 @@ public class TransitionTargetPageNameKeyword {
                 LOGOUT,
                 DO_LOGIN,
                 DELETE_EMPLOYEE,
+                DELETE_DEPARTMENT, 
                 INSERT_EMPLOYEE_INPUT,
                 INSERT_EMPLOYEE_CONFIRM,
                 INSERT_EMPLOYEE,
                 INSERT_DEPARTMENT_INPUT, 
+                INSERT_DEPARTMENT_CONFIRM, 
+                INSERT_DEPARTMENT, 
                 SHOW_MENU,
                 SELECT_EMPLOYEE_INFO,
                 SELECT_DEPARTMENT, 
-                SELECT_DEPARTMENT_INFO,
                 SELECT_EMPLOYEE_INFO_FORM_EMPTY,
+                SELECT_DEPARTMENT_INFO_FORM_EMPTY, 
                 SHOW_UPDATE_EMPLOYEE,
-                UPDATE_EMPLOYEE_RESULT
+                UPDATE_EMPLOYEE_RESULT, 
+                SHOW_UPDATE_DEPARTMENT, 
+                UPDATE_DEPARTMENT_RESULT
         );
     }
 

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

@@ -0,0 +1,67 @@
+package com.example.rhizome.app.presentation.form;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.example.rhizome.app.domain.model.Department;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class InsertDepartmentForm {
+
+    /**
+     * 部署名
+     */
+    private String nmDepartment;
+    
+    /**
+     * 仮引数を null or 空 判定する
+     *
+     * @param str 判定対象の文字列
+     * @return true:null or 空 false:null or 空 では無い
+     */
+    private static boolean isNullOrBlank(String str) {
+        if (null == str) {
+            return true;
+        }
+
+        return str.isBlank();
+    }
+    
+    /**
+     * 画面から渡ってきた登録内容をまとめ、ビジネスモデルに変換
+     *
+     * @param insertDepartmentForm 画面から渡ってきた登録内容
+     * @return ビジネスモデルのインスタンス
+     */
+    public static Department convertTo(InsertDepartmentForm insertDepartmentForm) {
+        return new Department(
+                null,
+                insertDepartmentForm.getNmDepartment()
+        );
+    }
+    
+    /**
+     * 登録データのValidationを行う
+     *
+     * @return エラーが有った場合はエラー文言、無ければ空のリストが返る
+     */
+    public List<String> validateParameter() {
+        final String DEPARTMENT_NAME_NULL_BLANK = "部署名";
+
+        List<String> error = new ArrayList<>();
+
+        if (isNullOrBlank(nmDepartment)) {
+            error.add(DEPARTMENT_NAME_NULL_BLANK);
+        }
+
+        return error;
+
+    }
+
+}

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

@@ -6,30 +6,47 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+/**
+ * 画面から渡ってきた検索条件をまとめ、再度画面に表示する為のクラス
+ */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 public class SearchConditionDepartmentForm {
+    /**
+     * 部署ID
+     */
+    private Integer idDepartment;
+    /**
+     * 部署名
+     */
+    private String nmDepartment;
 
-	private Integer idDepartment;
-	
-	private String nmDepartment;
-	
-	
-	
-	public static SearchConditionDepartmentForm convertFrom(SearchConditionDepartment searchConditionDepartment) {
+    /**
+     * business 層の SearchConditionDepaerment クラスから画面用（presentation 層）の SearchConditionDepartmentForm に
+     * 変換します。
+     *
+     * @param searchConditionDepartment business 層の SearchConditionDepartment インスタンス
+     * @return 画面用（presentation 層）の SearchConditionDepartmentForm インスタンス
+     */
+    public static SearchConditionDepartmentForm convertFrom(SearchConditionDepartment searchConditionDepartment) {
         return new SearchConditionDepartmentForm(
-        		searchConditionDepartment.getIdDepartment(),
-        		searchConditionDepartment.getNmDepartment()
-               
+                searchConditionDepartment.getIdDepartment(),
+                searchConditionDepartment.getNmDepartment()
         );
     }
     
-	 public static SearchConditionDepartment convertTo(SearchConditionDepartmentForm searchConditionDepartmentForm) {
-	        return new SearchConditionDepartment(
-	        		searchConditionDepartmentForm.getIdDepartment(),
-	        		searchConditionDepartmentForm.getNmDepartment()
-	        );      
-	        		
-	    }
+    /**
+     * 画面用（presentation 層）の SearchConditionDepartmentForm クラスから business 層の SearchConditionDepartment クラスに
+     * 変換します。
+     *
+     * @param searchConditionDepartmentForm 画面用（presentation 層）の SearchConditionDepartmentForm インスタンス
+     * @return business 層の SearchConditionDepartment インスタンス
+     */
+    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,7 +1,6 @@
 package com.example.rhizome.app.presentation.form;
 
 import com.example.rhizome.app.domain.model.SearchConditionEmployee;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

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

@@ -0,0 +1,50 @@
+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> counvertFrom(List<Department> departmentList){
+		return departmentList.stream().map(UpdateDepartmentForm::convertFrom).toList();
+	}
+	
+	public static Department counvertTo(UpdateDepartmentForm updateDepartmentForm) {
+		return new Department(
+				updateDepartmentForm.getIdDepartment(),
+				updateDepartmentForm.getNmDepartment()
+				);
+	}
+	
+	public static boolean hasErrorParameter(UpdateDepartmentForm updateDeaprtmentForm) {
+		boolean errorFlag = !isNullOrBlank(updateDeaprtmentForm.getNmDepartment());
+		
+		return errorFlag;
+	}
+	
+	private static boolean isNullOrBlank(String str) {
+		if (null == str) {
+			return true;
+		}
+		return str.isBlank();
+	}
+}

src/main/resources/application.properties

@@ -1,3 +1,16 @@
 spring.datasource.url=jdbc:mysql://localhost:3306/rezospring
 spring.datasource.username=rezouser
 spring.datasource.password=Rezo_0000
+
+# SQLをログ出力
+logging.level.org.hibernate.SQL=debug
+
+# SQLのバインドパラメーターをログ出力
+logging.level.org.hibernate.type=trace
+logging.level.org.hibernate.orm.jdbc.bind=trace
+
+# SELECT文の結果をログ出力
+logging.level.org.hibernate.orm.jdbc.extract=trace
+
+# SQL整形
+spring.jpa.properties.hibernate.format_sql=true

src/main/resources/templates/insertDepartmentConfirm.html

@@ -0,0 +1,87 @@
+<!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="depId"
+                           readonly="readonly"
+                           type="text"
+                           value="自動で設定されます"/>
+                </label>
+            </td>
+        </tr>
+        <tr>
+            <th class="header">部署名</th>
+            <td>
+                <label>
+                    <input class="readOnly"
+                           name="nmDepartment"
+                           readonly="readonly"
+                           th:value="*{nmDepartment}"
+                           type="text"/>
+                </label>
+            </td>
+        </tr>
+        <tr>
+            <td class="btnArea" colspan="2">
+                <input type="submit" value="登録"/>
+            </td>
+        </tr>
+    </table>
+    <a href="javascript:onClickEdit()">登録内容の編集</a>　|　<a href="showMenu">メニューに戻る</a>
+</form>
+
+<script type="text/javascript">
+    function onClickEdit() {
+        const form = document.getElementById('insertForm');
+        form.setAttribute('method', 'post');
+        form.setAttribute('action', 'insertDepartmentInput');
+
+        // 確認画面から編集画面に戻ってきたときのフラグ（未使用）
+        const inputField = document.createElement("input");
+        inputField.setAttribute("type", "hidden");
+        inputField.setAttribute("name", "backFlg");
+        inputField.setAttribute("value", "edit");
+
+        form.appendChild(inputField);
+
+        // フォームをDOMに追加
+        document.body.appendChild(form);
+
+        form.submit();
+    }
+</script>
+
+</body>
+</html>

src/main/resources/templates/insertDepartmentInput.html

@@ -9,16 +9,58 @@
     <!-- CSSの読み込み -->
     <link rel="stylesheet" th:href="@{/css/all.css}">
     <link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
-    <title>検索</title>
-
+    <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,40 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+
+<head>
+
+    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
+    <!-- 外部のスクリプトファイルを読み込む -->
+    <script th:src="@{/js/common.js}"></script>
+    <!-- CSSの読み込み -->
+    <link rel="stylesheet" th:href="@{/css/all.css}">
+    <link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
+    <title>部署登録完了</title>
+</head>
+
+<body>
+<h2>部署登録が完了しました</h2>
+<br/>
+<a href="javascript:insertSubmit()">続けて登録する</a>　|　<a href="showMenu">メニューに戻る</a>
+</body>
+<script type="text/javascript">
+    function insertSubmit() {
+        const form = document.createElement('form');
+        form.setAttribute('method', 'post');
+        form.setAttribute('action', 'insertDepartmentInput');
+
+        // 動的送信用のHidden
+        // 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
+        const inputField = document.createElement("input");
+        inputField.setAttribute("type", "hidden");
+        inputField.setAttribute("value", "select");
+
+        form.appendChild(inputField);
+
+        // フォームをDOMに追加
+        document.body.appendChild(form);
+
+        form.submit();
+    }
+</script>
+</html>

src/main/resources/templates/menu.html

@@ -26,30 +26,22 @@
         <td><a class="menuClass" href="javascript:selectEmployeeSubmit()"><i class="fas fa-search"></i> 社員検索 </a>
         </td>
         <td class="description">登録済みのユーザ一覧表示と</br>更新、削除を行います。</td>
+		
+		<td><a class="menuClass" href="javascript:selectDepartmentSubmit()"><i class="fas fa-search"></i> 部署検索 </a>
+		</td>
+		<td class="description">登録済みの部署一覧表示と</br>更新、削除を行います。</td>
+
     </tr>
 
     <tr>
         <td><a class="menuClass" href="javascript:insertEmployeeSubmit()"><i class="fas fa-plus"></i> 社員登録 </a></td>
         <td class="description">新規でユーザ追加を行います。</td>
+		
+		<td><a class="menuClass" href="javascript:insertDepartmentSubmit()"><i class="fas fa-plus"></i> 部署登録 </a></td>
+		<td class="description">新規で部署追加を行います。</td>
     </tr>
 
 </table>
-
-<table class="menuClass">
-    <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>
 
 <script type="text/javascript">
@@ -58,7 +50,6 @@
         form.setAttribute('method', 'post');
         form.setAttribute('action', 'selectEmployeeInfo');
 
-		
         // 動的送信用のHidden
         // 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
         const inputField = document.createElement("input");

src/main/resources/templates/selectDepartment.html

@@ -15,101 +15,100 @@
 <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="selectDepartmentInfo"
-	      method="post"                
-	      th:object="${searchConditionDepartment}">
+    <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>
+    <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: 60px;">部署ID</th>
+            <th style="width: 100px;">部署名</th>
+            <th style="width: 150px;">操作</th>
+        </tr>
+        </thead>
+        <tbody>
+        <tr th:each="departmentForm : ${departmentFormList}">
+            <td th:text="${departmentForm.idDepartment}"></td>
+            <td th:text="${departmentForm.nmDepartment}"></td>
+            <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>
 
-	        <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: 60px;">社員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="showUpdateEmployee" method="post" style="display: inline;">
-			                    <input name="idEmployee" th:value="${departmentForm.idDepartment}" type="hidden">
-			                    <input type="submit" value="更新">
-			                </form>
-			                <!-- 削除フォーム -->
-			                <form action="deleteEmployee" method="post" onsubmit="return confirm('本当に削除しますか？');"
-			                      style="display: inline;">
-			                    <input name="idEmployee" 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">
+<script type="text/javascript">
 
-	    function clearInput() {
-	        document.getElementById('nmDepartment').value = '';
-	        document.getElementById('idDepartment').value = '';
-	    }
+    function clearInput() {
+        document.getElementById('idDepartment').value = '';
+        document.getElementById('nmDepartment').value = '';
+    }
 
 
-	</script>
-	</html>
+</script>
+</html>

src/main/resources/templates/updateDepartmentInput.html

@@ -0,0 +1,88 @@
+<!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="/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', 'selectAllDepartment');
+
+        // 動的送信用のHidden
+        // 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
+        const inputField = document.createElement("input");
+        inputField.setAttribute("type", "hidden");
+        inputField.setAttribute("value", "selectAllDepartment");
+
+        form.appendChild(inputField);
+
+        // フォームをDOMに追加
+        document.body.appendChild(form);
+
+        form.submit();
+    }
+
+</script>
+</html>

src/main/webapp/selectDepartment.html

@@ -1,115 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-
-    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
-    <!-- 外部のスクリプトファイルを読み込む -->
-    <script th:src="@{/js/common.js}"></script>
-    <!-- CSSの読み込み -->
-    <link rel="stylesheet" th:href="@{/css/all.css}">
-    <link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
-    <title>検索</title>
-
-</head>
-<body>
-<h1>
-    検索条件入力　　　
-    <div class="rightSection">
-        <span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
-        <button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
-    </div>
-</h1>
-<form action="selectDepartment"
-      method="post"                
-      th:object="${searchConditionDepartment}">
-
-    <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 employeeInfoFormList.size() > 0}">
-    <!-- 検索結果が1件以上ある場合 -->
-    <table class="table-grid table-striped table-hover">
-        <thead>
-        <tr>
-            <th style="width: 60px;">社員ID</th>
-            <th style="width: 150px;">所属部署</th>
-            <th style="width: 150px;">操作</th>
-        </tr>
-        </thead>
-        <tbody>
-        <tr th:each="departmentForm : ${departmentFormList}">
-            <td th:text="${departmentForm.idEmployee}"></td>
-            <td th:text="${departmentForm.nmDepartment}"></td>
-            <td>
-                <!-- 更新フォーム -->
-                <form action="showUpdateEmployee" method="post" style="display: inline;">
-                    <input name="idEmployee" th:value="${employeeInfoForm.idEmployee}" type="hidden">
-                    <input type="submit" value="更新">
-                </form>
-                <!-- 削除フォーム -->
-                <form action="deleteEmployee" method="post" onsubmit="return confirm('本当に削除しますか？');"
-                      style="display: inline;">
-                    <input name="idEmployee" th:value="${employeeInfoForm.idEmployee}" type="hidden">
-                    <input type="submit" value="削除">
-                </form>
-            </td>
-        </tr>
-        </tbody>
-    </table>
-</th:block>
-<th:block th:if="${employeeInfoFormList == null or employeeInfoFormList.size() == 0}">
-    <!-- 検索結果が0件の場合 -->
-    検索結果はありません。
-</th:block>
-
-</body>
-<script type="text/javascript">
-
-    function clearInput() {
-        document.getElementById('idEmployee').value = '';
-        document.getElementById('idDepartment').selectedIndex = 0;
-    }
-
-
-</script>
-</html>