3段階目終了

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

@@ -2,4 +2,5 @@ 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/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

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

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

@@ -7,28 +7,20 @@ 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 DeleteDeparmentImpl implements DeleteDepartment{
+public class DeleteDepartmentImpl implements DeleteDepartment {
+
 	DepartmentRepository departmentRepository;
-
 	@Autowired
-    public DeleteDeparmentImpl(DepartmentRepository departmentRepository) {
+	public DeleteDepartmentImpl(DepartmentRepository departmentRepository) {
-		 this.departmentRepository = departmentRepository;
+		this.departmentRepository = departmentRepository;
-
 	}
 	
 	
-	/**
-	 * idDepartment を元に department データを削除
-	 *
-	 * @param idDepartmetn 削除対象のidDepartment
-	 */
 	public void deleteDepartment(Integer idDepartment) {
 		departmentRepository.deleteById(idDepartment);
+
 	}
 
 }

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

@@ -20,10 +20,13 @@ public class UpdateDepartmentImpl implements UpdateDepartment {
 		this.departmentRepository = departmentRepository;
 	}
 	
-	public void updateDepartment(Department department) {
+	public void updateDepartment(Department beforeDepartment, Department updateDepertment) {
-		DepartmentEntity entity = new DepartmentEntity();
+		departmentRepository.save(DepartmentEntity.convertFrom(mergeDepartment(beforeDepartment,updateDepertment)));
-		entity.setIdDepartment(department.getIdDepartment());
+
-		entity.setNmDepartment(department.getNmDepartment());
-		departmentRepository.save(entity);
 	}
+	
+	private Department mergeDepartment(Department beforeDepartment, Department updateDepartment) {
+		return new Department(updateDepartment.getIdDepartment(),updateDepartment.getNmDepartment());
+	}
+
 }

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

@@ -1,17 +0,0 @@
-package com.example.rhizome.app.domain.service;
-
-import java.util.List;
-
-import com.example.rhizome.app.domain.model.EmployeeInfo;
-import com.example.rhizome.app.domain.model.SearchConditionDepartment;
-
-public interface searchDepartmentinfo {
-	List<EmployeeInfo> selectAll();
-
-    static List<EmployeeInfo> searchBy(SearchConditionDepartment searchConditionDepartment) {
-		// TODO 自動生成されたメソッド・スタブ
-		return null;
-	}
-}
-
-

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

@@ -1,7 +1,6 @@
 package com.example.rhizome.app.presentation.controller;
 
-import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.*;
+import java.util.List;
-
 import java.util.Objects;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -17,119 +16,112 @@ 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.SearchEmployee;
+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.DepartmentInfoForm;
+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 = "エラーが発生しました！";
-	final String UNKNOWN_ID = "削除対象のIDが不明です。";
-	final String DELETE_TARGET_ID_CAN_NOT_DELETE = "1名以上が所属している部署は削除できません。";
-	final String DELETE_COMPLETE = "削除しました。";
 
-	HttpSession httpSession;
+	private final HttpSession httpSession;
-	DeleteDepartment deleteDepartment;
+	private final DeleteDepartment deleteDepartment;
-	SearchDepartment searchDepartment;
+	private final SearchDepartment searchDepartment;
-	SearchEmployee searchEmployee;
+	private final SearchEmployeeInfo searchEmployeeInfo;
 
 	@Autowired
 	public DeleteDepartmentController(DeleteDepartment deleteDepartment, SearchDepartment searchDepartment,
-			HttpSession httpSession, SearchEmployee searchEmployee) {
+			SearchEmployeeInfo searchEmployeeInfo, HttpSession httpSession) {
 		this.httpSession = httpSession;
 		this.deleteDepartment = deleteDepartment;
 		this.searchDepartment = searchDepartment;
-		this.searchEmployee = searchEmployee;
+		this.searchEmployeeInfo = searchEmployeeInfo;
 	}
 
-	/**
-	 * 削除処理のコントローラ
-	 *
-	 * @param idDepartment 削除対象のdepartmentId
-	 * @param model      ビューにデータを渡すためのコンテナ
-	 * @return 遷移先の画面
-	 */
 	@PermissionCheck
 	@SessionCheck
-	@RequestMapping(value = DELETE_DEPARTMENT, method = RequestMethod.POST)
+	@RequestMapping(value = "/deleteDepartment", method = RequestMethod.POST)
-	public String deleteDepartment(@RequestParam("idDepartment") Integer idDepartment, Model model) {
+	public String deleteDepartment(@RequestParam(value = "idDepartment", required = false) Integer idDepartment,
+			Model model) {
 
 		try {
+			// 削除対象の部署IDが存在しない場合
 			if (idDepartment == null) {
-				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, UNKNOWN_ID);
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm("削除対象のIDが不明です。"));
 				model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-						DepartmentInfoForm.convertFrom(searchDepartment.selectAll()));
+						DepartmentForm.convertFrom(searchDepartment.selectAll()));
 				return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
-			} else {
-
-				// 部署一覧を取得し、画面に返す用のクラスに詰め替える
-				// 作成した部署一覧をセット
-				model.addAttribute(
-						PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-						DepartmentInfoForm.convertFrom(searchDepartment.selectAll()));
-
-				// 削除処理実施
-				deleteExec(
-						model,
-						idDepartment,
-						LoginUserForm.convertTo((LoginUserForm) httpSession.getAttribute(SessionKeyword.LOGIN_USER)));
-
-				// 検索画面に遷移
-				return "forward:" + TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO_FORM_EMPTY;
 			}
-		} catch (Exception e) {
-			// ログイン情報の破棄
-			httpSession.invalidate();
 
+			// ログインユーザー情報を取得
+			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名以上が所属している部署は削除出来ません。";
-	 * @param model      ビューにデータを渡すためのコンテナ
+		final String DELETE_COMPLETE = "削除しました。";
-	 * @param idDepartment 削除対象のdepartmentId
-	 * @param loginUser  ログインユーザー情報
-	 */
 
-	private void deleteExec(Model model, Integer idDepartment, LoginUser loginUser) {
+		// ログイン者自身の部署削除ブロック
-
-		// 1名以上が所属している場合
 		if (loginUser != null && Objects.equals(loginUser.getIdDepartment(), idDepartment)) {
-			// 削除対象だった場合
-			// エラーメッセージをセット
 			model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
 					new MessageForm(DELETE_TARGET_ID_CAN_NOT_DELETE));
-			// 検索画面に遷移
+			return false;
-			return;
 		}
 
-		// 削除を実施
+		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

@@ -9,7 +9,7 @@ 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.SessionKeyword;
 import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.DepartmentInfoForm;
+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;
@@ -66,7 +66,7 @@ public class DeleteEmployeeController {
             // 作成した部署一覧をセット
             model.addAttribute(
                     PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-                    DepartmentInfoForm.convertFrom(searchDepartment.selectAll())
+                    DepartmentForm.convertFrom(searchDepartment.selectAll())
             );
 
             // 削除処理実施

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

@@ -9,7 +9,7 @@ import com.example.rhizome.app.domain.service.impl.SearchDepartmentImpl;
 import com.example.rhizome.app.domain.service.impl.SearchEmployeeImpl;
 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.DepartmentInfoForm;
+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;
@@ -75,7 +75,7 @@ public class InsertEmployeeConfirmController {
             // 作成した部署一覧をセット
             model.addAttribute(
                     PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-                    DepartmentInfoForm.convertFrom(
+                    DepartmentForm.convertFrom(
                             searchDepartment.selectAll()
                     ));
 

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

@@ -1,5 +1,21 @@
 package com.example.rhizome.app.presentation.controller;
 
+import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.*;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.servlet.http.HttpSession;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
 import com.example.rhizome.aop.aspect.PermissionCheck;
 import com.example.rhizome.aop.aspect.SessionCheck;
 import com.example.rhizome.app.domain.service.RegisterEmployee;
@@ -8,23 +24,9 @@ import com.example.rhizome.app.domain.service.impl.RegisterEmployeeImpl;
 import com.example.rhizome.app.domain.service.impl.SearchDepartmentImpl;
 import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
 import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.DepartmentInfoForm;
+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;
 
 /**
  * 新規登録用のコントローラ
@@ -32,167 +34,163 @@ import static com.example.rhizome.app.presentation.controller.pageproperty.Trans
 @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,
-                    DepartmentInfoForm.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/InsertEmployeeInputController.java

@@ -6,7 +6,7 @@ import com.example.rhizome.app.domain.service.RegisterEmployee;
 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.DepartmentInfoForm;
+import com.example.rhizome.app.presentation.form.DepartmentForm;
 import com.example.rhizome.app.presentation.form.InsertEmployeeForm;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -64,7 +64,7 @@ public class InsertEmployeeInputController {
 
         try {
             // 部署コードリストを作成し、画面に返す値としてセット
-            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentInfoForm.convertFrom(searchDepartment.selectAll()));
+            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(searchDepartment.selectAll()));
 
             // パラメータをセット
             model.addAttribute(PageReturnAttributeKeyword.INSERT_EMPLOYEE_FORM, insertEmployeeForm);

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

@@ -1,114 +0,0 @@
-package com.example.rhizome.app.presentation.controller;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.servlet.http.HttpSession;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-import com.example.rhizome.aop.aspect.PermissionCheck;
-import com.example.rhizome.aop.aspect.SessionCheck;
-import com.example.rhizome.app.domain.service.SearchDepartment;
-import com.example.rhizome.app.domain.service.SearchEmployeeInfo;
-import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
-import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.DepartmentInfoForm;
-import com.example.rhizome.app.presentation.form.SearchConditionDepartment;
-
-@Controller
-public class SelectDepartmentController {
-	// ログ出力用インスタンス
-	private final static Logger LOGGER = Logger.getLogger(SelectDepartmentController.class.getName());
-	// エラーメッセージ用の定数フィールド
-	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
-
-	HttpSession httpSession;
-	SearchDepartment searchDepartment;
-	SearchEmployeeInfo searchEmployeeInfo;
-
-	@Autowired
-	public SelectDepartmentController(HttpSession httpSession, SearchDepartment searchDepartment,
-			SearchEmployeeInfo searchEmployeeInfo) {
-		this.httpSession = httpSession;
-		this.searchDepartment = searchDepartment;
-		this.searchEmployeeInfo = searchEmployeeInfo;
-	}
-
-	@ModelAttribute
-	public SearchConditionDepartment searchConditionDepartment() {
-		return new SearchConditionDepartment();
-	}
-
-	/**
-	 * 社員検索画面表示処理コントローラ
-	 *
-	 * @param searchConditionDepartment 検索画面のフォーム
-	 * @param model                       ビューにデータを渡すためのコンテナ
-	 * @return 遷移先の画面
-	 */
-	@PermissionCheck
-	@SessionCheck
-	@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO, method = RequestMethod.POST)
-	public String select(SearchConditionDepartment searchConditionDepartment, Model model) {
-
-		try {
-
-			// 部署一覧を取得し、画面に返す用のクラスに詰め替える
-			// 作成した部署一覧をセット
-			model.addAttribute(
-					PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-					DepartmentInfoForm.convertFrom(searchDepartment.selectAll()));
-
-			// 検索条件を元に検索を実施
-			// 取得した EmployeeInfo（ employee + department ）の情報を画面に返す用の型に詰め替えてセット
-			model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentInfoForm.convertFrom(
-					searchDepartment.searchBy(SearchConditionDepartment.convertTo(searchConditionDepartment))));
-			// 検索ページに遷移
-			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_INFO_FORM_EMPTY, method = RequestMethod.POST)
-	public String select(Model model) {
-
-		// 部署一覧を取得し、画面に返す用のクラスに詰め替える
-		// 作成した部署一覧をセット
-		model.addAttribute(
-				PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-				DepartmentInfoForm.convertFrom(searchDepartment.selectAll()));
-
-		// 検索条件を元に検索を実施
-		model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-				DepartmentInfoForm.convertFrom(
-						searchDepartment.searchBy(SearchConditionDepartment.convertTo(searchConditionDepartment()))));
-
-		// 検索ページに遷移
-		return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
-	}
-}

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/SelectEmployeeController.java

@@ -1,26 +1,24 @@
 package com.example.rhizome.app.presentation.controller;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.servlet.http.HttpSession;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
 import com.example.rhizome.aop.aspect.PermissionCheck;
 import com.example.rhizome.aop.aspect.SessionCheck;
 import com.example.rhizome.app.domain.service.SearchDepartment;
 import com.example.rhizome.app.domain.service.SearchEmployeeInfo;
 import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
 import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.DepartmentInfoForm;
+import com.example.rhizome.app.presentation.form.DepartmentForm;
 import com.example.rhizome.app.presentation.form.EmployeeInfoForm;
 import com.example.rhizome.app.presentation.form.SearchConditionEmployeeForm;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import javax.servlet.http.HttpSession;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * 社員検索画面用コントローラ　リスト全件表示、検索表示、更新、削除が可能
@@ -67,10 +65,11 @@ public class SelectEmployeeController {
             // 作成した部署一覧をセット
             model.addAttribute(
                     PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-                    DepartmentInfoForm.convertFrom(searchDepartment.selectAll())
+                    DepartmentForm.convertFrom(searchDepartment.selectAll())
             );
 
             // 検索条件を元に検索を実施
+            // 取得した EmployeeInfo（ employee + department ）の情報を画面に返す用の型に詰め替えてセット
             model.addAttribute(PageReturnAttributeKeyword.EMPLOYEE_INFO_FORM_LIST, EmployeeInfoForm.convertFrom(searchEmployeeInfo.searchBy(SearchConditionEmployeeForm.convertTo(searchConditionEmployeeForm))));
             // 検索ページに遷移
             return TransitionTargetPageNameKeyword.SELECT_EMPLOYEE_HTML;
@@ -106,7 +105,7 @@ public class SelectEmployeeController {
         // 作成した部署一覧をセット
         model.addAttribute(
                 PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-                DepartmentInfoForm.convertFrom(searchDepartment.selectAll())
+                DepartmentForm.convertFrom(searchDepartment.selectAll())
         );
 
         // 検索条件を元に検索を実施

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

@@ -17,122 +17,66 @@ import org.springframework.web.bind.annotation.RequestParam;
 import com.example.rhizome.aop.aspect.PermissionCheck;
 import com.example.rhizome.aop.aspect.SessionCheck;
 import com.example.rhizome.app.domain.model.Department;
+import com.example.rhizome.app.domain.model.SearchConditionDepartment;
 import com.example.rhizome.app.domain.service.SearchDepartment;
-import com.example.rhizome.app.domain.service.SearchEmployee;
-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.SearchConditionDepartment;
+import com.example.rhizome.app.presentation.form.SearchConditionDepartmentForm;
-import com.example.rhizome.app.presentation.form.UpdateDepartmentForm;
+import com.example.rhizome.app.presentation.form.UpdateDepartmentInfoForm;
 
 @Controller
 public class UpdateDepartmentController {
+
 	// ログ出力用インスタンス
-	private final static Logger LOGGER = Logger.getLogger(DeleteDepartmentController.class.getName());
+	private final static Logger LOGGER = Logger.getLogger(UpdateDepartmentController.class.getName());
+	// エラーメッセージ用の定数フィールド
+	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
 
-	private static final String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
+	private final HttpSession httpSession;
-
+	private final SearchDepartment searchDepartment;
-	HttpSession httpSession;
-	UpdateDepartment updateDepartment;
-	SearchDepartment searchDepartment;
-	SearchEmployee searchEmployee;
 
 	@Autowired
-	public UpdateDepartmentController(UpdateDepartment updateDepartment, SearchDepartment searchDepartment,
+	public UpdateDepartmentController(HttpSession httpSession, SearchDepartment searchDepartment) {
-			HttpSession httpSession, SearchEmployee searchEmployee) {
 		this.httpSession = httpSession;
-		this.updateDepartment = updateDepartment;
 		this.searchDepartment = searchDepartment;
-		this.searchEmployee = searchEmployee;
+
 	}
 
 	@ModelAttribute
-	public SearchConditionDepartment searchConditionDepartment() {
+	public SearchConditionDepartmentForm searchConditionDepartmentForm() {
-		return new SearchConditionDepartment();
+		return new SearchConditionDepartmentForm();
 	}
 
 	@PermissionCheck
 	@SessionCheck
-	@RequestMapping(value = TransitionTargetPageNameKeyword.SHOW_UPDATE_DEPARTMENT, method = RequestMethod.POST)
+	@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> departmentList = searchDepartment
+
-					.searchBy(new com.example.rhizome.app.domain.model.SearchConditionDepartment(idDepartment, null));
+			List<Department> departmentInfoList = searchDepartment.searchBy(
-			if (departmentList.isEmpty()) {
+					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;
-			}
-			// 更新画面に遷移
-			model.addAttribute(PageReturnAttributeKeyword.UPDATE_DEPARTMENT_INFO_FORM,
-					UpdateDepartmentForm.convertFrom(departmentList.get(0)));
 
-			// Update画面に遷移
+				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;
-		}
-
-	}
-
-	@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 {
-
-			boolean bo = updateDepartmentForm.hasRequiredValue();
-			if (bo == false) {
-				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
-						new MessageForm(NOTHING));
-				return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
-			}
-			List<Department> departmentList = searchDepartment
-					.searchBy(new com.example.rhizome.app.domain.model.SearchConditionDepartment(null,
-							updateDepartmentForm.getNmDepartment()));
-			if (departmentList == null && departmentList.isEmpty()){
-				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
-						new MessageForm(DUPLICATION));
-				return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
-			}
-			List<Department> departmentList2 = searchDepartment
-					.searchBy(new com.example.rhizome.app.domain.model.SearchConditionDepartment(
-							updateDepartmentForm.getIdDepartment(), null));
-			if (departmentList2 == null || departmentList2.isEmpty()) {
-				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
-						new MessageForm(NO_TARGET));
-				return PageReturnAttributeKeyword.UPDATE_DEPARTMENT_INFO_FORM;
-			}
-			Department department = new Department(updateDepartmentForm.getIdDepartment(),
-					updateDepartmentForm.getNmDepartment());
-			updateDepartment.updateDepartment(department);
-			model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO,
-					new MessageForm(UPDATE_COMPLETE));
-			return PageReturnAttributeKeyword.UPDATE_DEPARTMENT_INFO_FORM;
-		} 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/UpdateEmployeeController.java

@@ -8,7 +8,7 @@ import com.example.rhizome.app.domain.service.SearchDepartment;
 import com.example.rhizome.app.domain.service.SearchEmployeeInfo;
 import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
 import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.DepartmentInfoForm;
+import com.example.rhizome.app.presentation.form.DepartmentForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
 import com.example.rhizome.app.presentation.form.SearchConditionEmployeeForm;
 import com.example.rhizome.app.presentation.form.UpdateEmployeeInfoForm;
@@ -67,7 +67,7 @@ public class UpdateEmployeeController {
 
         try {
             // 部署一覧を取得し画面に返す値としてセット
-            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentInfoForm.convertFrom(searchDepartment.selectAll()));
+            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(searchDepartment.selectAll()));
 
             // id を条件に更新対象のレコードを検索、取得する
             List<EmployeeInfo> employeeInfoList = searchEmployeeInfo.searchBy(

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

@@ -11,7 +11,7 @@ import com.example.rhizome.app.domain.service.UpdateEmployee;
 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.DepartmentInfoForm;
+import com.example.rhizome.app.presentation.form.DepartmentForm;
 import com.example.rhizome.app.presentation.form.LoginUserForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
 import com.example.rhizome.app.presentation.form.UpdateEmployeeInfoForm;
@@ -91,7 +91,7 @@ public class UpdateEmployeeResultController {
         try {
 
             // 部署一覧取得
-            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentInfoForm.convertFrom(searchDepartment.selectAll()));
+            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(searchDepartment.selectAll()));
 
             // パスワードが仕様を満たしているか確認
             String error = UpdateEmployeeInfoForm.validatePassword(

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

@@ -10,10 +10,11 @@ public class PageReturnAttributeKeyword {
 
     public static final String DEPARTMENT_FORM_LIST = "departmentFormList";
     public static final String UPDATE_EMPLOYEE_INFO_FORM = "updateEmployeeInfoForm";
+    public static final String UPDATE_DEPARTMENT_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_INFO_FORM = "updateDepartmentForm";
+    public static final String UPDATE_DEPARTMENT_FORM = "updateDepartmentForm";
 
 }

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

@@ -7,90 +7,111 @@ 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 SELECT_DEPARTMENT_HTML = "selectDepartment";
-	public static final String INSERT_EMPLOYEE_CONFIRM_HTML = "insertEmployeeConfirm";
+    public static final String INSERT_EMPLOYEE_INPUT_HTML = "insertEmployeeInput";
-	public static final String INSERT_EMPLOYEE_RESULT_HTML = "insertEmployeeResult";
+    public static final String INSERT_DEPARTMENT_INPUT_HTML = "insertDepartmentInput";
-	public static final String UPDATE_EMPLOYEE_INPUT_HTML = "updateEmployeeInput";
+    public static final String INSERT_EMPLOYEE_CONFIRM_HTML = "insertEmployeeConfirm";
-	public static final String SELECT_DEPARTMENT_HTML = "/selectDepartment";
+    public static final String INSERT_DEPARTMENT_CONFIRM_HTML = "insertDepartmentConfirm";
-	public static final String ERROR_HTML = "error";
+    public static final String INSERT_EMPLOYEE_RESULT_HTML = "insertEmployeeResult";
-	public static final String UPDATE_DEPARTMENT_INPUT_HTML = "updateDepartmentInput";
+    public static final String INSERT_DEPARTMENT_RESULT_HTML = "insertDepartmentResult";
-	// 共通(Controller)
+    public static final String UPDATE_EMPLOYEE_INPUT_HTML = "updateEmployeeInput";
-	public static final String INDEX_BLANK = "";
+    public static final String UPDATE_DEPARTMENT_INPUT_HTML = "updateDepartmentInput";
-	public static final String INDEX_SLASH = "/";
-	public static final String INDEX_LOGIN = "/login";
-	public static final String LOGOUT = "/logout";
-	public static final String DO_LOGIN = "/doLogin";
 
-	// 一般向け(Controller)
+    public static final String ERROR_HTML = "error";
-	public static final String PERSONAL_UPDATE_RESULT = "/updatePersonalEmployeeResult";
 
-	// 管理者向け(Controller)
+    // 共通(Controller)
-	public static final String DELETE_EMPLOYEE = "/deleteEmployee";
+    public static final String INDEX_BLANK = "";
-	public static final String INSERT_EMPLOYEE_INPUT = "/insertEmployeeInput";
+    public static final String INDEX_SLASH = "/";
-	public static final String INSERT_EMPLOYEE_CONFIRM = "/insertEmployeeConfirm";
+    public static final String INDEX_LOGIN = "/login";
-	public static final String INSERT_EMPLOYEE = "/insertEmployee";
+    public static final String LOGOUT = "/logout";
-	public static final String SHOW_MENU = "/showMenu";
+    public static final String DO_LOGIN = "/doLogin";
-	public static final String SELECT_EMPLOYEE_INFO = "/selectEmployeeInfo";
-	public static final String SELECT_EMPLOYEE_INFO_FORM_EMPTY = "/selectAll";
-	public static final String SHOW_UPDATE_EMPLOYEE = "/showUpdateEmployee";
-	public static final String UPDATE_EMPLOYEE_RESULT = "/updateEmployeeResult";
-	public static final String SELECT_DEPARTMENT_INFO = "/selectDepartmentInfo";
-	public static final String SELECT_DEPARTMENT_INFO_FORM_EMPTY = "/departmentAll";
-	public static final String DELETE_DEPARTMENT = "/deleteDepartment";
-	public static final String SHOW_UPDATE_DEPARTMENT = "/showUpdateDepartment";
-	public static final String UPDATE_DEPARTMENT_RESULT = "/updateDepartmentResult";
 
-	/**
+    // 一般向け(Controller)
-	 * 管理者向けのページリストを返す
+    public static final String PERSONAL_UPDATE_RESULT = "/updatePersonalEmployeeResult";
-	 *
-	 * @return 管理者向けのページリスト
-	 */
-	public static Set<String> getAdminPageList() {
 
-		return Set.of(
+    // 管理者向け(Controller)
-				INDEX_BLANK,
+    public static final String DELETE_EMPLOYEE = "/deleteEmployee";
-				INDEX_SLASH,
+    public static final String INSERT_EMPLOYEE_INPUT = "/insertEmployeeInput";
-				INDEX_LOGIN,
+    public static final String INSERT_EMPLOYEE_CONFIRM = "/insertEmployeeConfirm";
-				LOGOUT,
+    public static final String INSERT_EMPLOYEE = "/insertEmployee";
-				DO_LOGIN,
+    public static final String SHOW_MENU = "/showMenu";
-				INSERT_EMPLOYEE_INPUT,
+    public static final String SELECT_EMPLOYEE_INFO = "/selectEmployeeInfo";
-				INSERT_EMPLOYEE_CONFIRM,
+    public static final String SELECT_EMPLOYEE_INFO_FORM_EMPTY = "/selectAll";
-				INSERT_EMPLOYEE,
+    public static final String SHOW_UPDATE_EMPLOYEE = "/showUpdateEmployee";
-				SHOW_MENU,
+    public static final String UPDATE_EMPLOYEE_RESULT = "/updateEmployeeResult";
-				SELECT_EMPLOYEE_INFO,
-				SELECT_EMPLOYEE_INFO_FORM_EMPTY,
-				SHOW_UPDATE_EMPLOYEE,
-				UPDATE_EMPLOYEE_RESULT,
-				SELECT_DEPARTMENT_INFO,
-				SELECT_DEPARTMENT_INFO_FORM_EMPTY,
-				DELETE_DEPARTMENT,
-				SHOW_UPDATE_DEPARTMENT,
-				UPDATE_DEPARTMENT_RESULT);
-	}
 
-	/**
+    // Department
-	 * 一般向けのページリストを返す
+    public static final String DELETE_DEPARTMENT = "/deleteDepartment";
-	 *
+    public static final String INSERT_DEPARTMENT_INPUT = "/insertDepartmentInput";
-	 * @return 一般向けのページリスト
+    public static final String INSERT_DEPARTMENT_CONFIRM = "/insertDepartmentConfirm";
-	 */
+    public static final String INSERT_DEPARTMENT = "/insertDepartment";
-	public static Set<String> getUserPageList() {
+    public static final String SELECT_DEPARTMENT_INFO = "/selectDepartment";
-		return Set.of(
+    public static final String SHOW_UPDATE_DEPARTMENT = "/showUpdateDepartment";
-				INDEX_BLANK,
+    public static final String UPDATE_DEPARTMENT_RESULT = "/updateDepartmentResult";
-				INDEX_SLASH,
+    public static final String SELECT_DEPARTMENT_INFO_FORM_EMPTY = "/selectDepartmentAll";
-				INDEX_LOGIN,
+   
-				LOGOUT,
+    
-				DO_LOGIN,
+    // HTML
-				PERSONAL_UPDATE_RESULT);
+    // Controller
-	}
+
+    /**
+     * 管理者向けのページリストを返す
+     *
+     * @return 管理者向けのページリスト
+     */
+    public static Set<String> getAdminPageList() {
+
+        return Set.of(
+                INDEX_BLANK,
+                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,
+                
+                DELETE_DEPARTMENT,
+                INSERT_DEPARTMENT_INPUT,
+                INSERT_DEPARTMENT,
+                INSERT_DEPARTMENT_CONFIRM,
+                SELECT_DEPARTMENT_INFO,
+                SELECT_DEPARTMENT_INFO_FORM_EMPTY,
+                SHOW_UPDATE_DEPARTMENT,
+                UPDATE_DEPARTMENT_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/DepartmentForm.java

@@ -13,7 +13,7 @@ import java.util.List;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class DepartmentInfoForm {
+public class DepartmentForm {
     /**
      * 部署ID
      */
@@ -30,8 +30,8 @@ public class DepartmentInfoForm {
      * @param department business 層の Department インスタンス
      * @return 画面用（presentation 層）の DepartmentForm インスタンス
      */
-    public static DepartmentInfoForm convertFrom(Department department) {
+    public static DepartmentForm convertFrom(Department department) {
-        return new DepartmentInfoForm(department.getIdDepartment(), department.getNmDepartment());
+        return new DepartmentForm(department.getIdDepartment(), department.getNmDepartment());
     }
 
     /**
@@ -41,7 +41,7 @@ public class DepartmentInfoForm {
      * @param departmentList business 層の Department インスタンスのリスト
      * @return 画面用（presentation 層）の DepartmentForm インスタンスのリスト
      */
-    public static List<DepartmentInfoForm> convertFrom(List<Department> departmentList) {
+    public static List<DepartmentForm> convertFrom(List<Department> departmentList) {
-        return departmentList.stream().map(DepartmentInfoForm::convertFrom).toList();
+        return departmentList.stream().map(DepartmentForm::convertFrom).toList();
     }
 }

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/SearchConditionDepartment.java

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

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/UpdateDepartmentForm.java

@@ -1,48 +0,0 @@
-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 {
-
-	//部署ID
-	private Integer idDepartment;
-	//部署名
-	private String nmDepartment;
-
-	/**
-	 * business 層の Department クラスから画面用（presentation 層）の UpdateDepartmentForm に
-	 * 変換します。
-	 *
-	 * @param departmentInfo business 層の DepartmentInfo インスタンス
-	 * @return 画面用（presentation 層）の UpdateDepartmentForm インスタンス
-	 */
-	public static UpdateDepartmentForm convertFrom(Department department) {
-		return new UpdateDepartmentForm(department.getIdDepartment(), department.getNmDepartment());
-	}
-
-	/**
-	 * 画面用（presentation 層）の UpdateDepartmentForm クラスから business 層の Department クラスに
-	 * 変換します。
-	 *
-	 * @param updateDepartmentForm 画面用（presentation 層）の UpdateDepartmentForm インスタンス
-	 * @return business 層の Department インスタンス
-	 */
-	public static Department convertTo(UpdateDepartmentForm form) {
-		return new Department(form.getIdDepartment(), form.getNmDepartment());
-	}
-
-	public boolean hasRequiredValue() {
-		if (idDepartment == null && (nmDepartment == null || nmDepartment.isBlank())) {
-			return false;
-		} else {
-			return true;
-		}
-	}
-}

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

@@ -3,121 +3,123 @@
 
 <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>
-			<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><a class="menuClass" href="javascript:insertEmployeeSubmit()"><i class="fas fa-plus"></i> 社員登録 </a></td>
+				<td class="description">登録済みの部署一覧表示と</br>更新、削除を行います。</td>
-			<td class="description">新規でユーザ追加を行います。</td>
-			<td><a class="menuClass" href="javascript:insertDepartmentSubmit()"><i class="fas fa-plus"></i> 部署登録 </a>
-			</td>
-			<td class="description">新規で部署追加を行います。</td>
 		
 		
-	</table>
+    </tr>
+	<tr>
+		<td><a class="menuClass" href="javascript:insertEmployeeSubmit()"><i class="fas fa-plus"></i> 社員登録 </a></td>
+				        <td class="description">新規でユーザ追加を行います。</td>
+		
+		<td><a class="menuClass" href="javascript:insertDepartmentSubmit()"><i class="fas fa-plus"></i> 部署登録 </a></td>
+				<td class="description">新規で部署を追加します。</td>
+        
+    </tr>
+
+</table>
 </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', 'selectDepartmentInfo');
+        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

@@ -7,9 +7,8 @@
 	<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>
-
 </head>
 
 <body>
@@ -20,24 +19,24 @@
 			<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
 		</div>
 	</h1>
-
+	<form action="selectDepartment" method="post" th:object="${searchConditionDepartmentForm}">
-	<form action="selectDepartmentInfo" method="post" th:object="${searchConditionDepartment}">
 
 		<div class="msgBox error" th:if="${messageError} != null">
 			<span class="error" th:text="${messageError.message}"></span>
 		</div>
-
 		<table>
 			<tr>
 				<th class="header">部署ID</th>
 				<td>
-					<input placeholder="部署ID" th:field="*{idDepartment}" type="number" />
+
+					<input id="idDepartment" placeholder="部署ID" th:field="*{idDepartment}" type="number" />
 				</td>
 			</tr>
 			<tr>
 				<th class="header">部署名</th>
 				<td>
-					<input placeholder="部署名" th:field="*{nmDepartment}" type="text" />
+
+					<input id="nmDepartment" placeholder="部署名" th:field="*{nmDepartment}" type="text" />
 				</td>
 			</tr>
 			<tr>
@@ -45,12 +44,12 @@
 					<input type="submit" value="検索" />
 				</td>
 				<td class="btnArea" colspan="2">
-					<button onclick="clearInput()">クリア</button>
+
+					<button type="button" onclick="clearInput()">クリア</button>
 				</td>
 			</tr>
 		</table>
 	</form>
-
 	<div class="header-spacing"></div>
 	<a href="showMenu">メニューに戻る</a>
 	<div class="header-spacing"></div>
@@ -62,6 +61,7 @@
 		</script>
 	</th:block>
 	<div class="header-spacing"></div>
+
 	<th:block th:if="${departmentFormList != null and departmentFormList.size() > 0}">
 		<!-- 検索結果が1件以上ある場合 -->
 		<table class="table-grid table-striped table-hover">
@@ -69,37 +69,36 @@
 				<tr>
 					<th style="width: 60px;">部署ID</th>
 					<th style="width: 100px;">部署名</th>
-					<th style="width: 60px;">操作</th>
+					<th style="width: 150px;">操作</th>
 				</tr>
-</body>
+			</thead>
-</thead>
+			<tbody>
-<tbody>
+				<tr th:each="departmentForm : ${departmentFormList}">
-	<tr th:each="departmentForm : ${departmentFormList}">
+					<td th:text="${departmentForm.idDepartment}"></td>
-		<td th:text="${departmentForm.idDepartment}"></td>
+					<td th:text="${departmentForm.nmDepartment}"></td>
-		<td th:text="${departmentForm.nmDepartment}"></td>
+					<td>
-		<td>
+						<!-- 更新フォーム -->
-			<!-- 更新フォーム -->
+						<form action="/updateDepartmentResult" method="post" style="display: inline;">
-			<form action="showUpdateDepartment" method="post" style="display: inline;">
+							<input name="idDepartment" th:value="${departmentForm.idDepartment}" type="hidden">
-				<input name="idDepartment" th:value="${departmentForm.idDepartment}" type="hidden">
+							<input type="submit" value="更新">
-				<input type="submit" value="更新">
+						</form>
-			</form>
+						<!-- 削除フォーム -->
-			<!-- 削除フォーム -->
+						<form action="deleteDepartment" method="post" onsubmit="return confirm('本当に削除しますか？');"
-			<form action="deleteDepartment" method="post" onsubmit="return confirm('本当に削除しますか？');"
+							style="display: inline;">
-				style="display: inline;">
+							<input name="idDepartment" th:value="${departmentForm.idDepartment}" type="hidden">
-				<input name="idDepartment" th:value="${departmentForm.idDepartment}" type="hidden">
+							<input type="submit" value="削除">
-				<input type="submit" value="削除">
+						</form>
-			</form>
 
-		</td>
+					</td>
-	</tr>
+				</tr>
-</tbody>
+			</tbody>
-</table>
+		</table>
-</th:block>
+	</th:block>
-<th:block th:if="${departmentFormList == null or departmentFormList.size() == 0}">
-	<!-- 検索結果が0件の場合 -->
-	検索結果はありません。
-</th:block>
 
+	<th:block th:if="${departmentFormList == null or departmentFormList.size() == 0}">
+		<!-- 検索結果が0件の場合 -->
+		検索結果はありません。
+	</th:block>
 </body>
 <script type="text/javascript">
 
@@ -107,6 +106,7 @@
 		document.getElementById('idDepartment').value = '';
 		document.getElementById('nmDepartment').value = '';
 	}
+
 </script>
 
 </html>

src/main/resources/templates/updateDepartmentForm.html

@@ -1,71 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-
-	<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
-	<!-- 外部のスクリプトファイルを読み込む -->
-	<script th:src="@{/js/common.js}"></script>
-	<!-- CSSの読み込み -->
-	<link rel="stylesheet" th:href="@{/css/all.css}">
-	<link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
-	<title>部署情報更新</title>
-</head>
-
-<body>
-	<h1>
-		部署情報更新　　　
-		<div class="rightSection">
-			<span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
-			<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
-		</div>
-	</h1>
-	<form action="/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:selectSubmit()">一覧に戻る</a>
-</body>
-	<script>
-		function selectSubmit() {
-				const form = document.createElement('form');
-				form.setAttribute('method', 'post');
-				form.setAttribute('action', 'departmentAll');
-
-				// 動的送信用のHidden
-				// 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
-				const inputField = document.createElement("input");
-				inputField.setAttribute("type", "hidden");
-				inputField.setAttribute("value", "departmentAll");
-
-				form.appendChild(inputField);
-
-				// フォームをDOMに追加
-				document.body.appendChild(form);
-
-				form.submit();
-		}
-	</script>
-
-</html>

src/main/resources/templates/updateDepartmentInput.html

@@ -2,7 +2,6 @@
 <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>
@@ -21,51 +20,58 @@
 		</div>
 	</h1>
 	<form action="/updateDepartmentResult" method="post" onsubmit="return confirm('本当によろしいですか？');"
-		th:object="${updateDepartmentForm}">
+		th:object="${updateDepartmentInfoForm}">
-
 		<div class="msgBox error" th:if="${messageError != null}">
-			<span class="error" th:text="${messageError.message}"></span>
+			<span class="error" th:each="message : ${messageError.message}" th:text="${message}"></span>
 		</div>
 		<table>
 			<tr>
 				<th class="header">部署ID</th>
 				<td>
-					<input class="readOnly" readonly="readonly" th:field="*{idDepartment}" type="text" />
+					<label>
+						<input class="readOnly" readonly="readonly" th:field="*{idDepartment}" type="text" />
+					</label>
 				</td>
 			</tr>
 			<tr>
 				<th class="header">部署名</th>
 				<td>
-					<input maxlength="50" placeholder="部署名" required="required" th:field="*{nmDepartment}"
+					<label>
-						type="text" />
+						<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>
+				<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', 'departmentAll');
 
-				// 動的送信用のHidden
+<script>
-				// 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
+	function selectSubmit() {
-				const inputField = document.createElement("input");
+		const form = document.createElement('form');
-				inputField.setAttribute("type", "hidden");
+		form.setAttribute('method', 'post');
-				inputField.setAttribute("value", "departmentAll");
+		form.setAttribute('action', 'selectDepartment');
 
-				form.appendChild(inputField);
+		// 動的送信用のHidden
+		// 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
+		const inputField = document.createElement("input");
+		inputField.setAttribute("type", "hidden");
+		inputField.setAttribute("value", "selectAll");
 
-				// フォームをDOMに追加
+		form.appendChild(inputField);
-				document.body.appendChild(form);
 
-				form.submit();
+		// フォームをDOMに追加
-		}
+		document.body.appendChild(form);
-	</script>
+
+		form.submit();
+	}
+
+</script>
 
 </html>

src/main/resources/templates/updateEmployeeInput.html

@@ -3,151 +3,179 @@
 
 <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>
-	<form action="/updateEmployeeResult" method="post" onsubmit="return confirm('本当によろしいですか？');"
+<form action="/updateEmployeeResult"
-		th:object="${updateEmployeeInfoForm}">
+      method="post"
-		<div class="msgBox error" th:if="${messageError != null}">
+      onsubmit="return confirm('本当によろしいですか？');"
-			<span class="error" th:each="message : ${messageError.message}" th:text="${message}"></span>
+      th:object="${updateEmployeeInfoForm}"
-		</div>
+>
-		<table>
+    <div class="msgBox error" th:if="${messageError != null}">
-			<tr>
+        <span class="error" th:each="message : ${messageError.message}" th:text="${message}"></span>
-				<th class="header">社員ID</th>
+    </div>
-				<td>
+    <table>
-					<label>
+        <tr>
-						<input class="readOnly" readonly="readonly" th:field="*{idEmployee}" type="text" />
+            <th class="header">社員ID</th>
-					</label>
+            <td>
-				</td>
+                <label>
-			</tr>
+                    <input class="readOnly"
-			<tr>
+                           readonly="readonly"
-				<th class="header">社員名</th>
+                           th:field="*{idEmployee}"
-				<td>
+                           type="text"
-					<label>
+                    />
-						<input maxlength="50" placeholder="社員名" required="required" th:field="*{nmEmployee}"
+                </label>
-							type="text" />
+            </td>
-					</label>
+        </tr>
-				</td>
+        <tr>
-			</tr>
+            <th class="header">社員名</th>
-			<tr>
+            <td>
-				<th class="header">社員名フリガナ</th>
+                <label>
-				<td>
+                    <input maxlength="50"
-					<label>
+                           placeholder="社員名"
-						<input maxlength="50" oninput="convertToKatakana(this)" placeholder="フリガナ" required="required"
+                           required="required"
-							th:field="*{knEmployee}" type="text" />
+                           th:field="*{nmEmployee}"
-					</label>
+                           type="text"
-				</td>
+                    />
-			</tr>
+                </label>
-			<tr>
+            </td>
-				<th class="header">メールアドレス</th>
+        </tr>
-				<td>
+        <tr>
-					<label>
+            <th class="header">社員名フリガナ</th>
-						<input maxlength="100" placeholder="メールアドレス" required="required" th:field="*{mailAddress}"
+            <td>
-							type="email" />
+                <label>
-					</label>
+                    <input maxlength="50"
-				</td>
+                           oninput="convertToKatakana(this)"
-			</tr>
+                           placeholder="フリガナ"
-			<tr>
+                           required="required"
-				<th class="header">パスワード</th>
+                           th:field="*{knEmployee}"
-				<td>
+                           type="text"
-					<label>
+                    />
-						<input pattern="^(?=.*?[a-zA-Z])(?=.*?\d)[a-zA-Z\d]{3,10}$" placeholder="パスワード"
+                </label>
-							th:field="*{password}" type="password" />
+            </td>
-					</label>
+        </tr>
-				</td>
+        <tr>
-			</tr>
+            <th class="header">メールアドレス</th>
-			<!-- *** Chrome等のブラウザの場合自動でセットされる可能性があるので注意書きを外にも *** -->
+            <td>
-			<tr>
+                <label>
-				<th></th>
+                    <input maxlength="100"
-				<td>
+                           placeholder="メールアドレス"
-					<span style="font-size:8pt;
+                           required="required"
+                           th:field="*{mailAddress}"
+                           type="email"
+                    />
+                </label>
+            </td>
+        </tr>
+        <tr>
+            <th class="header">パスワード</th>
+            <td>
+                <label>
+                    <input pattern="^(?=.*?[a-zA-Z])(?=.*?\d)[a-zA-Z\d]{3,10}$"
+                           placeholder="パスワード"
+                           th:field="*{password}"
+                           type="password"
+                    />
+                </label>
+            </td>
+        </tr>
+        <!-- *** Chrome等のブラウザの場合自動でセットされる可能性があるので注意書きを外にも *** -->
+        <tr>
+            <th></th>
+            <td>
+                <span style="font-size:8pt;
                             font-weight:bold;
                             color:red;">
-						※半角英数字をそれぞれ1種類以上含む3-10文字
+                    ※半角英数字をそれぞれ1種類以上含む3-10文字
-					</span>
+                </span>
-				</td>
+            </td>
-			</tr>
+        </tr>
-			<tr>
+        <tr>
-				<th class="header">パスワード確認用</th>
+            <th class="header">パスワード確認用</th>
-				<td>
+            <td>
-					<label>
+                <label>
-						<input pattern="^(?=.*?[a-zA-Z])(?=.*?\d)[a-zA-Z\d]{3,10}$" placeholder="パスワード確認用"
+                    <input pattern="^(?=.*?[a-zA-Z])(?=.*?\d)[a-zA-Z\d]{3,10}$"
-							th:field="*{passwordConfirm}" type="password" />
+                           placeholder="パスワード確認用"
-					</label>
+                           th:field="*{passwordConfirm}"
-				</td>
+                           type="password"
-			</tr>
+                    />
-			<tr>
+                </label>
-				<th class="header">管理者権限</th>
+            </td>
-				<td>
+        </tr>
-					<label>
+        <tr>
-						<input id="adminAuth1" name="adminAuth" th:checked="${updateEmployeeInfoForm.adminAuth == 1}"
+            <th class="header">管理者権限</th>
-							type="radio" value="1"> 管理者権限
+            <td>
-					</label>
+                <label>
-					<label>
+                    <input id="adminAuth1" name="adminAuth" th:checked="${updateEmployeeInfoForm.adminAuth == 1}"
-						<input id="adminAuth0" name="adminAuth"
+                           type="radio"
-							th:checked="${updateEmployeeInfoForm.adminAuth == null or updateEmployeeInfoForm.adminAuth == 0}"
+                           value="1"> 管理者権限
-							type="radio" value="0">
+                </label>
-						一般権限
+                <label>
-					</label>
+                    <input id="adminAuth0" name="adminAuth"
-				</td>
+                           th:checked="${updateEmployeeInfoForm.adminAuth == null or updateEmployeeInfoForm.adminAuth == 0}"
-			</tr>
+                           type="radio"
-			<tr>
+                           value="0">
-				<th class="header">所属部署</th>
+                    一般権限
-				<td>
+                </label>
-					<label>
+            </td>
-						<select required="required" th:field="*{idDepartment}">
+        </tr>
-							<option th:each="department : ${departmentFormList}"
+        <tr>
-								th:selected="${updateEmployeeInfoForm.idDepartment != null && department.idDepartment == updateEmployeeInfoForm.idDepartment}"
+            <th class="header">所属部署</th>
-								th:text="${department.nmDepartment}" th:value="${department.idDepartment}">
+            <td>
-							</option>
+                <label>
-						</select>
+                    <select required="required" th:field="*{idDepartment}">
-					</label>
+                        <option th:each="department : ${departmentFormList}"
-				</td>
+                                th:selected="${updateEmployeeInfoForm.idDepartment != null && department.idDepartment == updateEmployeeInfoForm.idDepartment}"
-			</tr>
+                                th:text="${department.nmDepartment}"
-			<tr>
+                                th:value="${department.idDepartment}">
-				<td class="btnArea" colspan="2">
+                        </option>
-					<input type="submit" value="更新" />
+                    </select>
-				</td>
+                </label>
-			</tr>
+            </td>
-		</table>
+        </tr>
-	</form>
+        <tr>
-	<a href="javascript:selectSubmit()">一覧に戻る</a>
+            <td class="btnArea" colspan="2">
+                <input type="submit" value="更新"/>
+            </td>
+        </tr>
+    </table>
+</form>
+<a href="javascript:selectSubmit()">一覧に戻る</a>
 </body>
 
 <script>
-	function selectSubmit() {
+    function selectSubmit() {
-		const form = document.createElement('form');
+        const form = document.createElement('form');
-		form.setAttribute('method', 'post');
+        form.setAttribute('method', 'post');
-		form.setAttribute('action', 'selectAll');
+        form.setAttribute('action', 'selectAll');
 
-		// 動的送信用の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", "selectAll");
+        inputField.setAttribute("value", "selectAll");
 
-		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/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>