段階3です

.classpath

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="optional" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+			<attribute name="optional" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

.gitignore

@@ -0,0 +1 @@
+/target/

.project

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>em-spring</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+	</natures>
+</projectDescription>

.settings/.jsdtscope

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/webapp"/>
+	<classpathentry excluding="**/node_modules/*|**/*.min.js|**/bower_components/*" kind="src" path="target/m2e-wtp/web-resources"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+		<attributes>
+			<attribute name="hide" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+	<classpathentry kind="output" path=""/>
+</classpath>

.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
+encoding//src/test/java=UTF-8
+encoding//src/test/resources=UTF-8
+encoding/<project>=UTF-8

.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,11 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.methodParameters=generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=17

.settings/org.eclipse.wst.common.component

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="EM-Spring-0.0.1-SNAPSHOT">
+        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
+        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
+        <property name="context-root" value="EM-Spring"/>
+        <property name="java-output-path" value="/em-spring/target/classes"/>
+    </wb-module>
+</project-modules>

.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <fixed facet="wst.jsdt.web"/>
+  <installed facet="java" version="17"/>
+  <installed facet="jst.web" version="4.0"/>
+  <installed facet="wst.jsdt.web" version="1.0"/>
+</faceted-project>

.settings/org.eclipse.wst.jsdt.ui.superType.container

@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary

.settings/org.eclipse.wst.jsdt.ui.superType.name

@@ -0,0 +1 @@
+Window

.settings/org.eclipse.wst.validation.prefs

@@ -0,0 +1,2 @@
+disabled=06target
+eclipse.preferences.version=1

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

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

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 department);
+}

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

@@ -0,0 +1,32 @@
+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;
+
+/**
+ * Department レコード削除関連の機能を持つサービス
+ */
+@Service
+@Transactional
+public class DeleteDepartmentImpl implements DeleteDepartment {
+
+	DepartmentRepository departmentRepository;
+
+	@Autowired
+	public DeleteDepartmentImpl(DepartmentRepository departmentRepository) {
+		this.departmentRepository = departmentRepository;
+	}
+
+	/**
+	 * idDepartment を元に department データを削除
+	 *
+	 * @param idDepartment 削除対象のidDepartmnet
+	 */
+	public void deleteDepartment(Integer idDepartment) {
+		departmentRepository.deleteById(idDepartment);
+	}
+}

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

@@ -0,0 +1,34 @@
+package com.example.rhizome.app.domain.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.example.rhizome.app.domain.model.Department;
+import com.example.rhizome.app.domain.service.RegisterDepartment;
+import com.example.rhizome.app.infra.entity.DepartmentEntity;
+import com.example.rhizome.app.infra.repository.DepartmentRepository;
+
+/**
+ * Department テーブルの登録系の機能を集約させるサービスクラスです。
+ */
+@Service
+@Transactional
+public class RegisterDepartmentImpl implements RegisterDepartment {
+
+	DepartmentRepository departmentRepository;
+
+	@Autowired
+	public RegisterDepartmentImpl(DepartmentRepository departmentRepository) {
+		this.departmentRepository = departmentRepository;
+	}
+
+	/**
+	 * employee インスタンスの内容を登録する
+	 *
+	 * @param employee 登録対象のデータ
+	 */
+	public void registerDepartment(Department department) {
+		departmentRepository.save(DepartmentEntity.convertFrom(department));
+	}
+}

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

@@ -1,6 +1,5 @@
 package com.example.rhizome.app.domain.service.impl;
 
