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,6 @@
+package com.example.rhizome.app.domain.service;
+
+public interface DeleteDepartment {
+	void deleteDepartment(Integer idDepartment);
+
+}

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

@@ -2,6 +2,7 @@ package com.example.rhizome.app.domain.service;
 
 import com.example.rhizome.app.domain.model.Department;
 
+
 public interface RegisterDepartment {
     void registerDepartment(Department department);
 }

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

@@ -0,0 +1,26 @@
+package com.example.rhizome.app.domain.service;
+
+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 RegisterDepartmentImpl implements RegisterDepartment {
+	
+	DepartmentRepository departmentRepository;
+	
+	@Autowired
+	public RegisterDepartmentImpl(DepartmentRepository departmentRepository) {
+		this.departmentRepository = departmentRepository;
+	}
+	
+	public void registerDepartment(Department department) {
+		departmentRepository.save(DepartmentEntity.convertFrom(department));
+	}
+
+}

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

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

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

@@ -0,0 +1,12 @@
+package com.example.rhizome.app.domain.service;
+
+import java.util.List;
+
+import com.example.rhizome.app.domain.model.Department;
+import com.example.rhizome.app.domain.model.SearchConditionDepartment;
+
+public interface SearchDepartmentInfo {
+	List<Department> selectAll();
+	
+	List<Department> searchBy(SearchConditionDepartment searchConditionDepartment);
+}

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

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

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

@@ -0,0 +1,26 @@
+package com.example.rhizome.app.domain.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.example.rhizome.app.domain.service.DeleteDepartment;
+import com.example.rhizome.app.infra.repository.DepartmentRepository;
+
+@Service
+@Transactional
+public class DeleteDepartmentImpl implements DeleteDepartment {
+
+	DepartmentRepository departmentRepository;
+	@Autowired
+	public DeleteDepartmentImpl(DepartmentRepository departmentRepository) {
+		this.departmentRepository = departmentRepository;
+	}
+	
+	
+	public void deleteDepartment(Integer idDepartment) {
+		departmentRepository.deleteById(idDepartment);
+
+	}
+
+}

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

@@ -1,20 +1,17 @@
 package com.example.rhizome.app.domain.service.impl;
 
 
