段階３完了

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

@@ -1,20 +1,14 @@
 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.Employee;
-import com.example.rhizome.app.domain.model.LoginUser;
 import com.example.rhizome.app.domain.model.SearchConditionDepartment;
 
+import java.util.List;
+
 public interface SearchDepartment {
     List<Department> selectAll();
 
     List<Department> searchBy(SearchConditionDepartment searchConditionDepartment);
 
     List<Department> searchByWithLike(SearchConditionDepartment searchConditionDepartment);
-    
-    LoginUser searchLoginUser(String mailAddress);
-
-    Employee searchEmployeeByIdEmployee(Integer idEmployee);
 }

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

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

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

@@ -12,21 +12,23 @@ import com.example.rhizome.app.infra.repository.DepartmentRepository;
  */
 @Service
 @Transactional
-public class DeleteDepartmentImpl implements DeleteDepartment {
+public class DeleteDeparmentImpl implements DeleteDepartment{
-
 	DepartmentRepository departmentRepository;
 
 	@Autowired
-	public DeleteDepartmentImpl(DepartmentRepository departmentRepository) {
+    public DeleteDeparmentImpl(DepartmentRepository departmentRepository) {
-		this.departmentRepository = departmentRepository;
+		 this.departmentRepository = departmentRepository;
+
 	}
 
+
 	/**
 	 * idDepartment を元に department データを削除
 	 *
-	 * @param idDepartment 削除対象のidDepartmnet
+	 * @param idDepartmetn 削除対象のidDepartment
 	 */
 	public void deleteDepartment(Integer idDepartment) {
 		departmentRepository.deleteById(idDepartment);
 	}
+
 }

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

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

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

@@ -1,96 +1,82 @@
 package com.example.rhizome.app.domain.service.impl;
 
-import java.util.List;
 
+import com.example.rhizome.app.domain.model.Department;
+import com.example.rhizome.app.domain.model.SearchConditionDepartment;
+import com.example.rhizome.app.domain.service.SearchDepartment;
+import com.example.rhizome.app.infra.entity.DepartmentEntity;
+import com.example.rhizome.app.infra.repository.DepartmentRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.example.rhizome.app.domain.model.Department;
+import java.util.List;
-import com.example.rhizome.app.domain.model.Employee;
-import com.example.rhizome.app.domain.model.LoginUser;
-import com.example.rhizome.app.domain.model.SearchConditionDepartment;
-import com.example.rhizome.app.domain.service.SearchDepartment;
-import com.example.rhizome.app.infra.entity.DepartmentEntity;
-import com.example.rhizome.app.infra.repository.DepartmentRepository;
 
 /**
- * Department テーブル検索系の機能を集約させるサービスクラスです。
+ * 部署情報検索系の機能を集約させるサービスクラスです。
  */
 @Service
 @Transactional
 public class SearchDepartmentImpl implements SearchDepartment {
-	DepartmentRepository departmentRepository;
 
-	/**
+    DepartmentRepository departmentRepository;
-	 * コンストラクタ
-	 *
-	 * @param departmentRepository DI対象
-	 */
-	@Autowired
-	public SearchDepartmentImpl(DepartmentRepository departmentRepository) {
-		this.departmentRepository = departmentRepository;
-	}
 
-	/**
+    /**
-	 * 部署情報を全件取得する
+     * コンストラクタ
-	 *
+     *
-	 * @return 取得した部署情報レコード全件
+     * @param departmentRepository DI対象
-	 */
+     */
-	public List<Department> selectAll() {
+    @Autowired
-		return DepartmentEntity.createDepartmentList(departmentRepository.findAll());
+    public SearchDepartmentImpl(DepartmentRepository departmentRepository) {
-	}
+        this.departmentRepository = departmentRepository;
+    }
 
-	/**
+    /**
-	 * searchConditionDepartment の情報を元に Department のレコードを取得
+     * 部署情報を全件取得する
-	 *
+     *
-	 * @param searchConditionDepartment 検索条件
+     * @return 取得した部署情報レコード全件
-	 * @return 検索結果のレコード
+     */
-	 */
+    public List<Department> selectAll() {
-	public List<Department> searchBy(SearchConditionDepartment searchConditionDepartment) {
+        return DepartmentEntity.createDepartmentList(departmentRepository.findAll());
-		// 動的に検索条件を絞り込む
+    }
-		// Specification は Criteria API の Predicate をラップしたもの
-		return DepartmentEntity
-				.createDepartmentList(
-						departmentRepository.findAll(Specification
-								.where(DepartmentRepository
-										.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
-								.and(DepartmentRepository
-										.nmDepartmentEqual(searchConditionDepartment.getNmDepartment()))));
 
-	}
+    /**
+     * searchConditionDepartment の情報を元に Department のレコードを取得
+     *
+     * @param searchConditionDepartment 検索条件
+     * @return 検索結果のレコード
+     */
+    public List<Department> searchBy(SearchConditionDepartment searchConditionDepartment) {
+        // 動的に検索条件を絞り込む
+        // Specification は Criteria API の Predicate をラップしたもの
+        return DepartmentEntity
+                .createDepartmentList(
+                        departmentRepository.findAll(Specification
+                                .where(DepartmentRepository.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
+                                .and(DepartmentRepository.nmDepartmentEqual(searchConditionDepartment.getNmDepartment()))
+                        )
+                );
 
-	/**
+    }
-	 * searchConditionDepartment の情報を元に Department のレコードを取得
-	 * 部分一致検索
-	 *
-	 * @param searchConditionDepartment 検索条件
-	 * @return 検索結果のレコード
-	 */
-	public List<Department> searchByWithLike(SearchConditionDepartment searchConditionDepartment) {
-		// 動的に検索条件を絞り込む
-		// Specification は Criteria API の Predicate をラップしたもの
-		return DepartmentEntity
-				.createDepartmentList(
-						departmentRepository.findAll(Specification
-								.where(DepartmentRepository
-										.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
-								.and(DepartmentRepository
-										.nmDepartmentLike(searchConditionDepartment.getNmDepartment()))));
 
-	}
+    /**
-
+     * searchConditionDepartment の情報を元に Department のレコードを取得
-	@Override
+     * 部分一致検索
-	public LoginUser searchLoginUser(String mailAddress) {
+     *
-		// TODO 自動生成されたメソッド・スタブ
+     * @param searchConditionDepartment 検索条件
-		return null;
+     * @return 検索結果のレコード
-	}
+     */
-
+    public List<Department> searchByWithLike(SearchConditionDepartment searchConditionDepartment) {
-	@Override
+        // 動的に検索条件を絞り込む
-	public Employee searchEmployeeByIdEmployee(Integer idEmployee) {
+        // Specification は Criteria API の Predicate をラップしたもの
-		// TODO 自動生成されたメソッド・スタブ
+        return DepartmentEntity
-		return null;
+                .createDepartmentList(
-	}
+                        departmentRepository.findAll(Specification
+                                .where(DepartmentRepository.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
+                                .and(DepartmentRepository.nmDepartmentLike(searchConditionDepartment.getNmDepartment()))
+                        )
+                );
 
+    }
 }

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

@@ -5,12 +5,14 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.example.rhizome.app.domain.model.Department;
+import com.example.rhizome.app.domain.service.UpdateDepartment;
 import com.example.rhizome.app.infra.entity.DepartmentEntity;
 import com.example.rhizome.app.infra.repository.DepartmentRepository;
 
 @Service
 @Transactional
-public class UpdateDepartmentImpl {
+public class UpdateDepartmentImpl implements UpdateDepartment {
+
 	DepartmentRepository departmentRepository;
 
 	@Autowired
@@ -19,8 +21,9 @@ public class UpdateDepartmentImpl {
 	}
 
 	public void updateDepartment(Department department) {
-		// ★考える：Model を Entity に変換（DepartmentEntity.convertFrom）して、Repository の save に渡す
+		DepartmentEntity entity = new DepartmentEntity();
-		departmentRepository.save(DepartmentEntity.convertFrom(department));
+		entity.setIdDepartment(department.getIdDepartment());
+		entity.setNmDepartment(department.getNmDepartment());
+		departmentRepository.save(entity);
 	}
-
 }

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

@@ -0,0 +1,17 @@
+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,5 +1,8 @@
 package com.example.rhizome.app.presentation.controller;
 
+import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.*;
+
+import java.util.Objects;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -12,13 +15,17 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import com.example.rhizome.app.domain.model.SearchConditionDepartment;
+import com.example.rhizome.aop.aspect.PermissionCheck;
+import com.example.rhizome.aop.aspect.SessionCheck;
+import com.example.rhizome.app.domain.model.LoginUser;
 import com.example.rhizome.app.domain.service.DeleteDepartment;
 import com.example.rhizome.app.domain.service.SearchDepartment;
 import com.example.rhizome.app.domain.service.SearchEmployee;
 import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
+import com.example.rhizome.app.presentation.controller.pageproperty.SessionKeyword;
 import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.DepartmentForm;
+import com.example.rhizome.app.presentation.form.DepartmentInfoForm;
+import com.example.rhizome.app.presentation.form.LoginUserForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
 
 /**
@@ -26,16 +33,20 @@ import com.example.rhizome.app.presentation.form.MessageForm;
  */
 @Controller
 public class DeleteDepartmentController {
+
 	// ログ出力用インスタンス
-	private final static Logger LOGGER = Logger.getLogger(DeleteEmployeeController.class.getName());
+	private final static 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;
 	DeleteDepartment deleteDepartment;
 	SearchDepartment searchDepartment;
-	SearchEmployee searchEmployee; // 所属社員の確認に使う（既存）
+	SearchEmployee searchEmployee;
 
 	@Autowired
 	public DeleteDepartmentController(DeleteDepartment deleteDepartment, SearchDepartment searchDepartment,
@@ -53,34 +64,38 @@ public class DeleteDepartmentController {
 	 * @param model      ビューにデータを渡すためのコンテナ
 	 * @return 遷移先の画面
 	 */
-
+	@PermissionCheck
-	@RequestMapping(value = TransitionTargetPageNameKeyword.DELETE_DEPARTMENT, method = RequestMethod.POST)
+	@SessionCheck
-	public String deleteDepartment(@RequestParam(value = "idDepartment", required = false) Integer idDepartment,
+	@RequestMapping(value = DELETE_DEPARTMENT, method = RequestMethod.POST)
-			Model model) {
+	public String deleteDepartment(@RequestParam("idDepartment") Integer idDepartment, Model model) {
-
-		final String UNKNOWN_ID = "削除対象のIDが不明です。";
 
 		try {
-			// 部署一覧を取得し、画面に返す用のクラスに詰め替える
+			if (idDepartment == null) {
-			// 作成した部署一覧をセット
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, UNKNOWN_ID);
-			model.addAttribute(
+				model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-					PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+						DepartmentInfoForm.convertFrom(searchDepartment.selectAll()));
-					DepartmentForm.convertFrom(searchDepartment.selectAll()));
+				return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
+			} else {
 
-			if (idDepartment == null
+				// 部署一覧を取得し、画面に返す用のクラスに詰め替える
-					|| searchDepartment.searchBy(new SearchConditionDepartment(idDepartment, null)) == null) {
+				// 作成した部署一覧をセット
-				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(UNKNOWN_ID));
+				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;
 			}
-
-			// 削除処理実施
-			deleteExec(model, idDepartment);
-
-			// 検索画面に遷移
-			return "forward:" + TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_FORM_EMPTY;
-
 		} catch (Exception e) {
 			// ログイン情報の破棄
 			httpSession.invalidate();
+
 			e.printStackTrace();
 			// エラーログ出力
 			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
@@ -93,25 +108,25 @@ public class DeleteDepartmentController {
 	 * 削除処理実施
 	 *
 	 * @param model      ビューにデータを渡すためのコンテナ
-	 * @param idEmployee 削除対象のDepartmentId
+	 * @param idDepartment 削除対象のdepartmentId
+	 * @param loginUser  ログインユーザー情報
 	 */
-	private void deleteExec(Model model, Integer idDepartment) {
 
-		final String DELETE_DPARTMENT_TARGET_ID_CAN_NOT_DELETE = "1名以上が所属している部署は削除出来ません。";
+	private void deleteExec(Model model, Integer idDepartment, LoginUser loginUser) {
-		final String DELETE_COMPLETE = "削除しました。";
 
-		// 削除対象部署が1名以上所属しているかチェック
+		// 1名以上が所属している場合
-		if (!searchEmployee.searchEmployeeByIdDepartment(idDepartment).isEmpty()) {
+		if (loginUser != null && Objects.equals(loginUser.getIdDepartment(), idDepartment)) {
 			// 削除対象だった場合
 			// エラーメッセージをセット
 			model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
-					new MessageForm(DELETE_DPARTMENT_TARGET_ID_CAN_NOT_DELETE));
+					new MessageForm(DELETE_TARGET_ID_CAN_NOT_DELETE));
 			// 検索画面に遷移
 			return;
 		}
 
 		// 削除を実施
 		deleteDepartment.deleteDepartment(idDepartment);
+		;
 
 		// 削除完了したメッセージをセット
 		model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(DELETE_COMPLETE));

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

@@ -1,21 +1,6 @@
 package com.example.rhizome.app.presentation.controller;
 
 
-import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.*;
-
-import java.util.Objects;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.servlet.http.HttpSession;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
 import com.example.rhizome.aop.aspect.PermissionCheck;
 import com.example.rhizome.aop.aspect.SessionCheck;
 import com.example.rhizome.app.domain.model.LoginUser;
@@ -24,12 +9,25 @@ 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.DepartmentForm;
+import com.example.rhizome.app.presentation.form.DepartmentInfoForm;
 import com.example.rhizome.app.presentation.form.LoginUserForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import javax.servlet.http.HttpSession;
+import java.util.Objects;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.DELETE_EMPLOYEE;
 
 /**
- * 削除処理のコントローラ
+ * 削除処理のコントロータ
  */
 @Controller
 public class DeleteEmployeeController {
@@ -68,7 +66,7 @@ public class DeleteEmployeeController {
             // 作成した部署一覧をセット
             model.addAttribute(
                     PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-                    DepartmentForm.convertFrom(searchDepartment.selectAll())
+                    DepartmentInfoForm.convertFrom(searchDepartment.selectAll())
             );
 
             // 削除処理実施

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

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

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

@@ -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.DepartmentForm;
+import com.example.rhizome.app.presentation.form.DepartmentInfoForm;
 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,
-                    DepartmentForm.convertFrom(
+                    DepartmentInfoForm.convertFrom(
                             searchDepartment.selectAll()
                     ));
 

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

@@ -8,7 +8,7 @@ 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.DepartmentForm;
+import com.example.rhizome.app.presentation.form.DepartmentInfoForm;
 import com.example.rhizome.app.presentation.form.InsertEmployeeForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,7 +71,7 @@ public class InsertEmployeeController {
             // 作成した部署一覧をセット
             model.addAttribute(
                     PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-                    DepartmentForm.convertFrom(
+                    DepartmentInfoForm.convertFrom(
                             searchDepartment.selectAll()
                     ));
 

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.DepartmentForm;
+import com.example.rhizome.app.presentation.form.DepartmentInfoForm;
 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, DepartmentForm.convertFrom(searchDepartment.selectAll()));
+            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentInfoForm.convertFrom(searchDepartment.selectAll()));
 
             // パラメータをセット
             model.addAttribute(PageReturnAttributeKeyword.INSERT_EMPLOYEE_FORM, insertEmployeeForm);

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

@@ -15,15 +15,14 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import com.example.rhizome.aop.aspect.PermissionCheck;
 import com.example.rhizome.aop.aspect.SessionCheck;
 import com.example.rhizome.app.domain.service.SearchDepartment;
+import com.example.rhizome.app.domain.service.SearchEmployeeInfo;
 import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
 import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.DepartmentForm;
+import com.example.rhizome.app.presentation.form.DepartmentInfoForm;
-import com.example.rhizome.app.presentation.form.SearchConditionDepartmentForm;
+import com.example.rhizome.app.presentation.form.SearchConditionDepartment;
 
 @Controller
-
 public class SelectDepartmentController {
-
 	// ログ出力用インスタンス
 	private final static Logger LOGGER = Logger.getLogger(SelectDepartmentController.class.getName());
 	// エラーメッセージ用の定数フィールド
@@ -31,29 +30,32 @@ public class SelectDepartmentController {
 
 	HttpSession httpSession;
 	SearchDepartment searchDepartment;
+	SearchEmployeeInfo searchEmployeeInfo;
 
 	@Autowired
-	public SelectDepartmentController(HttpSession httpSession, SearchDepartment searchDepartment) {
+	public SelectDepartmentController(HttpSession httpSession, SearchDepartment searchDepartment,
+			SearchEmployeeInfo searchEmployeeInfo) {
 		this.httpSession = httpSession;
 		this.searchDepartment = searchDepartment;
+		this.searchEmployeeInfo = searchEmployeeInfo;
 	}
 
 	@ModelAttribute
-	public SearchConditionDepartmentForm searchConditionDepartmentForm() {
+	public SearchConditionDepartment searchConditionDepartment() {
-		return new SearchConditionDepartmentForm();
+		return new SearchConditionDepartment();
 	}
 
 	/**
-	 * 部署検索画面表示処理コントローラ
+	 * 社員検索画面表示処理コントローラ
 	 *
-	 * @param searchConditionEmployeeForm 検索画面のフォーム
+	 * @param searchConditionDepartment 検索画面のフォーム
 	 * @param model                       ビューにデータを渡すためのコンテナ
 	 * @return 遷移先の画面
 	 */
 	@PermissionCheck
 	@SessionCheck
-	@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT, method = RequestMethod.POST)
+	@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO, method = RequestMethod.POST)
-	public String select(SearchConditionDepartmentForm searchConditionDepartmentForm, Model model) {
+	public String select(SearchConditionDepartment searchConditionDepartment, Model model) {
 
 		try {
 
@@ -61,15 +63,12 @@ public class SelectDepartmentController {
 			// 作成した部署一覧をセット
 			model.addAttribute(
 					PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-					DepartmentForm.convertFrom(searchDepartment.selectAll()));
+					DepartmentInfoForm.convertFrom(searchDepartment.selectAll()));
-			model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(
-					searchDepartment.searchBy(SearchConditionDepartmentForm.convertTo(searchConditionDepartmentForm))));
-			//部分一致検索
-			model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-					DepartmentForm.convertFrom(
-							searchDepartment.searchByWithLike(
-									SearchConditionDepartmentForm.convertTo(searchConditionDepartmentForm))));
 
+			// 検索条件を元に検索を実施
+			// 取得した EmployeeInfo（ employee + department ）の情報を画面に返す用の型に詰め替えてセット
+			model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentInfoForm.convertFrom(
+					searchDepartment.searchBy(SearchConditionDepartment.convertTo(searchConditionDepartment))));
 			// 検索ページに遷移
 			return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
 
@@ -84,7 +83,6 @@ public class SelectDepartmentController {
 			// エラー画面遷移
 			return TransitionTargetPageNameKeyword.ERROR_HTML;
 		}
-
 	}
 
 	/**
@@ -96,28 +94,21 @@ public class SelectDepartmentController {
 	 */
 	@PermissionCheck
 	@SessionCheck
-	@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_FORM_EMPTY, method = RequestMethod.POST)
+	@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO_FORM_EMPTY, method = RequestMethod.POST)
 	public String select(Model model) {
 
 		// 部署一覧を取得し、画面に返す用のクラスに詰め替える
 		// 作成した部署一覧をセット
 		model.addAttribute(
 				PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-				DepartmentForm.convertFrom(searchDepartment.selectAll()));
+				DepartmentInfoForm.convertFrom(searchDepartment.selectAll()));
 
 		// 検索条件を元に検索を実施
-		//		model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-		//				DepartmentForm.convertFrom(
-		//						searchDepartment.searchBy(
-		//								SearchConditionDepartmentForm.convertTo(searchConditionDepartmentForm()))));
-
-		//部分一致検索
 		model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-				DepartmentForm.convertFrom(
+				DepartmentInfoForm.convertFrom(
-						searchDepartment.searchByWithLike(
+						searchDepartment.searchBy(SearchConditionDepartment.convertTo(searchConditionDepartment()))));
-								SearchConditionDepartmentForm.convertTo(searchConditionDepartmentForm()))));
+
 		// 検索ページに遷移
 		return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
 	}
-
 }

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

@@ -1,14 +1,10 @@
 package com.example.rhizome.app.presentation.controller;
 
-import com.example.rhizome.aop.aspect.PermissionCheck;
+import java.util.logging.Level;
-import com.example.rhizome.aop.aspect.SessionCheck;
+import java.util.logging.Logger;
-import com.example.rhizome.app.domain.service.SearchDepartment;
+
-import com.example.rhizome.app.domain.service.SearchEmployeeInfo;
+import javax.servlet.http.HttpSession;
-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.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;
@@ -16,9 +12,15 @@ 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 com.example.rhizome.aop.aspect.PermissionCheck;
-import java.util.logging.Level;
+import com.example.rhizome.aop.aspect.SessionCheck;
-import java.util.logging.Logger;
+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.EmployeeInfoForm;
+import com.example.rhizome.app.presentation.form.SearchConditionEmployeeForm;
 
 /**
  * 社員検索画面用コントローラ　リスト全件表示、検索表示、更新、削除が可能
@@ -65,11 +67,10 @@ public class SelectEmployeeController {
             // 作成した部署一覧をセット
             model.addAttribute(
                     PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-                    DepartmentForm.convertFrom(searchDepartment.selectAll())
+                    DepartmentInfoForm.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;
@@ -105,7 +106,7 @@ public class SelectEmployeeController {
         // 作成した部署一覧をセット
         model.addAttribute(
                 PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-                DepartmentForm.convertFrom(searchDepartment.selectAll())
+                DepartmentInfoForm.convertFrom(searchDepartment.selectAll())
         );
 
         // 検索条件を元に検索を実施

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

@@ -9,66 +9,69 @@ import javax.servlet.http.HttpSession;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import com.example.rhizome.aop.aspect.PermissionCheck;
+import com.example.rhizome.aop.aspect.SessionCheck;
 import com.example.rhizome.app.domain.model.Department;
-import com.example.rhizome.app.domain.model.SearchConditionDepartment;
-import com.example.rhizome.app.domain.service.RegisterDepartment;
 import com.example.rhizome.app.domain.service.SearchDepartment;
-import com.example.rhizome.app.domain.service.impl.RegisterDepartmentImpl;
+import com.example.rhizome.app.domain.service.SearchEmployee;
-import com.example.rhizome.app.domain.service.impl.SearchDepartmentImpl;
+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.UpdateDepartmentForm;
 
 @Controller
 public class UpdateDepartmentController {
-
 	// ログ出力用インスタンス
-	private final static Logger LOGGER = Logger.getLogger(UpdateEmployeeController.class.getName());
+	private final static Logger LOGGER = Logger.getLogger(DeleteDepartmentController.class.getName());
-	// エラーメッセージ用の定数フィールド
+
-	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
+	private static final String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
 
 	HttpSession httpSession;
-	RegisterDepartment registerDepartment;
+	UpdateDepartment updateDepartment;
 	SearchDepartment searchDepartment;
+	SearchEmployee searchEmployee;
 
 	@Autowired
-	public UpdateDepartmentController(HttpSession httpSession, RegisterDepartmentImpl registerDepartment,
+	public UpdateDepartmentController(UpdateDepartment updateDepartment, SearchDepartment searchDepartment,
-			SearchDepartmentImpl searchDepartment) {
+			HttpSession httpSession, SearchEmployee searchEmployee) {
 		this.httpSession = httpSession;
-		this.registerDepartment = registerDepartment;
+		this.updateDepartment = updateDepartment;
 		this.searchDepartment = searchDepartment;
+		this.searchEmployee = searchEmployee;
 	}
 
+	@ModelAttribute
+	public SearchConditionDepartment searchConditionDepartment() {
+		return new SearchConditionDepartment();
+	}
+
+	@PermissionCheck
+	@SessionCheck
 	@RequestMapping(value = TransitionTargetPageNameKeyword.SHOW_UPDATE_DEPARTMENT, method = RequestMethod.POST)
 	public String showUpdateDepartment(@RequestParam("idDepartment") Integer idDepartment, Model model) {
 		final String UPDATE_TARGET_ID_NOT_FOUND = "更新対象のデータが見つかりません。";
-		try {
-			// ★① searchDepartment.searchBy(new SearchConditionDepartment(idDepartment, null)) で対象を検索
-			// ★② 結果が空なら MESSAGE_ERROR を載せて "forward:" + SELECT_DEPARTMENT_FORM_EMPTY
-			// ★③ あれば UpdateDepartmentForm.convertFrom(結果の先頭) を
-			//     UPDATE_DEPARTMENT_FORM という名前で model に載せ、UPDATE_DEPARTMENT_INPUT_HTML を返す
-			List<Department> DepartmentList = searchDepartment.searchBy(
-					new SearchConditionDepartment(idDepartment, null));
 
-			// DBに更新対象のデータがあるか
+		try {
-			if (DepartmentList.isEmpty()) {
+			List<Department> departmentList = searchDepartment
-				// ない場合はエラーメッセージをセットして検索画面に戻る
+					.searchBy(new com.example.rhizome.app.domain.model.SearchConditionDepartment(idDepartment, null));
+			if (departmentList.isEmpty()) {
 				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
 						new MessageForm(UPDATE_TARGET_ID_NOT_FOUND));
-				return "forward:" + TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_FORM_EMPTY;
+				return "forward:" + TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO;
 			}
 			// 更新画面に遷移
-			model.addAttribute(PageReturnAttributeKeyword.UPDATE_DEPARTMENT_FORM,
+			model.addAttribute(PageReturnAttributeKeyword.UPDATE_DEPARTMENT_INFO_FORM,
-					UpdateDepartmentForm.convertFrom(DepartmentList.get(0)));
+					UpdateDepartmentForm.convertFrom(departmentList.get(0)));
 
 			// Update画面に遷移
 			return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
-
 		} catch (Exception e) {
 			// ログイン情報の破棄
 			httpSession.invalidate();
@@ -79,7 +82,57 @@ public class UpdateDepartmentController {
 			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

@@ -1,97 +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.app.domain.service.SearchDepartment;
-import com.example.rhizome.app.domain.service.UpdateDepartment;
-import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
-import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.DepartmentForm;
-import com.example.rhizome.app.presentation.form.MessageForm;
-import com.example.rhizome.app.presentation.form.UpdateDepartmentForm;
-
-@Controller
-public class UpdateDepartmentResultController {
-
-	// ログ出力用インスタンス
-	private final static Logger LOGGER = Logger.getLogger(UpdateEmployeeController.class.getName());
-	// エラーメッセージ用の定数フィールド
-	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
-
-	HttpSession httpSession;
-	SearchDepartment searchDepartment;
-	UpdateDepartment updateDepartment;
-
-	@Autowired
-	public UpdateDepartmentResultController(HttpSession httpSession, SearchDepartment searchDepartment,
-			UpdateDepartment updateDepartment) {
-		this.httpSession = httpSession;
-		this.searchDepartment = searchDepartment;
-		this.updateDepartment = updateDepartment;
-	}
-
-	@RequestMapping(value = TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_RESULT, method = RequestMethod.POST)
-	public String departmentUpdateResult(@ModelAttribute UpdateDepartmentForm updateDepartmentForm, Model model) {
-
-		final String NOTHING = "項目が空欄です。";
-		final String DUPLICATION = "既に同名の部署が存在するか、値が変更されていません。";
-		final String NO_TARGET = "更新対象のデータが見つかりません。";
-		final String UPDATE_COMPLETE = "更新が完了しました。";
-
-		try {
-			
-			// 部署一覧取得
-            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(searchDepartment.selectAll()));
-			
-            
-           updateDepartmentForm.hasRequiredValue();
-           
-			if(updateDepartmentForm.hasRequiredValue() == false) {
-				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(NOTHING));
-				model.addAttribute(PageReturnAttributeKeyword.UPDATE_DEPARTMENT_FORM, updateDepartmentForm);
-				return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
-			}
-			
-			if(searchDepartment.searchBy(null) != null){
-				// 存在する場合はエラーメッセージを設定して更新入力画面に遷移
-				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(DUPLICATION));
-				model.addAttribute(PageReturnAttributeKeyword.UPDATE_DEPARTMENT_FORM, updateDepartmentForm);
-				return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
-			}
-			
-			
-			if(searchDepartment.searchBy(null) != null) {
-				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(NO_TARGET));
-				model.addAttribute(PageReturnAttributeKeyword.UPDATE_DEPARTMENT_FORM, updateDepartmentForm);
-				return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
-			}
-
-			 // 更新結果のメッセージを画面にセットし一覧画面に遷移
-            model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(UPDATE_COMPLETE));
-
-            // forward 先で不用意な動作をしないために UpdateEmployeeInfoForm をクリア
-            return "forward:" + TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_FORM_EMPTY;
-
-		} catch (Exception e) {
-			// 他と同じ
-			// ログイン情報の破棄
-			httpSession.invalidate();
-
-			e.printStackTrace();
-			// エラーログ出力
-			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-			// エラー画面遷移
-			return TransitionTargetPageNameKeyword.ERROR_HTML;
-		}
-	}
-}

src/main/java/com/example/rhizome/app/presentation/controller/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.DepartmentForm;
+import com.example.rhizome.app.presentation.form.DepartmentInfoForm;
 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, DepartmentForm.convertFrom(searchDepartment.selectAll()));
+            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentInfoForm.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.DepartmentForm;
+import com.example.rhizome.app.presentation.form.DepartmentInfoForm;
 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, DepartmentForm.convertFrom(searchDepartment.selectAll()));
+            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentInfoForm.convertFrom(searchDepartment.selectAll()));
 
             // パスワードが仕様を満たしているか確認
             String error = UpdateEmployeeInfoForm.validatePassword(

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

@@ -9,11 +9,11 @@ public class PageReturnAttributeKeyword {
     public static final String MESSAGE_INFO = "messageInfo";
 
     public static final String DEPARTMENT_FORM_LIST = "departmentFormList";
-    public static final String UPDATE_DEPARTMENT_FORM = "updateDepartmentForm";
     public static final String UPDATE_EMPLOYEE_INFO_FORM = "updateEmployeeInfoForm";
     public static final String INSERT_EMPLOYEE_FORM = "insertEmployeeForm";
     public static final String LOGIN_INFO_FORM = "loginInfoForm";
     public static final String UPDATE_PERSONAL_EMPLOYEE_USER_FORM = "updatePersonalEmployeeUserForm";
     public static final String EMPLOYEE_INFO_FORM_LIST = "employeeInfoFormList";
+	public static final String UPDATE_DEPARTMENT_INFO_FORM = "updateDepartmentForm";
 
 }

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

@@ -21,9 +21,9 @@ public class TransitionTargetPageNameKeyword {
 	public static final String INSERT_EMPLOYEE_CONFIRM_HTML = "insertEmployeeConfirm";
 	public static final String INSERT_EMPLOYEE_RESULT_HTML = "insertEmployeeResult";
 	public static final String UPDATE_EMPLOYEE_INPUT_HTML = "updateEmployeeInput";
-
+	public static final String SELECT_DEPARTMENT_HTML = "/selectDepartment";
 	public static final String ERROR_HTML = "error";
-
+	public static final String UPDATE_DEPARTMENT_INPUT_HTML = "updateDepartmentInput";
 	// 共通(Controller)
 	public static final String INDEX_BLANK = "";
 	public static final String INDEX_SLASH = "/";
@@ -44,22 +44,11 @@ public class TransitionTargetPageNameKeyword {
 	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";
-	// Department
+	public static final String SELECT_DEPARTMENT_INFO_FORM_EMPTY = "/departmentAll";
-	// HTML
+	public static final String DELETE_DEPARTMENT = "/deleteDepartment";
-	public static final String SELECT_DEPARTMENT_HTML = "selectDepartment";
-	public static final String UPDATE_DEPARTMENT_INPUT_HTML = "updateDepartmentInput";
-	public static final String INSERT_DEPARTMENT_INPUT_HTML = "insertDepartmentInput";
-	public static final String INSERT_DEPARTMENT_CONFIRM_HTML = "insertDepartmentConfirm";
-	public static final String INSERT_DEPARTMENT_RESULT_HTML = "insertDepartmentResult";
-
-	// Controller
-	public static final String SELECT_DEPARTMENT = "/selectDepartment";
-	public static final String SELECT_DEPARTMENT_FORM_EMPTY = "/selectAll2";
 	public static final String SHOW_UPDATE_DEPARTMENT = "/showUpdateDepartment";
 	public static final String UPDATE_DEPARTMENT_RESULT = "/updateDepartmentResult";
-	public static final String INSERT_DEPARTMENT_INPUT = "/insertDepartmentInput";
-	public static final String DELETE_DEPARTMENT = "/deleteDepartment";
 
 	/**
 	 * 管理者向けのページリストを返す
@@ -74,7 +63,6 @@ public class TransitionTargetPageNameKeyword {
 				INDEX_LOGIN,
 				LOGOUT,
 				DO_LOGIN,
-				DELETE_EMPLOYEE,
 				INSERT_EMPLOYEE_INPUT,
 				INSERT_EMPLOYEE_CONFIRM,
 				INSERT_EMPLOYEE,
@@ -83,12 +71,11 @@ public class TransitionTargetPageNameKeyword {
 				SELECT_EMPLOYEE_INFO_FORM_EMPTY,
 				SHOW_UPDATE_EMPLOYEE,
 				UPDATE_EMPLOYEE_RESULT,
-				SELECT_DEPARTMENT,
+				SELECT_DEPARTMENT_INFO,
-				SELECT_DEPARTMENT_FORM_EMPTY,
+				SELECT_DEPARTMENT_INFO_FORM_EMPTY,
-				INSERT_DEPARTMENT_INPUT,
+				DELETE_DEPARTMENT,
 				SHOW_UPDATE_DEPARTMENT,
-				SHOW_UPDATE_DEPARTMENT);
+				UPDATE_DEPARTMENT_RESULT);
-
 	}
 
 	/**

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

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

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

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

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

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

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

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

@@ -10,23 +10,39 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 public class UpdateDepartmentForm {
+
+	//部署ID
 	private Integer idDepartment;
+	//部署名
 	private String nmDepartment;
 
-	/** Model(Department) → Form */
+	/**
+	 * business 層の Department クラスから画面用（presentation 層）の UpdateDepartmentForm に
+	 * 変換します。
+	 *
+	 * @param departmentInfo business 層の DepartmentInfo インスタンス
+	 * @return 画面用（presentation 層）の UpdateDepartmentForm インスタンス
+	 */
 	public static UpdateDepartmentForm convertFrom(Department department) {
 		return new UpdateDepartmentForm(department.getIdDepartment(), department.getNmDepartment());
 	}
 
-	/** Form → Model(Department) */
+	/**
+	 * 画面用（presentation 層）の UpdateDepartmentForm クラスから business 層の Department クラスに
+	 * 変換します。
+	 *
+	 * @param updateDepartmentForm 画面用（presentation 層）の UpdateDepartmentForm インスタンス
+	 * @return business 層の Department インスタンス
+	 */
 	public static Department convertTo(UpdateDepartmentForm form) {
 		return new Department(form.getIdDepartment(), form.getNmDepartment());
 	}
 
-	/** 必須チェック。true：OK／false：部署ID か部署名が空 */
 	public boolean hasRequiredValue() {
-		// ★考える：idDepartment が null でなく、nmDepartment が null でも空白だけでもない
+		if (idDepartment == null && (nmDepartment == null || nmDepartment.isBlank())) {
-		if(idDepartment != null && nmDepartment.isBlank() && nmDepartment.isEmpty());
+			return false;
-		return false;
+		} else {
+			return true;
+		}
 	}
 }

src/main/resources/templates/insertDepartmentConfirm.html

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

src/main/resources/templates/insertDepartmentInput.html

@@ -1,56 +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="insertDepatmentConfirm" method="post" th:object="${insertDepartmentForm}">
-
-		<div class="msgBox error" th:if="${messageError} != null">
-			<span class="error" th:text="${messageError.message}"></span>
-		</div>
-
-		<table>
-			<tr>
-				<th class="header">部署ID</th>
-				<td>
-					<label>
-						<input class="readOnly" readonly="readonly" type="text" value="自動で設定されます" />
-					</label>
-				</td>
-			</tr>
-			<tr>
-				<th class="header">部署名</th>
-				<td>
-					<label>
-						<input maxlength="50" placeholder="部署名" required="required" th:field="*{nmDepartment}"
-							type="text" />
-					</label>
-				</td>
-			</tr>
-			<tr>
-				<td class="btnArea" colspan="2">
-					<input type="submit" value="登録確認" />
-				</td>
-			</tr>
-		</table>
-	</form>
-	<a href="showMenu">メニューに戻る</a>
-</body>
-
-</html>

src/main/resources/templates/insertDepartmentResult.html

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

src/main/resources/templates/menu.html

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

src/main/resources/templates/selectDepartment.html

@@ -8,7 +8,8 @@
 	<!-- CSSの読み込み -->
 	<link rel="stylesheet" th:href="@{/css/all.css}">
 	<link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
-	<title>部署検索</title>
+	<title>検索</title>
+
 </head>
 
 <body>
@@ -19,11 +20,13 @@
 			<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>
@@ -47,6 +50,7 @@
 			</tr>
 		</table>
 	</form>
+
 	<div class="header-spacing"></div>
 	<a href="showMenu">メニューに戻る</a>
 	<div class="header-spacing"></div>
@@ -57,53 +61,52 @@
 			alert([[${messageInfo.message}]]);
 		</script>
 	</th:block>
-
 	<div class="header-spacing"></div>
 	<th:block th:if="${departmentFormList != null and departmentFormList.size() > 0}">
 		<!-- 検索結果が1件以上ある場合 -->
 		<table class="table-grid table-striped table-hover">
 			<thead>
 				<tr>
-					<th style="width: 150px;">部署ID</th>
+					<th style="width: 60px;">部署ID</th>
-					<th style="width: 280px;">部署名</th>
+					<th style="width: 100px;">部署名</th>
-					<th style="width: 500px;">操作</th>
+					<th style="width: 60px;">操作</th>
 				</tr>
-			</thead>
+</body>
-			<tbody>
+</thead>
-				<tr th:each="departmentForm : ${departmentFormList}">
+<tbody>
-					<td th:text="${departmentForm.idDepartment}"></td>
+	<tr th:each="departmentForm : ${departmentFormList}">
-					<td th:text="${departmentForm.nmDepartment}"></td>
+		<td th:text="${departmentForm.idDepartment}"></td>
-					<td>
+		<td th:text="${departmentForm.nmDepartment}"></td>
-						<!-- 更新フォーム -->
+		<td>
-						<form action="showUpdateDepartment" method="post" style="display: inline;">
+			<!-- 更新フォーム -->
-							<input name="idDepartment" th:value="${departmentForm.idDepartment}" type="hidden">
+			<form action="showUpdateDepartment" method="post" style="display: inline;">
-							<input type="submit" value="更新">
+				<input name="idDepartment" th:value="${departmentForm.idDepartment}" type="hidden">
-						</form>
+				<input type="submit" value="更新">
-						<!-- 削除フォーム -->
+			</form>
-						<form action="deleteDepartment" method="post" onsubmit="return confirm('本当に削除しますか？');"
+			<!-- 削除フォーム -->
-							style="display: inline;">
+			<form action="deleteDepartment" method="post" onsubmit="return confirm('本当に削除しますか？');"
-							<input name="idDepartment" th:value="${departmentForm.idDepartment}" type="hidden">
+				style="display: inline;">
-							<input type="submit" value="削除">
+				<input name="idDepartment" th:value="${departmentForm.idDepartment}" type="hidden">
-						</form>
+				<input type="submit" value="削除">
-					</td>
+			</form>
-				</tr>
+
-			</tbody>
+		</td>
-		</table>
+	</tr>
-	</th:block>
+</tbody>
-	<th:block th:if="${departmentFormList == null or departmentFormList.size() == 0}">
+</table>
-		<!-- 検索結果が0件の場合 -->
+</th:block>
-		検索結果はありません。
+<th:block th:if="${departmentFormList == null or departmentFormList.size() == 0}">
-	</th:block>
+	<!-- 検索結果が0件の場合 -->
+	検索結果はありません。
+</th:block>
 
 </body>
 <script type="text/javascript">
 
 	function clearInput() {
-		document.getElementById('idDepartment').selectedIndex = 0;
+		document.getElementById('idDepartment').value = '';
 		document.getElementById('nmDepartment').value = '';
 	}
-
-
 </script>
 
 </html>

src/main/resources/templates/updateDepartmentForm.html

@@ -0,0 +1,71 @@
+<!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,24 +2,25 @@
 <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>
+	<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('本当によろしいですか？');"
+	<form action="/updateDepartmentResult" method="post" onsubmit="return confirm('本当によろしいですか？');"
 		th:object="${updateDepartmentForm}">
 
 		<div class="msgBox error" th:if="${messageError != null}">
@@ -44,16 +45,27 @@
 			</tr>
 		</table>
 	</form>
-	<a href="javascript:selectDepartmentSubmit()">一覧に戻る</a>
+	<a href="javascript:selectSubmit()">一覧に戻る</a>
-	<script type="text/javascript">
+</body>
-		function selectDepartmentSubmit() {
+	<script>
-			const form = document.createElement('form');
+		function selectSubmit() {
-			form.setAttribute('method', 'post');
+				const form = document.createElement('form');
-			form.setAttribute('action', 'selectDepartment');
+				form.setAttribute('method', 'post');
-			document.body.appendChild(form);
+				form.setAttribute('action', 'departmentAll');
-			form.submit();
+
+				// 動的送信用の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>
-</body>
 
 </html>

src/main/resources/templates/updateEmployeeInput.html

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