-
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,82 +16,69 @@ import com.example.rhizome.app.infra.entity.DepartmentEntity;
 import com.example.rhizome.app.infra.repository.DepartmentRepository;
 
 /**
- * 部署情報検索系の機能を集約させるサービスクラスです。
+ * Department テーブル検索系の機能を集約させるサービスクラスです。
  */
 @Service
 @Transactional
 public class SearchDepartmentImpl implements SearchDepartment {
+	DepartmentRepository departmentRepository;
 
-    DepartmentRepository departmentRepository;
+	/**
-
+	 * コンストラクタ
-    /**
+	 *
-     * コンストラクタ
+	 * @param departmentRepository DI対象
-     *
+	 */
-     * @param departmentRepository DI対象
+	@Autowired
-     */
+	public SearchDepartmentImpl(DepartmentRepository departmentRepository) {
-    @Autowired
+		this.departmentRepository = departmentRepository;
-    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()))
-                        )
-                );
-
-    }
-
-    /**
-     * 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()))
-                        )
-                );
-
-    }
-
-	@Override
-	public List<Department> searchDepartmentBynmDepartment(String nmDepartment) {
-		// TODO 自動生成されたメソッド・スタブ
-		return null;
 	}
 
-	@Override
+	/**
-	public List<Department> searchDepartmentByIdDepartment(Integer idDepartment) {
+	 * 部署情報を全件取得する
-		// TODO 自動生成されたメソッド・スタブ
+	 *
-		return null;
+	 * @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()))));
+
+	}
+
+	/**
+	 * 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()))));
+
 	}
 
 	@Override
@@ -106,4 +92,5 @@ public class SearchDepartmentImpl implements SearchDepartment {
 		// TODO 自動生成されたメソッド・スタブ
 		return null;
 	}
+
 }

src/main/java/com/example/rhizome/app/domain/service/impl/UpdateDepartmentImpl.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.model.Department;
+import com.example.rhizome.app.infra.entity.DepartmentEntity;
+import com.example.rhizome.app.infra.repository.DepartmentRepository;
+
+@Service
+@Transactional
+public class UpdateDepartmentImpl {
+	DepartmentRepository departmentRepository;
+
+	@Autowired
+	public UpdateDepartmentImpl(DepartmentRepository departmentRepository) {
+		this.departmentRepository = departmentRepository;
+	}
+
+	public void updateDepartment(Department department) {
+		// ★考える：Model を Entity に変換（DepartmentEntity.convertFrom）して、Repository の save に渡す
+		departmentRepository.save(DepartmentEntity.convertFrom(department));
+	}
+
+}

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

@@ -0,0 +1,120 @@
+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.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+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(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,
+			HttpSession httpSession, SearchEmployee searchEmployee) {
+		this.httpSession = httpSession;
+		this.deleteDepartment = deleteDepartment;
+		this.searchDepartment = searchDepartment;
+		this.searchEmployee = searchEmployee;
+	}
+
+	/**
+	 * 削除処理のコントローラ
+	 *
+	 * @param idDepartment 削除対象のdepartmentId
+	 * @param model      ビューにデータを渡すためのコンテナ
+	 * @return 遷移先の画面
+	 */
+
+	@RequestMapping(value = TransitionTargetPageNameKeyword.DELETE_DEPARTMENT, method = RequestMethod.POST)
+	public String deleteDepartment(@RequestParam(value = "idDepartment", required = false) Integer idDepartment,
+			Model model) {
+
+		final String UNKNOWN_ID = "削除対象のIDが不明です。";
+
+		try {
+			// 部署一覧を取得し、画面に返す用のクラスに詰め替える
+			// 作成した部署一覧をセット
+			model.addAttribute(
+					PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+					DepartmentForm.convertFrom(searchDepartment.selectAll()));
+
+			if (idDepartment == null
+					|| searchDepartment.searchBy(new SearchConditionDepartment(idDepartment, null)) == null) {
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(UNKNOWN_ID));
+			}
+
+			// 削除処理実施
+			deleteExec(model, idDepartment);
+
+			// 検索画面に遷移
+			return "forward:" + TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_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 削除対象のDepartmentId
+	 */
+	private void deleteExec(Model model, Integer idDepartment) {
+
+		final String DELETE_DPARTMENT_TARGET_ID_CAN_NOT_DELETE = "1名以上が所属している部署は削除出来ません。";
+		final String DELETE_COMPLETE = "削除しました。";
+
+		// 削除対象部署が1名以上所属しているかチェック
+		if (!searchEmployee.searchEmployeeByIdDepartment(idDepartment).isEmpty()) {
+			// 削除対象だった場合
+			// エラーメッセージをセット
+			model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
+					new MessageForm(DELETE_DPARTMENT_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/InsertDepartmentController.java

@@ -0,0 +1,125 @@
+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.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.domain.service.impl.SearchDepartmentImpl;
+import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
+import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
+import com.example.rhizome.app.presentation.form.DepartmentForm;
+import com.example.rhizome.app.presentation.form.InsertDepartmentForm;
+import com.example.rhizome.app.presentation.form.MessageForm;
+
+@Controller
+public class InsertDepartmentController {
+
+	// ログ出力用インスタンス
+	private final static Logger LOGGER = Logger.getLogger(InsertEmployeeController.class.getName());
+
+	// エラーメッセージ用の定数フィールド
+	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
+
+	HttpSession httpSession;
+	RegisterDepartment registerDepartment;
+	SearchDepartment searchDepartment;
+
+	@Autowired
+	public InsertDepartmentController(HttpSession httpSession, RegisterDepartmentImpl registerDepartment,
+			SearchDepartmentImpl searchDepartment) {
+		this.httpSession = httpSession;
+		this.registerDepartment = registerDepartment;
+		this.searchDepartment = searchDepartment;
+	}
+
+	@ModelAttribute
+	public InsertDepartmentForm insertDepartmentForm() {
+		return new InsertDepartmentForm();
+	}
+
+	@RequestMapping(value = INSERT_DEPARTMENT_INPUT, method = RequestMethod.POST)
+	public String insertDepartment(InsertDepartmentForm insertDepartmentForm, Model model) {
+		try {
+			model.addAttribute(
+					PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+					DepartmentForm.convertFrom(
+							searchDepartment.selectAll()));
+			List<String> error2 = validateParameter2(
+					insertDepartmentForm.getIdDepartment(),
+					insertDepartmentForm.getNmDepartment());
+
+			// エラーが1件以上有る場合
+			if (!error2.isEmpty()) {
+				// エラー内容を画面に表示
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
+						new MessageForm(String.join(", ", error2) + "が不正です。"));
+				// 登録画面に遷移
+				return TransitionTargetPageNameKeyword.INSERT_DEPARTMENT_INPUT_HTML;
+			}
+
+			// 登録処理
+			registerDepartment.registerDepartment(InsertDepartmentForm.convertToo(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> validateParameter2(
+
+			Integer departmentId,
+			String departmentNm) {
+
+		final String DEPARTMENT_ID_NULL_BLANK = "所属部署";
+		final String DEPARTMENT_NAME_NULL_BLANK = "部署名";
+
+		List<String> error2 = new ArrayList<>();
+
+		// null or 空文字判定
+		if (departmentId == null) {
+			// エラー内容を追加
+			error2.add(DEPARTMENT_ID_NULL_BLANK);
+		}
+
+		// null or 空文字判定
+		if (isNullOrBlank(departmentNm)) {
+			// エラー内容を追加
+			error2.add(DEPARTMENT_NAME_NULL_BLANK);
+		}
+		
+		return error2;
+	}
+
+	private static boolean isNullOrBlank(String str) {
+		if (null == str) {
+			return true;
+		}
+
+		return str.isBlank();
+	}
+}

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

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

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

@@ -1,21 +1,5 @@
 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;
@@ -27,6 +11,20 @@ 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;
 
 /**
  * 新規登録用のコントローラ
@@ -195,3 +193,6 @@ public class InsertEmployeeController {
     }
 
 }
+
+
+

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

@@ -0,0 +1,123 @@
+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.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;
+
+	@Autowired
+	public SelectDepartmentController(HttpSession httpSession, SearchDepartment searchDepartment) {
+		this.httpSession = httpSession;
+		this.searchDepartment = searchDepartment;
+	}
+
+	@ModelAttribute
+	public SearchConditionDepartmentForm searchConditionDepartmentForm() {
+		return new SearchConditionDepartmentForm();
+	}
+
+	/**
+	 * 部署検索画面表示処理コントローラ
+	 *
+	 * @param searchConditionEmployeeForm 検索画面のフォーム
+	 * @param model                       ビューにデータを渡すためのコンテナ
+	 * @return 遷移先の画面
+	 */
+	@PermissionCheck
+	@SessionCheck
+	@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.searchBy(SearchConditionDepartmentForm.convertTo(searchConditionDepartmentForm))));
+			//部分一致検索
+			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;
+		}
+
+	}
+
+	/**
+	 * 部署検索画面表示処理コントローラ
+	 * 検索条件無しの状態を作るため、空の検索条件で検索した結果を画面に返す
+	 *
+	 * @param model ビューにデータを渡すためのコンテナ
+	 * @return 遷移先の画面
+	 */
+	@PermissionCheck
+	@SessionCheck
+	@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_FORM_EMPTY, method = RequestMethod.POST)
+	public String select(Model model) {
+
+		// 部署一覧を取得し、画面に返す用のクラスに詰め替える
+		// 作成した部署一覧をセット
+		model.addAttribute(
+				PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+				DepartmentForm.convertFrom(searchDepartment.selectAll()));
+
+		// 検索条件を元に検索を実施
+		//		model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+		//				DepartmentForm.convertFrom(
+		//						searchDepartment.searchBy(
+		//								SearchConditionDepartmentForm.convertTo(searchConditionDepartmentForm()))));
+
+		//部分一致検索
+		model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+				DepartmentForm.convertFrom(
+						searchDepartment.searchByWithLike(
+								SearchConditionDepartmentForm.convertTo(searchConditionDepartmentForm()))));
+		// 検索ページに遷移
+		return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
+	}
+
+}

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