-import java.util.List;
+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 com.example.rhizome.app.domain.model.Department;
+import java.util.List;
-import com.example.rhizome.app.domain.model.Employee;
-import com.example.rhizome.app.domain.model.LoginUser;
-import com.example.rhizome.app.domain.model.SearchConditionDepartment;
-import com.example.rhizome.app.domain.service.SearchDepartment;
-import com.example.rhizome.app.infra.entity.DepartmentEntity;
-import com.example.rhizome.app.infra.repository.DepartmentRepository;
 
 /**
  * 部署情報検索系の機能を集約させるサービスクラスです。
@@ -82,28 +79,4 @@ public class SearchDepartmentImpl implements SearchDepartment {
                 );
 
     }
-
-	@Override
-	public List<Department> searchDepartmentBynmDepartment(String nmDepartment) {
-		// TODO 自動生成されたメソッド・スタブ
-		return null;
-	}
-
-	@Override
-	public List<Department> searchDepartmentByIdDepartment(Integer idDepartment) {
-		// TODO 自動生成されたメソッド・スタブ
-		return null;
-	}
-
-	@Override
-	public LoginUser searchLoginUser(String mailAddress) {
-		// TODO 自動生成されたメソッド・スタブ
-		return null;
-	}
-
-	@Override
-	public Employee searchEmployeeByIdEmployee(Integer idEmployee) {
-		// TODO 自動生成されたメソッド・スタブ
-		return null;
-	}
 }

src/main/java/com/example/rhizome/app/domain/service/impl/UpdateDepartmentImpl.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.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 updateDepertment) {
+		departmentRepository.save(DepartmentEntity.convertFrom(mergeDepartment(beforeDepartment,updateDepertment)));
+
+	}
+	
+	private Department mergeDepartment(Department beforeDepartment, Department updateDepartment) {
+		return new Department(updateDepartment.getIdDepartment(),updateDepartment.getNmDepartment());
+	}
+
+}

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

@@ -0,0 +1,127 @@
+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.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import com.example.rhizome.aop.aspect.PermissionCheck;
+import com.example.rhizome.aop.aspect.SessionCheck;
+import com.example.rhizome.app.domain.model.EmployeeInfo;
+import com.example.rhizome.app.domain.model.LoginUser;
+import com.example.rhizome.app.domain.model.SearchConditionEmployee;
+import com.example.rhizome.app.domain.service.DeleteDepartment;
+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.SessionKeyword;
+import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
+import com.example.rhizome.app.presentation.form.DepartmentForm;
+import com.example.rhizome.app.presentation.form.LoginUserForm;
+import com.example.rhizome.app.presentation.form.MessageForm;
+import com.example.rhizome.app.presentation.form.SearchConditionDepartmentForm;
+
+@Controller
+public class DeleteDepartmentController {
+
+	private final static Logger LOGGER = Logger.getLogger(DeleteDepartmentController.class.getName());
+	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
+
+	private final HttpSession httpSession;
+	private final DeleteDepartment deleteDepartment;
+	private final SearchDepartment searchDepartment;
+	private final SearchEmployeeInfo searchEmployeeInfo;
+
+	@Autowired
+	public DeleteDepartmentController(DeleteDepartment deleteDepartment, SearchDepartment searchDepartment,
+			SearchEmployeeInfo searchEmployeeInfo, HttpSession httpSession) {
+		this.httpSession = httpSession;
+		this.deleteDepartment = deleteDepartment;
+		this.searchDepartment = searchDepartment;
+		this.searchEmployeeInfo = searchEmployeeInfo;
+	}
+
+	@PermissionCheck
+	@SessionCheck
+	@RequestMapping(value = "/deleteDepartment", method = RequestMethod.POST)
+	public String deleteDepartment(@RequestParam(value = "idDepartment", required = false) Integer idDepartment,
+			Model model) {
+
+		try {
+			// 削除対象の部署IDが存在しない場合
+			if (idDepartment == null) {
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm("削除対象のIDが不明です。"));
+				model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+						DepartmentForm.convertFrom(searchDepartment.selectAll()));
+				return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
+			}
+
+			// ログインユーザー情報を取得
+			LoginUser loginUser = LoginUserForm
+					.convertTo((LoginUserForm) httpSession.getAttribute(SessionKeyword.LOGIN_USER));
+
+			// 削除バリデーションと削除の実行
+			deleteExec(model, idDepartment, loginUser);
+
+			// 最新の部署一覧を再取得してセット
+			model.addAttribute(
+					PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+					DepartmentForm.convertFrom(searchDepartment.selectAll()));
+			
+			model.addAttribute("searchConditionDepartmentForm", new 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;
+		}
+	}
+
+	private boolean deleteExec(Model model, Integer idDepartment, LoginUser loginUser) {
+		final String DELETE_TARGET_ID_CAN_NOT_DELETE = "ログイン者自身は削除出来ません。";
+		final String BELONG_EMPLOYEE_EXIST_ERROR = "1名以上が所属している部署は削除出来ません。";
+		final String DELETE_COMPLETE = "削除しました。";
+
+		// ログイン者自身の部署削除ブロック
+		if (loginUser != null && Objects.equals(loginUser.getIdDepartment(), idDepartment)) {
+			model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
+					new MessageForm(DELETE_TARGET_ID_CAN_NOT_DELETE));
+			return false;
+		}
+
+		SearchConditionEmployee searchCondition = new SearchConditionEmployee(
+				null,
+				null,
+				null,
+				null,
+				idDepartment);
+
+		// 社員検索サービスを呼び出す
+		List<EmployeeInfo> employeeList = searchEmployeeInfo.searchBy(searchCondition);
+
+		// 1件以上レコードが返ってきた（所属社員がいた）場合は削除を中断
+		if (employeeList != null && !employeeList.isEmpty()) {
+			model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(BELONG_EMPLOYEE_EXIST_ERROR));
+			return false;
+		}
+
+		// すべてのバリデーションチェックを通過したら削除を実施
+		deleteDepartment.deleteDepartment(idDepartment);
+
+		// 削除完了メッセージをセット（画面側のアラートボックスと連動）
+		model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(DELETE_COMPLETE));
+		return true;
+	}
+}

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

@@ -1,21 +1,6 @@
 package com.example.rhizome.app.presentation.controller;
 
 
-import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.*;
-
-import java.util.Objects;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.servlet.http.HttpSession;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
 import com.example.rhizome.aop.aspect.PermissionCheck;
 import com.example.rhizome.aop.aspect.SessionCheck;
 import com.example.rhizome.app.domain.model.LoginUser;
@@ -27,9 +12,22 @@ import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTa
 import com.example.rhizome.app.presentation.form.DepartmentForm;
 import com.example.rhizome.app.presentation.form.LoginUserForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import javax.servlet.http.HttpSession;
+import java.util.Objects;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.DELETE_EMPLOYEE;
 
 /**
- * 削除処理のコントローラ
+ * 削除処理のコントロータ
  */
 @Controller
 public class DeleteEmployeeController {

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

@@ -0,0 +1,95 @@
+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 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.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.InsertDepartmentForm;
+import com.example.rhizome.app.presentation.form.MessageForm;
+
+@Controller
+public class InsertDepartmentController {
+
+	private final static Logger LOGGER = Logger.getLogger(InsertDepartmentController.class.getName());
+	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
+
+	private final HttpSession httpSession;
+	private final RegisterDepartment registerDepartment;
+	private final SearchDepartment searchDepartment;
+
+	@Autowired
+	public InsertDepartmentController(HttpSession httpSession, RegisterDepartment registerDepartment,
+			SearchDepartment searchDepartment) {
+		this.httpSession = httpSession;
+		this.registerDepartment = registerDepartment;
+		this.searchDepartment = searchDepartment;
+	}
+
+	@ModelAttribute
+	public InsertDepartmentForm insertDepartmentForm() {
+		return new InsertDepartmentForm();
+	}
+
+	@PermissionCheck
+	@SessionCheck
+	@RequestMapping(value = "/insertDepartmentInput", method = RequestMethod.POST)
+	public String showInsertInput(@ModelAttribute("insertDepartmentForm") InsertDepartmentForm insertDepartmentForm) {
+		return TransitionTargetPageNameKeyword.INSERT_DEPARTMENT_INPUT_HTML;
+	}
+
+	@PermissionCheck
+	@SessionCheck
+	@RequestMapping(value = "/insertDepartmentConfirm", method = RequestMethod.POST)
+	public String confirmDepartment(@ModelAttribute("insertDepartmentForm") InsertDepartmentForm insertDepartmentForm,
+			Model model) {
+
+		List<String> error = insertDepartmentForm.validateParameter();
+
+		if (!error.isEmpty()) {
+			model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
+					new MessageForm(String.join(", ", error) + "が不正です。"));
+			return TransitionTargetPageNameKeyword.INSERT_DEPARTMENT_INPUT_HTML;
+		}
+
+		return TransitionTargetPageNameKeyword.INSERT_DEPARTMENT_CONFIRM_HTML;
+	}
+
+	@PermissionCheck
+	@SessionCheck
+	@RequestMapping(value = "/insertDepartment", method = RequestMethod.POST)
+	public String insertDepartment(@ModelAttribute("insertDepartmentForm") InsertDepartmentForm insertDepartmentForm,
+			Model model) {
+		try {
+			model.addAttribute(
+					PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+					DepartmentForm.convertFrom(searchDepartment.selectAll()));
+
+			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;
+		}
+	}
+}

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

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

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