@@ -0,0 +1,85 @@
+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.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+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.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.MessageForm;
+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;
+	RegisterDepartment registerDepartment;
+	SearchDepartment searchDepartment;
+
+	@Autowired
+	public UpdateDepartmentController(HttpSession httpSession, RegisterDepartmentImpl registerDepartment,
+			SearchDepartmentImpl searchDepartment) {
+		this.httpSession = httpSession;
+		this.registerDepartment = registerDepartment;
+		this.searchDepartment = searchDepartment;
+	}
+
+	@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 {
+			// ★① searchDepartment.searchBy(new SearchConditionDepartment(idDepartment, null)) で対象を検索
+			// ★② 結果が空なら MESSAGE_ERROR を載せて "forward:" + SELECT_DEPARTMENT_FORM_EMPTY
+			// ★③ あれば UpdateDepartmentForm.convertFrom(結果の先頭) を
+			//     UPDATE_DEPARTMENT_FORM という名前で model に載せ、UPDATE_DEPARTMENT_INPUT_HTML を返す
+			List<Department> DepartmentList = searchDepartment.searchBy(
+					new SearchConditionDepartment(idDepartment, null));
+
+			// DBに更新対象のデータがあるか
+			if (DepartmentList.isEmpty()) {
+				// ない場合はエラーメッセージをセットして検索画面に戻る
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
+						new MessageForm(UPDATE_TARGET_ID_NOT_FOUND));
+				return "forward:" + TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_FORM_EMPTY;
+			}
+			// 更新画面に遷移
+			model.addAttribute(PageReturnAttributeKeyword.UPDATE_DEPARTMENT_FORM,
+					UpdateDepartmentForm.convertFrom(DepartmentList.get(0)));
+
+			// Update画面に遷移
+			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,97 @@
+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.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.DepartmentForm;
+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(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;
+	}
+
+	@RequestMapping(value = TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_RESULT, method = RequestMethod.POST)
+	public String departmentUpdateResult(@ModelAttribute UpdateDepartmentForm updateDepartmentForm, Model model) {
+
+		final String NOTHING = "項目が空欄です。";
+		final String DUPLICATION = "既に同名の部署が存在するか、値が変更されていません。";
+		final String NO_TARGET = "更新対象のデータが見つかりません。";
+		final String UPDATE_COMPLETE = "更新が完了しました。";
+
+		try {
+			
+			// 部署一覧取得
+            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(searchDepartment.selectAll()));
+			
+            
+           updateDepartmentForm.hasRequiredValue();
+           
+			if(updateDepartmentForm.hasRequiredValue() == false) {
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(NOTHING));
+				model.addAttribute(PageReturnAttributeKeyword.UPDATE_DEPARTMENT_FORM, updateDepartmentForm);
+				return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
+			}
+			
+			if(searchDepartment.searchBy(null) != null){
+				// 存在する場合はエラーメッセージを設定して更新入力画面に遷移
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(DUPLICATION));
+				model.addAttribute(PageReturnAttributeKeyword.UPDATE_DEPARTMENT_FORM, updateDepartmentForm);
+				return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
+			}
+			
+			
+			if(searchDepartment.searchBy(null) != null) {
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(NO_TARGET));
+				model.addAttribute(PageReturnAttributeKeyword.UPDATE_DEPARTMENT_FORM, updateDepartmentForm);
+				return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
+			}
+
+			 // 更新結果のメッセージを画面にセットし一覧画面に遷移
+            model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(UPDATE_COMPLETE));
+
+            // forward 先で不用意な動作をしないために UpdateEmployeeInfoForm をクリア
+            return "forward:" + TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_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

@@ -9,12 +9,11 @@ public class PageReturnAttributeKeyword {
     public static final String MESSAGE_INFO = "messageInfo";
 
     public static final String DEPARTMENT_FORM_LIST = "departmentFormList";
+    public static final String UPDATE_DEPARTMENT_FORM = "updateDepartmentForm";
     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_INFO_FORM_LIST = "departmentInfoFormList";
-
 }

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

@@ -7,97 +7,103 @@ import java.util.Set;
  */
 public class TransitionTargetPageNameKeyword {
 
-    // 共通
+	// 共通
-    public static final String LOGIN_HTML = "login";
+	public static final String LOGIN_HTML = "login";
 
-    // 一般向け
+	// 一般向け
-    public static final String UPDATE_PERSONAL_EMPLOYEE_INPUT_HTML = "updatePersonalEmployeeInput";
+	public static final String UPDATE_PERSONAL_EMPLOYEE_INPUT_HTML = "updatePersonalEmployeeInput";
-    public static final String UPDATE_PERSONAL_RESULT_HTML = "updatePersonalEmployeeResult";
+	public static final String UPDATE_PERSONAL_RESULT_HTML = "updatePersonalEmployeeResult";
 
-    // 管理者向け
+	// 管理者向け
-    public static final String MENU_HTML = "menu";
+	public static final String MENU_HTML = "menu";
-    public static final String SELECT_EMPLOYEE_HTML = "selectEmployee";
+	public static final String SELECT_EMPLOYEE_HTML = "selectEmployee";
-    public static final String INSERT_EMPLOYEE_INPUT_HTML = "insertEmployeeInput";
+	public static final String INSERT_EMPLOYEE_INPUT_HTML = "insertEmployeeInput";
-    public static final String INSERT_EMPLOYEE_CONFIRM_HTML = "insertEmployeeConfirm";
+	public static final String INSERT_EMPLOYEE_CONFIRM_HTML = "insertEmployeeConfirm";
-    public static final String INSERT_EMPLOYEE_RESULT_HTML = "insertEmployeeResult";
+	public static final String INSERT_EMPLOYEE_RESULT_HTML = "insertEmployeeResult";
-    public static final String UPDATE_EMPLOYEE_INPUT_HTML = "updateEmployeeInput";
+	public static final String UPDATE_EMPLOYEE_INPUT_HTML = "updateEmployeeInput";
 
-    public static final String ERROR_HTML = "error";
+	public static final String ERROR_HTML = "error";
 
-    // 共通(Controller)
+	// 共通(Controller)
-    public static final String INDEX_BLANK = "";
+	public static final String INDEX_BLANK = "";
-    public static final String INDEX_SLASH = "/";
+	public static final String INDEX_SLASH = "/";
-    public static final String INDEX_LOGIN = "/login";
+	public static final String INDEX_LOGIN = "/login";
-    public static final String LOGOUT = "/logout";
+	public static final String LOGOUT = "/logout";
-    public static final String DO_LOGIN = "/doLogin";
+	public static final String DO_LOGIN = "/doLogin";
 
-    // 一般向け(Controller)
+	// 一般向け(Controller)
-    public static final String PERSONAL_UPDATE_RESULT = "/updatePersonalEmployeeResult";
+	public static final String PERSONAL_UPDATE_RESULT = "/updatePersonalEmployeeResult";
 
-    // 管理者向け(Controller)
+	// 管理者向け(Controller)
-    public static final String DELETE_EMPLOYEE = "/deleteEmployee";
+	public static final String DELETE_EMPLOYEE = "/deleteEmployee";
-    public static final String INSERT_EMPLOYEE_INPUT = "/insertEmployeeInput";
+	public static final String INSERT_EMPLOYEE_INPUT = "/insertEmployeeInput";
-    public static final String INSERT_EMPLOYEE_CONFIRM = "/insertEmployeeConfirm";
+	public static final String INSERT_EMPLOYEE_CONFIRM = "/insertEmployeeConfirm";
-    public static final String INSERT_EMPLOYEE = "/insertEmployee";
+	public static final String INSERT_EMPLOYEE = "/insertEmployee";
-    public static final String SHOW_MENU = "/showMenu";
+	public static final String SHOW_MENU = "/showMenu";
-    public static final String SELECT_EMPLOYEE_INFO = "/selectEmployeeInfo";
+	public static final String SELECT_EMPLOYEE_INFO = "/selectEmployeeInfo";
-    public static final String SELECT_EMPLOYEE_INFO_FORM_EMPTY = "/selectAll";
+	public static final String SELECT_EMPLOYEE_INFO_FORM_EMPTY = "/selectAll";
-    public static final String SHOW_UPDATE_EMPLOYEE = "/showUpdateEmployee";
+	public static final String SHOW_UPDATE_EMPLOYEE = "/showUpdateEmployee";
-    public static final String UPDATE_EMPLOYEE_RESULT = "/updateEmployeeResult";
+	public static final String UPDATE_EMPLOYEE_RESULT = "/updateEmployeeResult";
 
-	public static final String SELECT_DEPARTMENT_INFO = "/selectEmployeeInfo";
+	// Department
-	public static final String SELECT_DEPARTMENT_INFO_FORM_EMPTY = "/selectAll";
+	// HTML
+	public static final String SELECT_DEPARTMENT_HTML = "selectDepartment";
+	public static final String UPDATE_DEPARTMENT_INPUT_HTML = "updateDepartmentInput";
+	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";
 
+	// Controller
+	public static final String SELECT_DEPARTMENT = "/selectDepartment";
+	public static final String SELECT_DEPARTMENT_FORM_EMPTY = "/selectAll2";
+	public static final String SHOW_UPDATE_DEPARTMENT = "/showUpdateDepartment";
+	public static final String UPDATE_DEPARTMENT_RESULT = "/updateDepartmentResult";
+	public static final String INSERT_DEPARTMENT_INPUT = "/insertDepartmentInput";
 	public static final String DELETE_DEPARTMENT = "/deleteDepartment";
 
+	/**
+	 * 管理者向けのページリストを返す
+	 *
+	 * @return 管理者向けのページリスト
+	 */
+	public static Set<String> getAdminPageList() {
 
-    // Department
+		return Set.of(
-    // HTML
+				INDEX_BLANK,
-	public static final String SELECT_DEPARTMENT_HTML = "selectDepartment";
+				INDEX_SLASH,
+				INDEX_LOGIN,
+				LOGOUT,
+				DO_LOGIN,
+				DELETE_EMPLOYEE,
+				INSERT_EMPLOYEE_INPUT,
+				INSERT_EMPLOYEE_CONFIRM,
+				INSERT_EMPLOYEE,
+				SHOW_MENU,
+				SELECT_EMPLOYEE_INFO,
+				SELECT_EMPLOYEE_INFO_FORM_EMPTY,
+				SHOW_UPDATE_EMPLOYEE,
+				UPDATE_EMPLOYEE_RESULT,
+				SELECT_DEPARTMENT,
+				SELECT_DEPARTMENT_FORM_EMPTY,
+				INSERT_DEPARTMENT_INPUT,
+				SHOW_UPDATE_DEPARTMENT,
+				SHOW_UPDATE_DEPARTMENT);
 
-    // Controller
+	}
-	public static final String SELECT_DEPARTMENT = "/selectDepartment";
-	public static final String SELECT_DEPARTMENT_FORM_EMPTY = "/selectDepartmentAll";
 
-    /**
+	/**
-     * 管理者向けのページリストを返す
+	 * 一般向けのページリストを返す
-     *
+	 *
-     * @return 管理者向けのページリスト
+	 * @return 一般向けのページリスト
-     */
+	 */
-    public static Set<String> getAdminPageList() {
+	public static Set<String> getUserPageList() {
-
+		return Set.of(
-        return Set.of(
+				INDEX_BLANK,
-                INDEX_BLANK,
+				INDEX_SLASH,
-                INDEX_SLASH,
+				INDEX_LOGIN,
-                INDEX_LOGIN,
+				LOGOUT,
-                LOGOUT,
+				DO_LOGIN,
-                DO_LOGIN,
+				PERSONAL_UPDATE_RESULT);
-                DELETE_EMPLOYEE,
+	}
-                INSERT_EMPLOYEE_INPUT,
-                INSERT_EMPLOYEE_CONFIRM,
-                INSERT_EMPLOYEE,
-                SHOW_MENU,
-                SELECT_EMPLOYEE_INFO,
-                SELECT_EMPLOYEE_INFO_FORM_EMPTY,
-                SHOW_UPDATE_EMPLOYEE,
-                UPDATE_EMPLOYEE_RESULT
-        );
-    }
-
-    /**
-     * 一般向けのページリストを返す
-     *
-     * @return 一般向けのページリスト
-     */
-    public static Set<String> getUserPageList() {
-        return Set.of(
-                INDEX_BLANK,
-                INDEX_SLASH,
-                INDEX_LOGIN,
-                LOGOUT,
-                DO_LOGIN,
-                PERSONAL_UPDATE_RESULT
-        );
-    }
 
 }

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