@@ -0,0 +1,81 @@
+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 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.DepartmentForm;
+import com.example.rhizome.app.presentation.form.SearchConditionDepartmentForm;
+
+@Controller
+public class SelectDepatmentController {
+	
+	// ログ出力用インスタンス
+    private final static Logger LOGGER = Logger.getLogger(SelectDepatmentController.class.getName());
+    // エラーメッセージ用の定数フィールド
+    private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
+
+    HttpSession httpSession;
+    SearchDepartment searchDepartment;
+    
+    @Autowired
+    public SelectDepatmentController(HttpSession httpSession, SearchDepartment searchDepartment) {
+    	this.httpSession = httpSession;
+    	this.searchDepartment = searchDepartment;
+    }
+    
+    @ModelAttribute
+    public SearchConditionDepartmentForm searchConditionDepartmentForm() {
+    	return new SearchConditionDepartmentForm();
+    }
+    
+    @PermissionCheck
+    @SessionCheck
+    @RequestMapping(value = "/selectDepartment", method = RequestMethod.POST)
+    public String select(@ModelAttribute("searchConditionDepartmentForm") SearchConditionDepartmentForm searchConditionDepartmentForm, Model model) {
+    	
+    	try {
+           
+            SearchConditionDepartment searchCondition = SearchConditionDepartmentForm.convertTo(searchConditionDepartmentForm);
+
+            
+            List<Department> departmentList = searchDepartment.searchBy(searchCondition);
+
+            
+            model.addAttribute(
+                    PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+                    DepartmentForm.convertFrom(departmentList)
+            );
+
+            
+            return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_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/UpdateDepartmentController.java

@@ -0,0 +1,82 @@
+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.UpdateDepartmentInfoForm;
+
+@Controller
+public class UpdateDepartmentController {
+
+	// ログ出力用インスタンス
+	private final static Logger LOGGER = Logger.getLogger(UpdateDepartmentController.class.getName());
+	// エラーメッセージ用の定数フィールド
+	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
+
+	private final HttpSession httpSession;
+	private final SearchDepartment searchDepartment;
+
+	@Autowired
+	public UpdateDepartmentController(HttpSession httpSession, SearchDepartment searchDepartment) {
+		this.httpSession = httpSession;
+		this.searchDepartment = searchDepartment;
+
+	}
+
+	@ModelAttribute
+	public SearchConditionDepartmentForm searchConditionDepartmentForm() {
+		return new SearchConditionDepartmentForm();
+	}
+
+	@PermissionCheck
+	@SessionCheck
+	@RequestMapping(value = "/showUpdateDepartment", method = RequestMethod.POST)
+	public String showUpdateDepartment(@RequestParam("idDepartment") Integer idDepartment, Model model) {
+		final String UPDATE_TARGET_ID_NOT_FOUND = "更新対象のデータが見つかりません。";
+
+		try {
+
+			List<Department> departmentInfoList = searchDepartment.searchBy(
+					new SearchConditionDepartment(idDepartment, null));
+
+			if (departmentInfoList == null || departmentInfoList.isEmpty()) {
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
+						new MessageForm(UPDATE_TARGET_ID_NOT_FOUND));
+
+				return "forward:" + TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO_FORM_EMPTY;
+			}
+
+			model.addAttribute(PageReturnAttributeKeyword.UPDATE_DEPARTMENT_FORM,
+					UpdateDepartmentInfoForm.convertForm(departmentInfoList.get(0)));
+
+			return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
+
+		} catch (Exception e) {
+			httpSession.invalidate();
+			e.printStackTrace();
+			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
+			return TransitionTargetPageNameKeyword.ERROR_HTML;
+		}
+	}
+
+}

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

@@ -0,0 +1,116 @@
+package com.example.rhizome.app.presentation.controller;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.servlet.http.HttpSession;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import com.example.rhizome.aop.aspect.PermissionCheck;
+import com.example.rhizome.aop.aspect.SessionCheck;
+import com.example.rhizome.app.domain.model.Department;
+import com.example.rhizome.app.domain.model.SearchConditionDepartment;
+import com.example.rhizome.app.domain.service.SearchDepartment;
+import com.example.rhizome.app.domain.service.UpdateDepartment;
+import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
+import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
+import com.example.rhizome.app.presentation.form.MessageForm;
+import com.example.rhizome.app.presentation.form.SearchConditionDepartmentForm;
+import com.example.rhizome.app.presentation.form.UpdateDepartmentInfoForm;
+
+@Controller
+public class UpdateDepartmentResultController {
+
+	// ログ出力用インスタンス
+	private final static Logger LOGGER = Logger.getLogger(UpdateDepartmentController.class.getName());
+	// エラーメッセージ用の定数フィールド
+	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
+
+	private final HttpSession httpSession;
+	private final SearchDepartment searchDepartment;
+	private final UpdateDepartment updateDepartment;
+
+	@Autowired
+	public UpdateDepartmentResultController(HttpSession httpSession, SearchDepartment searchDepartment,
+			UpdateDepartment updateDepartment) {
+		this.httpSession = httpSession;
+		this.searchDepartment = searchDepartment;
+		this.updateDepartment = updateDepartment;
+	}
+
+	@ModelAttribute
+	public SearchConditionDepartmentForm searchConditionDepartmentForm() {
+		return new SearchConditionDepartmentForm();
+	}
+
+	@PermissionCheck
+	@SessionCheck
+	@RequestMapping(value = "/updateDepartmentResult", method = RequestMethod.POST)
+	public String departmentUpdateResult(
+			@ModelAttribute("updateDepartmentInfoForm") UpdateDepartmentInfoForm updateDepartmentInfoForm,
+			Model model) {
+
+		final String NOTHING = "項目が空欄です。";
+		final String DUPLICATION = "既に同名の部署が存在するか、値が変更されていません。";
+		final String NO_TARGET = "更新対象のデータが見つかりません。";
+		final String UPDATE_COMPLETE = "更新が完了しました。";
+
+		try {
+
+			// 必須入力チェック
+			if (UpdateDepartmentInfoForm.hasErrorParameter(updateDepartmentInfoForm)) {
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(NOTHING));
+				return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
+			}
+
+			List<Department> beforeList = searchDepartment.searchBy(
+					new SearchConditionDepartment(updateDepartmentInfoForm.getIdDepartment(), null));
+
+			if (beforeList == null || beforeList.isEmpty()) {
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(NO_TARGET));
+				return "forward:/selectDepartment";
+			}
+			Department beforeDepartment = beforeList.get(0);
+			Department updateDepartmentData = UpdateDepartmentInfoForm.convertTo(updateDepartmentInfoForm);
+
+			if (Objects.equals(beforeDepartment.getNmDepartment(), updateDepartmentData.getNmDepartment())) {
+
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(DUPLICATION));
+				return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
+			}
+
+			List<Department> duplicationList = searchDepartment.searchBy(
+					new SearchConditionDepartment(null, updateDepartmentData.getNmDepartment()));
+
+			if (duplicationList != null && !duplicationList.isEmpty()) {
+
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(DUPLICATION));
+				model.addAttribute(PageReturnAttributeKeyword.UPDATE_DEPARTMENT_INFO_FORM, updateDepartmentInfoForm);
+				return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
+
+			}
+
+			// 更新を実行 ➔ forward
+			updateDepartment.updateDepartment(beforeDepartment, updateDepartmentData);
+
+			model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(UPDATE_COMPLETE));
+			return "forward:/selectDepartment";
+
+		} 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,11 +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_INFO_FORM = "updateDepartmentInfoForm";
     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 UPDATE_DEPARTMENT_FORM = "updateDepartmentForm";