@@ -0,0 +1,24 @@
+package com.example.rhizome.app.presentation.form;
+
+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 nmEmployee;
+
+	private Integer idDepartment;
+
+	private String nmDepartment;
+
+	public static Department convertToo(InsertDepartmentForm insertDepartmentForm) {
+		return new Department(
+				insertDepartmentForm.getIdDepartment(),
+				insertDepartmentForm.getNmDepartment());
+	}
+}

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

@@ -0,0 +1,43 @@
+package com.example.rhizome.app.presentation.form;
+
+import com.example.rhizome.app.domain.model.SearchConditionDepartment;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class SearchConditionDepartmentForm {
+	/**
+	 * 部署ID
+	 */
+	private Integer idDepartment;
+
+	/**
+	 * 部署名
+	 */
+	private String nmDepartment;
+
+	public static SearchConditionDepartmentForm convertFrom(SearchConditionDepartment searchConditionDepartment) {
+	        return new SearchConditionDepartmentForm(
+	                searchConditionDepartment.getIdDepartment(),
+	                searchConditionDepartment.getNmDepartment()
+	        );
+	    }
+
+	/**
+	     * 画面用（presentation 層）の SearchConditionEmployeeForm クラスから business 層の SearchConditionEmployee クラスに
+	     * 変換します。
+	     *
+	     * @param searchConditionEmployeeForm 画面用（presentation 層）の SearchConditionEmployeeForm インスタンス
+	     * @return business 層の SearchConditionEmployee インスタンス
+	     */
+	    public static SearchConditionDepartment convertTo(SearchConditionDepartmentForm searchConditionDepartmentForm) {
+	        return new SearchConditionDepartment(
+	        		 searchConditionDepartmentForm.getIdDepartment(),
+		             searchConditionDepartmentForm.getNmDepartment()
+	        );
+	    }
+}

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

@@ -0,0 +1,32 @@
+package com.example.rhizome.app.presentation.form;
+
+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;
+
+	/** Model(Department) → Form */
+	public static UpdateDepartmentForm convertFrom(Department department) {
+		return new UpdateDepartmentForm(department.getIdDepartment(), department.getNmDepartment());
+	}
+
+	/** Form → Model(Department) */
+	public static Department convertTo(UpdateDepartmentForm form) {
+		return new Department(form.getIdDepartment(), form.getNmDepartment());
+	}
+
+	/** 必須チェック。true：OK／false：部署ID か部署名が空 */
+	public boolean hasRequiredValue() {
+		// ★考える：idDepartment が null でなく、nmDepartment が null でも空白だけでもない
+		if(idDepartment != null && nmDepartment.isBlank() && nmDepartment.isEmpty());
+		return false;
+	}
+}

src/main/resources/templates/insertDepartmentConfirm.html

@@ -0,0 +1,18 @@
+<!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>
+
+</body>
+
+</html>

src/main/resources/templates/insertDepartmentInput.html

@@ -0,0 +1,56 @@
+<!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="insertDepatmentConfirm" 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,18 @@
+<!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>
+
+</body>
+
+</html>

src/main/resources/templates/menu.html

@@ -3,127 +3,126 @@
 
 <head>
 
-    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
+	<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
-    <!-- 外部のスクリプトファイルを読み込む -->
+	<!-- 外部のスクリプトファイルを読み込む -->
-    <script th:src="@{/js/common.js}"></script>
+	<script th:src="@{/js/common.js}"></script>
-    <!-- CSSの読み込み -->
+	<!-- CSSの読み込み -->
-    <link rel="stylesheet" th:href="@{/css/all.css}">
+	<link rel="stylesheet" th:href="@{/css/all.css}">
-    <link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
+	<link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
-    <title>メニュー</title>
+	<title>メニュー</title>
 
 </head>
 
 <body>