-	public static final String DEPARTMENT_INFO_FORM_LIST = "departmentInfoFormList";
 
 }

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

@@ -17,10 +17,15 @@ public class TransitionTargetPageNameKeyword {
     // 管理者向け
     public static final String MENU_HTML = "menu";
     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_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";
 
@@ -45,20 +50,20 @@ public class TransitionTargetPageNameKeyword {
     public static final String SHOW_UPDATE_EMPLOYEE = "/showUpdateEmployee";
     public static final String UPDATE_EMPLOYEE_RESULT = "/updateEmployeeResult";
 
-	public static final String SELECT_DEPARTMENT_INFO = "/selectEmployeeInfo";
-	public static final String SELECT_DEPARTMENT_INFO_FORM_EMPTY = "/selectAll";
-
-	public static final String DELETE_DEPARTMENT = "/deleteDepartment";
-
-
     // Department
+    public static final String DELETE_DEPARTMENT = "/deleteDepartment";
+    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 SELECT_DEPARTMENT_INFO = "/selectDepartment";
+    public static final String SHOW_UPDATE_DEPARTMENT = "/showUpdateDepartment";
+    public static final String UPDATE_DEPARTMENT_RESULT = "/updateDepartmentResult";
+    public static final String SELECT_DEPARTMENT_INFO_FORM_EMPTY = "/selectDepartmentAll";
+   
+    
     // HTML
-	public static final String SELECT_DEPARTMENT_HTML = "selectDepartment";
-	
     // Controller
-	public static final String SELECT_DEPARTMENT = "/selectDepartment";
+
-	public static final String SELECT_DEPARTMENT_FORM_EMPTY = "/selectDepartmentAll";
-	
     /**
      * 管理者向けのページリストを返す
      *
@@ -80,7 +85,16 @@ public class TransitionTargetPageNameKeyword {
                 SELECT_EMPLOYEE_INFO,
                 SELECT_EMPLOYEE_INFO_FORM_EMPTY,
                 SHOW_UPDATE_EMPLOYEE,
-                UPDATE_EMPLOYEE_RESULT
+                UPDATE_EMPLOYEE_RESULT,
+                
+                DELETE_DEPARTMENT,
+                INSERT_DEPARTMENT_INPUT,
+                INSERT_DEPARTMENT,
+                INSERT_DEPARTMENT_CONFIRM,
+                SELECT_DEPARTMENT_INFO,
+                SELECT_DEPARTMENT_INFO_FORM_EMPTY,
+                SHOW_UPDATE_DEPARTMENT,
+                UPDATE_DEPARTMENT_RESULT
         );
     }
 

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

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

@@ -0,0 +1,30 @@
+// 画面から渡ってきた検索条件をまとめ、再度画面に表示する為のクラス
+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 {
+
+	private Integer idDepartment;
+
+	private String nmDepartment;
+
+	public static SearchConditionDepartmentForm convertFrom(SearchConditionDepartment searchConditionDepartment) {
+		return new SearchConditionDepartmentForm(
+				searchConditionDepartment.getIdDepartment(),
+				searchConditionDepartment.getNmDepartment());
+	}
+
+	public static SearchConditionDepartment convertTo(SearchConditionDepartmentForm searchConditionDepartmentForm) {
+		return new SearchConditionDepartment(
+				searchConditionDepartmentForm.getIdDepartment(),
+				searchConditionDepartmentForm.getNmDepartment());
+	}
+}

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

@@ -0,0 +1,48 @@
+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 UpdateDepartmentInfoForm {
+
+	private Integer idDepartment;
+
+	private String nmDepartment;
+
+	public static UpdateDepartmentInfoForm convertForm(Department department) {
+		return new UpdateDepartmentInfoForm(
+				department.getIdDepartment(),
+				department.getNmDepartment());
+
+	}
+
+	public static List<UpdateDepartmentInfoForm> convertForm(List<Department> departmentList) {
+		return departmentList.stream().map(UpdateDepartmentInfoForm::convertForm).toList();
+	}
+
+	public static Department convertTo(UpdateDepartmentInfoForm updateDepartmentInfoForm) {
+		return new Department(
+				updateDepartmentInfoForm.getIdDepartment(),
+				updateDepartmentInfoForm.getNmDepartment());
+	}
+
+	public static boolean hasErrorParameter(UpdateDepartmentInfoForm updateDepartmentInfoForm) {
+
+		return isNullOrBlank(updateDepartmentInfoForm.getNmDepartment());
+	}
+
+	private static boolean isNullOrBlank(String str) {
+		if (null == str) {
+			return true;
+		}
+		return str.isBlank();
+	}
+}

src/main/resources/templates/insertDepartmentConfilm.html

@@ -0,0 +1,73 @@
+<!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="idDepartment" readonly="readonly" type="text" value="自動で設定されます" />
+					</label>
+				</td>
+			</tr>
+			<tr>
+				<th class="header">部署名</th>
+				<td>
+					<label>
+						<input class="readOnly" th:field="*{nmDepartment}" readonly="readonly" 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

@@ -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="/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>
+		<a href="showMenu">メニューに戻る</a>
+	</form>
+</body>
+
+</html>

src/main/resources/templates/menu.html

@@ -26,24 +26,20 @@
         <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>
-    <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>
+		
+		<td><a class="menuClass" href="javascript:insertDepartmentSubmit()"><i class="fas fa-plus"></i> 部署登録 </a></td>
+				<td class="description">新規で部署を追加します。</td>
+        
     </tr>
-	
-	<!-- 追記 -->
-	<tr>
-		<td><a class="menuClass" href="javascript:selectDepartmentSubmit()"><i class="fas fa-search"></i> 部署検索 </a>
-		</td>
-		<td class="description">登録済みの部署一覧表示と</br>更新、削除を行います。</td>
-	</tr>
-	<tr>
-		<td><a class="menuClass" href="javascript:selectDepartmentSubmit()"><i class="fas fa-search"></i> 部署登録 </a>
-		</td>
-		<td class="description">新規で部署追加を行います。</td>
-	</tr>
 
 </table>
 </body>

src/main/resources/templates/selectDepartment.html

@@ -3,22 +3,24 @@
 
 <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">
+	<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="selectDepartment" method="post" th:object="${searchConditionDepartmentForm}">
+
 		<div class="msgBox error" th:if="${messageError} != null">
 			<span class="error" th:text="${messageError.message}"></span>
 		</div>
@@ -26,53 +28,85 @@
 			<tr>
 				<th class="header">部署ID</th>
 				<td>
-					<input placeholder="部署ID" th:field="*{idDepartment}" type="number" />
+
+					<input id="idDepartment" placeholder="部署ID" th:field="*{idDepartment}" type="number" />
 				</td>
 			</tr>
 			<tr>
 				<th class="header">部署名</th>
-				<!-- ★部署名の入力欄（type="text"）を作る -->
 				<td>
-					<input placeholder="部署名" th:field="*{nmDepartment}" type="text" />
+
+					<input id="nmDepartment" 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 type="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>
 
-	<!-- ★検索結果が1件以上：表(部署ID・部署名)を th:each で繰り返す。変数は departmentFormList -->
+	<th:block th:if="${departmentFormList != null and departmentFormList.size() > 0}">
-	<!-- departmentFormListから要素を順番に取り出す -->
+		<!-- 検索結果が1件以上ある場合 -->
-	<div th:if="${departmentFormList !=null and departmentFormList.size()> 0}">
+		<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="/updateDepartmentResult" 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>
 
-		<table>
+					</td>
-			<tr>
+				</tr>
-<!--				<th>部署ID</th>-->
+			</tbody>
-				<th>部署名</th>
-			</tr>
-
-			<!-- 検索結果を1件ずつ取り出して表示 -->
-			<tr th:each="departmentForm : ${departmentFormList}">
-<!--				<td th:text="${departmentForm.idDepartment}"></td>-->
-				<td th:text="${departmentForm.nmDepartment}"></td>
-			</tr>
 		</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('nmDepartment').value = '';
 	}
+
 </script>
 
 </html>

src/main/resources/templates/updateDepartmentInput.html

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

src/main/resources/templates/updatePersonalEmployeeResult.html

@@ -3,40 +3,40 @@
 
 <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>
-<h2>更新が完了しました</h2>
+	<h2>更新が完了しました</h2>
-<br/>
+	<br />
-<a href="javascript:backSubmit()">戻る</a>
+	<a href="javascript:backSubmit()">戻る</a>
 </body>
 
 <script type="text/javascript">
-    function backSubmit() {
+	function backSubmit() {
-        const form = document.createElement('form');
+		const form = document.createElement('form');
-        form.setAttribute('method', 'post');
+		form.setAttribute('method', 'post');
-        form.setAttribute('action', 'updatePersonalEmployeeResult');
+		form.setAttribute('action', 'updatePersonalEmployeeResult');
 
-        // 動的送信用の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", "updatePersonalEmployeeResult");
+		inputField.setAttribute("value", "updatePersonalEmployeeResult");
 
-        form.appendChild(inputField);
+		form.appendChild(inputField);
 
-        // フォームをDOMに追加
+		// フォームをDOMに追加
-        document.body.appendChild(form);
+		document.body.appendChild(form);
 
-        form.submit();
+		form.submit();
-    }
+	}
 </script>
 
 </html>