-<h1>
+	<h1>
-    メインメニュー　　　
+		メインメニュー　　　
-    <div class="rightSection">
+		<div class="rightSection">
-        <span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
+			<span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
-        <button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
+			<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
-    </div>
+		</div>
-</h1>
+	</h1>
-<table class="menuClass">
+	<table class="menuClass">
-    <tr>
+		<tr>
-        <td><a class="menuClass" href="javascript:selectEmployeeSubmit()"><i class="fas fa-search"></i> 社員検索 </a>
+			<td><a class="menuClass" href="javascript:selectEmployeeSubmit()"><i class="fas fa-search"></i> 社員検索 </a>
-        </td>
+			</td>
-        <td class="description">登録済みのユーザ一覧表示と</br>更新、削除を行います。</td>
+			<td class="description">登録済みのユーザ一覧表示と</br>更新、削除を行います。</td>
-    </tr>
+		</tr>
 
-    <tr>
+		<tr>
-        <td><a class="menuClass" href="javascript:insertEmployeeSubmit()"><i class="fas fa-plus"></i> 社員登録 </a></td>
+			<td><a class="menuClass" href="javascript:insertEmployeeSubmit()"><i class="fas fa-plus"></i> 社員登録 </a></td>
-        <td class="description">新規でユーザ追加を行います。</td>
+			<td class="description">新規でユーザ追加を行います。</td>
-    </tr>
+		</tr>
 
-	<!-- 追記 -->
+		<tr>
-	<tr>
+			<td><a class="menuClass" href="javascript:selectDepartmentSubmit()"><i class="fas fa-search"></i> 部署検索 </a>
-		<td><a class="menuClass" href="javascript:selectDepartmentSubmit()"><i class="fas fa-search"></i> 部署検索 </a>
+			</td>
-		</td>
+			<td class="description">登録済みの部署一覧表示と</br>更新、削除を行います。</td>
-		<td class="description">登録済みの部署一覧表示と</br>更新、削除を行います。</td>
+		</tr>
-	</tr>
-	<tr>
-		<td><a class="menuClass" href="javascript:selectDepartmentSubmit()"><i class="fas fa-search"></i> 部署登録 </a>
-		</td>
-		<td class="description">新規で部署追加を行います。</td>
-	</tr>
 
-</table>
+		<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">
-    function selectEmployeeSubmit() {
+	function selectEmployeeSubmit() {
-        const form = document.createElement('form');
+		const form = document.createElement('form');
-        form.setAttribute('method', 'post');
+		form.setAttribute('method', 'post');
-        form.setAttribute('action', 'selectEmployeeInfo');
+		form.setAttribute('action', 'selectEmployeeInfo');
 
-        // 動的送信用のHidden
+		// 動的送信用のHidden
-        // 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
+		// 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
-        const inputField = document.createElement("input");
+		const inputField = document.createElement("input");
-        inputField.setAttribute("type", "hidden");
+		inputField.setAttribute("type", "hidden");
-        inputField.setAttribute("value", "selectEmployeeInfo");
+		inputField.setAttribute("value", "selectEmployeeInfo");
 
-        form.appendChild(inputField);
+		form.appendChild(inputField);
 
-        // フォームをDOMに追加
+		// フォームをDOMに追加
-        document.body.appendChild(form);
+		document.body.appendChild(form);
 
-        form.submit();
+		form.submit();
-    }
+	}
 
-    function selectDepartmentSubmit() {
+	function selectDepartmentSubmit() {
-        const form = document.createElement('form');
+		const form = document.createElement('form');
-        form.setAttribute('method', 'post');
+		form.setAttribute('method', 'post');
-        form.setAttribute('action', 'selectDepartment');
+		form.setAttribute('action', 'selectDepartment');
 
-        // 動的送信用のHidden
+		// 動的送信用のHidden
-        // 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
+		// 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
-        const inputField = document.createElement("input");
+		const inputField = document.createElement("input");
-        inputField.setAttribute("type", "hidden");
+		inputField.setAttribute("type", "hidden");
-        inputField.setAttribute("value", "selectDepartment");
+		inputField.setAttribute("value", "selectDepartment");
 
-        form.appendChild(inputField);
+		form.appendChild(inputField);
 
-        // フォームをDOMに追加
+		// フォームをDOMに追加
-        document.body.appendChild(form);
+		document.body.appendChild(form);
 
-        form.submit();
+		form.submit();
-    }
+	}
 
-    function insertEmployeeSubmit() {
+	function insertEmployeeSubmit() {
-        const form = document.createElement('form');
+		const form = document.createElement('form');
-        form.setAttribute('method', 'post');
+		form.setAttribute('method', 'post');
-        form.setAttribute('action', 'insertEmployeeInput');
+		form.setAttribute('action', 'insertEmployeeInput');
 
-        // 動的送信用のHidden
+		// 動的送信用のHidden
-        // 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
+		// 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
-        const inputField = document.createElement("input");
+		const inputField = document.createElement("input");
-        inputField.setAttribute("type", "hidden");
+		inputField.setAttribute("type", "hidden");
-        inputField.setAttribute("value", "insertEmployeeInput");
+		inputField.setAttribute("value", "insertEmployeeInput");
 
-        form.appendChild(inputField);
+		form.appendChild(inputField);
 
-        // フォームをDOMに追加
+		// フォームをDOMに追加
-        document.body.appendChild(form);
+		document.body.appendChild(form);
 
-        form.submit();
+		form.submit();
-    }
+	}
 
-    function insertDepartmentSubmit() {
+	function insertDepartmentSubmit() {
-        const form = document.createElement('form');
+		const form = document.createElement('form');
-        form.setAttribute('method', 'post');
+		form.setAttribute('method', 'post');
-        form.setAttribute('action', 'insertDepartmentInput');
+		form.setAttribute('action', 'insertDepartmentInput');
 
-        // 動的送信用のHidden
+		// 動的送信用のHidden
-        // 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
+		// 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
-        const inputField = document.createElement("input");
+		const inputField = document.createElement("input");
-        inputField.setAttribute("type", "hidden");
+		inputField.setAttribute("type", "hidden");
-        inputField.setAttribute("value", "insertDepartmentInput");
+		inputField.setAttribute("value", "insertDepartmentInput");
 
-        form.appendChild(inputField);
+		form.appendChild(inputField);
 
-        // フォームをDOMに追加
+		// フォームをDOMに追加
-        document.body.appendChild(form);
+		document.body.appendChild(form);
 
-        form.submit();
+		form.submit();
-    }
+	}
 </script>
 
 </html>

src/main/resources/templates/selectDepartment.html

@@ -3,7 +3,9 @@
 
 <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>
@@ -11,14 +13,14 @@
 
 <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>
@@ -31,48 +33,77 @@
 			</tr>
 			<tr>
 				<th class="header">部署名</th>
-				<!-- ★部署名の入力欄（type="text"）を作る -->
 				<td>
 					<input placeholder="部署名" th:field="*{nmDepartment}" type="text" />
 				</td>
 			</tr>
 			<tr>
-				<td class="btnArea" colspan="2"><input type="submit" value="検索" /></td>
+				<td class="btnArea" colspan="2">
-				<td class="btnArea" colspan="2"><button onclick="clearInput()">クリア</button></td>
+					<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>
 
-	<!-- ★検索結果が1件以上：表(部署ID・部署名)を th:each で繰り返す。変数は departmentFormList -->
+	<div class="header-spacing"></div>
-	<!-- departmentFormListから要素を順番に取り出す -->
+	<th:block th:if="${departmentFormList != null and departmentFormList.size() > 0}">
-	<div th:if="${departmentFormList !=null and departmentFormList.size()> 0}">
+		<!-- 検索結果が1件以上ある場合 -->
-
+		<table class="table-grid table-striped table-hover">
-		<table>
+			<thead>
-			<tr>
+				<tr>
-<!--				<th>部署ID</th>-->
+					<th style="width: 150px;">部署ID</th>
-				<th>部署名</th>
+					<th style="width: 280px;">部署名</th>
-			</tr>
+					<th style="width: 500px;">操作</th>
-
+				</tr>
-			<!-- 検索結果を1件ずつ取り出して表示 -->
+			</thead>
-			<tr th:each="departmentForm : ${departmentFormList}">
+			<tbody>
-<!--				<td th:text="${departmentForm.idDepartment}"></td>-->
+				<tr th:each="departmentForm : ${departmentFormList}">
-				<td th:text="${departmentForm.nmDepartment}"></td>
+					<td th:text="${departmentForm.idDepartment}"></td>
-			</tr>
+					<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>
-	</div>
+	<th:block th:if="${departmentFormList == null or departmentFormList.size() == 0}">
+		<!-- 検索結果が0件の場合 -->
+		検索結果はありません。
+	</th:block>
 
 </body>
 <script type="text/javascript">
 
-	<!--  ★部署名の入力欄も空にする（id は th:field が自動で作る） -->
 	function clearInput() {
-		document.getElementById('idDepartment').value = '';
+		document.getElementById('idDepartment').selectedIndex = 0;
 		document.getElementById('nmDepartment').value = '';
 	}
+
+
 </script>
 
 </html>

src/main/resources/templates/updateDepartmentInput.html

@@ -1,12 +1,59 @@
-// 実装手順書より
-
 <!DOCTYPE html>
-<html>
+<html xmlns:th="http://www.thymeleaf.org">
-<head>
-<meta charset="UTF-8">
-<title>Insert title here</title>
-</head>
-<body>
 
+<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:text="${messageError.message}"></span>
+		</div>
+		<table>
+			<tr>
+				<th class="header">部署ID</th>
+				<td>
+					<input class="readOnly" readonly="readonly" th:field="*{idDepartment}" type="text" />
+				</td>
+			</tr>
+			<tr>
+				<th class="header">部署名</th>
+				<td>
+					<input maxlength="50" placeholder="部署名" required="required" th:field="*{nmDepartment}"
+						type="text" />
+				</td>
+			</tr>
+			<tr>
+				<td class="btnArea" colspan="2"><input type="submit" value="更新" /></td>
+			</tr>
+		</table>
+	</form>
+	<a href="javascript:selectDepartmentSubmit()">一覧に戻る</a>
+	<script type="text/javascript">
+		function selectDepartmentSubmit() {
+			const form = document.createElement('form');
+			form.setAttribute('method', 'post');
+			form.setAttribute('action', 'selectDepartment');
+			document.body.appendChild(form);
+			form.submit();
+		}
+	</script>
 </body>
+
 </html>