第二段階途中

.gitignore

@@ -1 +1,2 @@
 /target/
+/bin/

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

@@ -0,0 +1,25 @@
+package com.example.rhizome.app.domain.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+//コピペのみ、部署用に修正必要
+
+/**
+ * 部署情報の概念を表現するモデルクラスです。
+ */
+
+@Getter
+@AllArgsConstructor
+
+public class DepartmentInfo {
+	/**
+     * 社員情報
+     */
+    private final Employee employee;
+    /**
+     * 部署名
+     */
+    private final Department department;
+
+}

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

@@ -1,5 +1,5 @@
 package com.example.rhizome.app.domain.service;
 
 public interface DeleteDepartment {
-	void deleteDepartment(Integer idDepartment);
+    void deleteDepartment(Integer idDepartment);
 }

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

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

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

@@ -7,28 +7,21 @@ import org.springframework.transaction.annotation.Transactional;
 import com.example.rhizome.app.domain.service.DeleteDepartment;
 import com.example.rhizome.app.infra.repository.DepartmentRepository;
 
-/**
+//@Srviceをつけ忘れるとControllerで使うときに起動時エラーになってしまう
- * 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) {
+		// ★考える：Repository のどのメソッドで「IDを指定して削除」できる？
+		//          （お手本の DeleteEmployeeImpl を見る）
 		departmentRepository.deleteById(idDepartment);
 	}
-
 }

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

@@ -0,0 +1,12 @@
+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;
+
+public interface SearchDepartmentInfo {
+	List<Department> selectAll();
+
+	List<Department> searchBy(SearchConditionDepartment searchConditionDepartment);
+}

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

@@ -0,0 +1,59 @@
+package com.example.rhizome.app.domain.service.impl;
+
+import java.util.List;
+
+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.model.SearchConditionDepartment;
+import com.example.rhizome.app.infra.repository.DepartmentInfoRepository;
+
+/**
+ * SearchDepartmentInfoImpl (employee join department) 検索系の機能を集約させるサービスクラスです
+ */
+@Service
+@Transactional
+public class SearchDepartmentInfoImpl implements SearchDepartmentInfo {
+
+	DepartmentInfoRepository departmentInfoRepository;
+
+	@Autowired
+	public SearchDepartmentInfoImpl(DepartmentInfoRepository departmentInfoRepository) {
+		this.departmentInfoRepository = departmentInfoRepository;
+	}
+
+	/**
+	 * DepartmentInfo (employee join department) のレコードを全件取得
+	 *
+	 * @return 取得したレコード全件
+	 */
+	public List<Department> selectAll() {
+
+		return null;//EmployeeDepartmentEntity.createDepartmentInfoList(departmentInfoRepository.findAll());
+
+	}
+
+	/**
+	 * SearchConditionDepartment の情報を元に DepartmentInfo (employee join department) のレコードを取得
+	 *
+	 * @param searchConditionDepartment 検索条件
+	 * @return 検索結果のレコードリスト
+	 */
+	public List<Department> searchBy(SearchConditionDepartment searchConditionDepartment) {
+		// 動的に検索条件を絞り込む
+		// Specification は Criteria API の Predicate をラップしたもの
+		return null;
+//				EmployeeDepartmentEntity
+//				.createDepartmentInfoList(
+//						departmentInfoRepository.findAll(Specification
+//								.where(EmployeeInfoRepository
+//										.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
+//								.and(EmployeeInfoRepository
+//										.idDepartmentEqual(searchConditionDepartment.getNmDepartment()))
+//
+//						));
+
+	}
+}

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

@@ -1,16 +1,17 @@
 package com.example.rhizome.app.domain.service.impl;
 
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 import com.example.rhizome.app.domain.model.EmployeeInfo;
 import com.example.rhizome.app.domain.model.SearchConditionEmployee;
 import com.example.rhizome.app.domain.service.SearchEmployeeInfo;
 import com.example.rhizome.app.infra.entity.EmployeeDepartmentEntity;
 import com.example.rhizome.app.infra.repository.EmployeeInfoRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
 
 /**
  * SearchEmployeeInfoImpl (employee join department) 検索系の機能を集約させるサービスクラスです

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

@@ -1,29 +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.UpdateDepartment;
-import com.example.rhizome.app.infra.entity.DepartmentEntity;
-import com.example.rhizome.app.infra.repository.DepartmentRepository;
-
-@Service
-@Transactional
-public class UpdateDepartmentImpl implements UpdateDepartment {
-
-	DepartmentRepository departmentRepository;
-
-	@Autowired
-	public UpdateDepartmentImpl(DepartmentRepository departmentRepository) {
-		this.departmentRepository = departmentRepository;
-	}
-
-	public void updateDepartment(Department department) {
-		DepartmentEntity entity = new DepartmentEntity();
-		entity.setIdDepartment(department.getIdDepartment());
-		entity.setNmDepartment(department.getNmDepartment());
-		departmentRepository.save(entity);
-	}
-}

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/infra/entity/EmployeeDepartmentEntity.java

@@ -1,16 +1,28 @@
 package com.example.rhizome.app.infra.entity;
 
-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.EmployeeInfo;
+import javax.persistence.Column;
-import lombok.AllArgsConstructor;
+import javax.persistence.Entity;
-import lombok.Data;
+import javax.persistence.GeneratedValue;
-import lombok.NoArgsConstructor;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.NamedEntityGraph;
+import javax.persistence.Table;
+
 import org.hibernate.annotations.Fetch;
 import org.hibernate.annotations.FetchMode;
 
-import javax.persistence.*;
+import com.example.rhizome.app.domain.model.Department;
-import java.util.List;
+import com.example.rhizome.app.domain.model.DepartmentInfo;
+import com.example.rhizome.app.domain.model.Employee;
+import com.example.rhizome.app.domain.model.EmployeeInfo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
  * Employee + Department の Join 情報を保持するEntity
@@ -114,5 +126,10 @@ public class EmployeeDepartmentEntity {
 
     }
 
+	public static List<DepartmentInfo> createDepartmentInfoList(List<EmployeeDepartmentEntity> all) {
+		// TODO 自動生成されたメソッド・スタブ
+		return null;
+	}
+
 
 }

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

@@ -0,0 +1,28 @@
+package com.example.rhizome.app.infra.repository;
+
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.stereotype.Repository;
+
+import com.example.rhizome.app.infra.entity.EmployeeDepartmentEntity;
+
+@Repository
+public interface DepartmentInfoRepository
+		extends JpaRepository<EmployeeDepartmentEntity, Integer>, JpaSpecificationExecutor<EmployeeDepartmentEntity> {
+	static Specification<EmployeeDepartmentEntity> idDepartmentEqual(Integer idDepartment) {
+		return idDepartment == null ? null :
+		// 戻り値の型 Specification<EmployeeDepartmentEntity> にキャスト
+				(Specification<EmployeeDepartmentEntity>)
+				// ラムダ式で記載しているが書いてあることは criteriaBuilder を使って Where句の後の "'idDepartment' = idDepartment(変数)"
+				// を作成している
+				(root, criteriaQuery, criteriaBuilder) -> criteriaBuilder.equal(root.get("idDepartment"), idDepartment);
+	}
+
+	static Specification<EmployeeDepartmentEntity> nmDepartmentEqual(String nmDepartment) {
+		return (nmDepartment == null || nmDepartment.isEmpty()) ? null
+				: (Specification<EmployeeDepartmentEntity>) (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder
+						.like(root.get("nmDepartment"), "%" + nmDepartment + "%");
+	}
+
+}

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

@@ -1,11 +1,12 @@
 package com.example.rhizome.app.infra.repository;
 
-import com.example.rhizome.app.infra.entity.EmployeeDepartmentEntity;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;
 
+import com.example.rhizome.app.infra.entity.EmployeeDepartmentEntity;
+
 /**
  * ワンポイント情報（ここで登場する関数型インターフェース Specification について解説します）
  * Specification:
@@ -53,9 +54,9 @@ public interface EmployeeInfoRepository extends JpaRepository<EmployeeDepartment
                         (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder.like(root.get("mailAddress"), "%" + mailAddress + "%");
     }
 
-    static Specification<EmployeeDepartmentEntity> idDepartmentEqual(Integer idDepartment) {
+    static Specification<EmployeeDepartmentEntity> idDepartmentEqual(Integer integer) {
         return (root, query, criteriaBuilder) ->
-                idDepartment == null ? null :
+                integer == null ? null :
-                        criteriaBuilder.equal(root.join("department").get("idDepartment"), idDepartment);
+                        criteriaBuilder.equal(root.join("department").get("idDepartment"), integer);
     }
 }

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

@@ -1,8 +1,5 @@
 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;
 
@@ -15,121 +12,68 @@ 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.app.domain.model.SearchConditionDepartment;
-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.DepartmentInfoForm;
-import com.example.rhizome.app.presentation.form.LoginUserForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
 
-/**
- * 削除処理のコントロータ
- */
 @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;
 	DeleteDepartment deleteDepartment;
 	SearchDepartment searchDepartment;
-	SearchEmployee searchEmployee;
+	SearchEmployee searchEmployee; // 所属社員の確認に使う（既存）
 
 	@Autowired
-	public DeleteDepartmentController(DeleteDepartment deleteDepartment, SearchDepartment searchDepartment,
+	public DeleteDepartmentController(HttpSession httpSession, DeleteDepartment deleteDepartment,
-			HttpSession httpSession, SearchEmployee searchEmployee) {
+			SearchDepartment searchDepartment, SearchEmployee searchEmployee) {
 		this.httpSession = httpSession;
 		this.deleteDepartment = deleteDepartment;
 		this.searchDepartment = searchDepartment;
 		this.searchEmployee = searchEmployee;
 	}
 
-	/**
+	@RequestMapping(value = TransitionTargetPageNameKeyword.DELETE_DEPARTMENT, method = RequestMethod.POST)
-	 * 削除処理のコントローラ
+	public String deleteDepartment(@RequestParam(value = "idDepartment", required = false) Integer idDepartment,
-	 *
+			Model model) {
-	 * @param idDepartment 削除対象のdepartmentId
+
-	 * @param model      ビューにデータを渡すためのコンテナ
+		final String UNKNOWN_ID = "削除対象のIDが不明です。";
-	 * @return 遷移先の画面
+		final String HAS_EMPLOYEE = "1名以上が所属している部署は削除出来ません。";
-	 */
+		final String DELETE_COMPLETE = "削除しました。";
-	@PermissionCheck
-	@SessionCheck
-	@RequestMapping(value = DELETE_DEPARTMENT, method = RequestMethod.POST)
-	public String deleteDepartment(@RequestParam("idDepartment") Integer idDepartment, Model model) {
 
 		try {
-			if (idDepartment == null) {
+			// ★① idDepartment が null、または searchDepartment.searchBy(new SearchConditionDepartment(idDepartment, null)) が空
-				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, UNKNOWN_ID);
+			//     → MESSAGE_ERROR に UNKNOWN_ID を載せて一覧へ
-				model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+			if (idDepartment == null
-						DepartmentInfoForm.convertFrom(searchDepartment.selectAll()));
+					|| searchDepartment.searchBy(new SearchConditionDepartment(idDepartment, null)).isEmpty()) {
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(UNKNOWN_ID));
 				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) {
+			// ★② searchEmployee.searchEmployeeByIdDepartment(idDepartment) が空でない
-			// ログイン情報の破棄
+			//     → MESSAGE_ERROR に HAS_EMPLOYEE を載せて一覧へ
-			httpSession.invalidate();
+			if (!searchEmployee.searchEmployeeByIdDepartment(idDepartment).isEmpty()) {
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(UNKNOWN_ID));
+				return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
+			}
+			// ★③ deleteDepartment.deleteDepartment(idDepartment) → MESSAGE_INFO に DELETE_COMPLETE を載せて一覧へ
+			deleteDepartment.deleteDepartment(idDepartment);
+			model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(UNKNOWN_ID));
 
+			//以下がメッセージの載せ方
+			//model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(UNKNOWN_ID));
+			return "一覧へ戻る（ステップ 2-5 で決める）";
+		} catch (Exception e) {
+			httpSession.invalidate();
 			e.printStackTrace();
-			// エラーログ出力
 			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-			// エラー画面遷移
 			return TransitionTargetPageNameKeyword.ERROR_HTML;
 		}
 	}
-
-	/**
-	 * 削除処理実施
-	 *
-	 * @param model      ビューにデータを渡すためのコンテナ
-	 * @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;
-		}
-
-		// 削除を実施
-		deleteDepartment.deleteDepartment(idDepartment);
-		;
-
-		// 削除完了したメッセージをセット
-		model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(DELETE_COMPLETE));
-
-	}
 }

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

@@ -1,5 +1,6 @@
 package com.example.rhizome.app.presentation.controller;
 
+import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -12,103 +13,67 @@ 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.app.domain.model.Department;
-import com.example.rhizome.aop.aspect.SessionCheck;
+import com.example.rhizome.app.domain.model.SearchConditionDepartment;
 import com.example.rhizome.app.domain.service.SearchDepartment;
-import com.example.rhizome.app.domain.service.SearchEmployeeInfo;
 import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
 import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.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());
-	// エラーメッセージ用の定数フィールド
 	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
 
 	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;
 	}
 
+	/** 空の検索条件Formを、この Controller の画面用に用意する */
 	@ModelAttribute
-	public SearchConditionDepartment searchConditionDepartment() {
+	public SearchConditionDepartmentForm searchConditionDepartmentForm() {
-		return new SearchConditionDepartment();
+		return new SearchConditionDepartmentForm();
 	}
 
-	/**
+	@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT, method = RequestMethod.POST)
-	 * 社員検索画面表示処理コントローラ
+	public String select(SearchConditionDepartmentForm searchConditionDepartmentForm, Model model) {
-	 *
-	 * @param searchConditionDepartment 検索画面のフォーム
-	 * @param model                       ビューにデータを渡すためのコンテナ
-	 * @return 遷移先の画面
-	 */
-	@PermissionCheck
-	@SessionCheck
-	@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO, method = RequestMethod.POST)
-	public String select(SearchConditionDepartment searchConditionDepartment, Model model) {
-
 		try {
+			// ★考える：①検索サービスを呼ぶ（Form→Model変換 → 部分一致のメソッド）
+			//          ②結果(List<Department>)を DepartmentForm.convertFrom(...) で画面用に変換
+			//          ③ model に PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST という名前で載せる
+			SearchConditionDepartment searchCondition = new SearchConditionDepartment(
+					searchConditionDepartmentForm.getIdDepartment(),
+					searchConditionDepartmentForm.getNmDepartment());
+			List<Department> departmentList = searchDepartment.searchByWithLike(searchCondition);
+			model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, departmentList);
 
-			// 部署一覧を取得し、画面に返す用のクラスに詰め替える
-			// 作成した部署一覧をセット
-			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;
 		}
 	}
 
-	/**
+	@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_FORM_EMPTY, method = RequestMethod.POST)
-	 * 部署検索画面表示処理コントローラ
-	 * 検索条件無しの状態を作るため、空の検索条件で検索した結果を画面に返す
-	 *
-	 * @param model ビューにデータを渡すためのコンテナ
-	 * @return 遷移先の画面
-	 */
-	@PermissionCheck
-	@SessionCheck
-	@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO_FORM_EMPTY, method = RequestMethod.POST)
 	public String select(Model model) {
+		try {
+			// ★全件取得 → DepartmentForm に変換 → DEPARTMENT_FORM_LIST で model へ
+			return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
+		} catch (Exception e) {
+			httpSession.invalidate();
+			e.printStackTrace();
+			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
+			return TransitionTargetPageNameKeyword.ERROR_HTML;
+		}
 
-		// 部署一覧を取得し、画面に返す用のクラスに詰め替える
-		// 作成した部署一覧をセット
-		model.addAttribute(
-				PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-				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/SelectEmployeeController.java

@@ -9,6 +9,7 @@ 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.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
@@ -58,7 +59,7 @@ public class SelectEmployeeController {
      */
     @PermissionCheck
     @SessionCheck
-    @RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_EMPLOYEE_INFO, method = RequestMethod.POST)
+    @PostMapping(TransitionTargetPageNameKeyword.SELECT_EMPLOYEE_INFO)
     public String select(SearchConditionEmployeeForm searchConditionEmployeeForm, Model model) {
 
         try {
@@ -71,6 +72,7 @@ public class SelectEmployeeController {
             );
 
             // 検索条件を元に検索を実施
+            // 取得した EmployeeInfo（ employee + department ）の情報を画面に返す用の型に詰め替えてセット
             model.addAttribute(PageReturnAttributeKeyword.EMPLOYEE_INFO_FORM_LIST, EmployeeInfoForm.convertFrom(searchEmployeeInfo.searchBy(SearchConditionEmployeeForm.convertTo(searchConditionEmployeeForm))));
             // 検索ページに遷移
             return TransitionTargetPageNameKeyword.SELECT_EMPLOYEE_HTML;

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

@@ -1,138 +0,0 @@
-package com.example.rhizome.app.presentation.controller;
-
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.servlet.http.HttpSession;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import com.example.rhizome.aop.aspect.PermissionCheck;
-import com.example.rhizome.aop.aspect.SessionCheck;
-import com.example.rhizome.app.domain.model.Department;
-import com.example.rhizome.app.domain.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.UpdateDepartmentForm;
-
-@Controller
-public class UpdateDepartmentController {
-	// ログ出力用インスタンス
-	private final static Logger LOGGER = Logger.getLogger(DeleteDepartmentController.class.getName());
-
-	private static final String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
-
-	HttpSession httpSession;
-	UpdateDepartment updateDepartment;
-	SearchDepartment searchDepartment;
-	SearchEmployee searchEmployee;
-
-	@Autowired
-	public UpdateDepartmentController(UpdateDepartment updateDepartment, SearchDepartment searchDepartment,
-			HttpSession httpSession, SearchEmployee searchEmployee) {
-		this.httpSession = httpSession;
-		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 {
-			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_INFO;
-			}
-			// 更新画面に遷移
-			model.addAttribute(PageReturnAttributeKeyword.UPDATE_DEPARTMENT_INFO_FORM,
-					UpdateDepartmentForm.convertFrom(departmentList.get(0)));
-
-			// Update画面に遷移
-			return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
-		} catch (Exception e) {
-			// ログイン情報の破棄
-			httpSession.invalidate();
-
-			e.printStackTrace();
-
-			// エラーログ出力
-			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-			// エラー画面遷移
-			return TransitionTargetPageNameKeyword.ERROR_HTML;
-		}
-
-	}
-
-	@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/pageproperty/PageReturnAttributeKeyword.java

@@ -5,15 +5,15 @@ package com.example.rhizome.app.presentation.controller.pageproperty;
  */
 public class PageReturnAttributeKeyword {
 
-    public static final String MESSAGE_ERROR = "messageError";
+	public static final String MESSAGE_ERROR = "messageError";
-    public static final String MESSAGE_INFO = "messageInfo";
+	public static final String MESSAGE_INFO = "messageInfo";
-
-    public static final String DEPARTMENT_FORM_LIST = "departmentFormList";
-    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";
 
+	public static final String DEPARTMENT_FORM_LIST = "departmentFormList";
+	public static final String UPDATE_EMPLOYEE_INFO_FORM = "updateEmployeeInfoForm";
+	public static final String INSERT_EMPLOYEE_FORM = "insertEmployeeForm";
+	public static final String LOGIN_INFO_FORM = "loginInfoForm";
+	public static final String UPDATE_PERSONAL_EMPLOYEE_USER_FORM = "updatePersonalEmployeeUserForm";
+	public static final String EMPLOYEE_INFO_FORM_LIST = "employeeInfoFormList";
+	//追加
+	public static final String DEPARTMENT_INFO_FORM_LIST = "departmentInfoFormList";
 }

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

@@ -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,11 +44,14 @@ 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";
+
-	public static final String SELECT_DEPARTMENT_INFO_FORM_EMPTY = "/departmentAll";
+	// Department
+	// HTML
+	public static final String SELECT_DEPARTMENT_HTML = "selectDepartment";
+	// Controller
+	public static final String SELECT_DEPARTMENT = "/selectDepartment";
 	public static final String DELETE_DEPARTMENT = "/deleteDepartment";
-	public static final String SHOW_UPDATE_DEPARTMENT = "/showUpdateDepartment";
+	public static final String SELECT_DEPARTMENT_FORM_EMPTY = "/selectDepartmentAll";
-	public static final String UPDATE_DEPARTMENT_RESULT = "/updateDepartmentResult";
 
 	/**
 	 * 管理者向けのページリストを返す
@@ -63,6 +66,7 @@ public class TransitionTargetPageNameKeyword {
 				INDEX_LOGIN,
 				LOGOUT,
 				DO_LOGIN,
+				DELETE_EMPLOYEE,
 				INSERT_EMPLOYEE_INPUT,
 				INSERT_EMPLOYEE_CONFIRM,
 				INSERT_EMPLOYEE,
@@ -70,12 +74,7 @@ public class TransitionTargetPageNameKeyword {
 				SELECT_EMPLOYEE_INFO,
 				SELECT_EMPLOYEE_INFO_FORM_EMPTY,
 				SHOW_UPDATE_EMPLOYEE,
-				UPDATE_EMPLOYEE_RESULT,
+				UPDATE_EMPLOYEE_RESULT);
-				SELECT_DEPARTMENT_INFO,
-				SELECT_DEPARTMENT_INFO_FORM_EMPTY,
-				DELETE_DEPARTMENT,
-				SHOW_UPDATE_DEPARTMENT,
-				UPDATE_DEPARTMENT_RESULT);
 	}
 
 	/**

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

@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+	<meta charset="UTF-8">
+	<title>Insert title here</title>
+</head>
+
+<body>
+	<!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>
+					<th class="header">所属部署</th>
+					<td>
+						<label>
+							<select required="required" th:field="*{idDepartment}">
+								<option th:each="department : ${departmentFormList}"
+									th:selected="${insertDepartmentForm.idDepartment != null && department.idDepartment == insertDepartmentForm.idDepartment}"
+									th:text="${department.nmDepartment}" th:value="${department.idDepartment}">
+								</option>
+							</select>
+						</label>
+					</td>
+				</tr>
+				<tr>
+					<td class="btnArea" colspan="2">
+						<input type="submit" value="登録確認" />
+					</td>
+				</tr>
+			</table>
+		</form>
+		<a href="showMenu">メニューに戻る</a>
+	</body>
+
+	</html>
+</body>
+
+</html>

src/main/resources/templates/menu.html

@@ -26,98 +26,101 @@
 			<td><a class="menuClass" href="javascript:selectEmployeeSubmit()"><i class="fas fa-search"></i> 社員検索 </a>
 			</td>
 			<td class="description">登録済みのユーザ一覧表示と</br>更新、削除を行います。</td>
-			<td><a class="menuClass" href="javascript:selectDepartmentSubmit()"><i class="fas fa-search"></i>部署検索</a>
-			</td>
-			<td class="description">登録済みの部署一覧表示と</br>更新、削除を行います。</td>
 		</tr>
 
 		<tr>
 			<td><a class="menuClass" href="javascript:insertEmployeeSubmit()"><i class="fas fa-plus"></i> 社員登録 </a></td>
 			<td class="description">新規でユーザ追加を行います。</td>
-			<td><a class="menuClass" href="javascript:insertDepartmentSubmit()"><i class="fas fa-plus"></i> 部署登録 </a>
+		</tr>
-			</td>
-			<td class="description">新規で部署追加を行います。</td>
 
+		<!--部署検索機能表示-->
+		<tr>
+			<td><a class="menuClass" href="javascript:selectDepartmentSubmit()"><i class="fas fa-search"></i> 部署検索 </a>
+			</td>
+			<td class="description">登録済みの部署一覧表示と</br>更新、削除を行います。</td>
+		</tr>
 
 	</table>
-</body>
 
-<script type="text/javascript">
-	function selectEmployeeSubmit() {
-		const form = document.createElement('form');
-		form.setAttribute('method', 'post');
-		form.setAttribute('action', 'selectEmployeeInfo');
 
-		// 動的送信用のHidden
-		// 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
-		const inputField = document.createElement("input");
-		inputField.setAttribute("type", "hidden");
-		inputField.setAttribute("value", "selectEmployeeInfo");
 
-		form.appendChild(inputField);
 
-		// フォームをDOMに追加
+	<script type="text/javascript">
-		document.body.appendChild(form);
+		function selectEmployeeSubmit() {
+			const form = document.createElement('form');
+			form.setAttribute('method', 'post');
+			form.setAttribute('action', 'selectEmployeeInfo');
 
-		form.submit();
+			// 動的送信用のHidden
-	}
+			// 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
+			const inputField = document.createElement("input");
+			inputField.setAttribute("type", "hidden");
+			inputField.setAttribute("value", "selectEmployeeInfo");
 
-	function selectDepartmentSubmit() {
+			form.appendChild(inputField);
-		const form = document.createElement('form');
-		form.setAttribute('method', 'post');
-		form.setAttribute('action', 'selectDepartmentInfo');
 
-		// 動的送信用のHidden
+			// フォームをDOMに追加
-		// 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
+			document.body.appendChild(form);
-		const inputField = document.createElement("input");
-		inputField.setAttribute("type", "hidden");
-		inputField.setAttribute("value", "selectDepartment");
 
-		form.appendChild(inputField);
+			form.submit();
+		}
 
-		// フォームをDOMに追加
+		function selectDepartmentSubmit() {
-		document.body.appendChild(form);
+			const form = document.createElement('form');
+			form.setAttribute('method', 'post');
+			form.setAttribute('action', 'selectDepartment');
 
-		form.submit();
+			// 動的送信用のHidden
-	}
+			// 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
+			const inputField = document.createElement("input");
+			inputField.setAttribute("type", "hidden");
+			inputField.setAttribute("value", "selectDepartment");
 
-	function insertEmployeeSubmit() {
+			form.appendChild(inputField);
-		const form = document.createElement('form');
-		form.setAttribute('method', 'post');
-		form.setAttribute('action', 'insertEmployeeInput');
 
-		// 動的送信用のHidden
+			// フォームをDOMに追加
-		// 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
+			document.body.appendChild(form);
-		const inputField = document.createElement("input");
-		inputField.setAttribute("type", "hidden");
-		inputField.setAttribute("value", "insertEmployeeInput");
 
-		form.appendChild(inputField);
+			form.submit();
+		}
 
-		// フォームをDOMに追加
+		function insertEmployeeSubmit() {
-		document.body.appendChild(form);
+			const form = document.createElement('form');
+			form.setAttribute('method', 'post');
+			form.setAttribute('action', 'insertEmployeeInput');
 
-		form.submit();
+			// 動的送信用のHidden
-	}
+			// 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
+			const inputField = document.createElement("input");
+			inputField.setAttribute("type", "hidden");
+			inputField.setAttribute("value", "insertEmployeeInput");
 
-	function insertDepartmentSubmit() {
+			form.appendChild(inputField);
-		const form = document.createElement('form');
-		form.setAttribute('method', 'post');
-		form.setAttribute('action', 'insertDepartmentInput');
 
-		// 動的送信用のHidden
+			// フォームをDOMに追加
-		// 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
+			document.body.appendChild(form);
-		const inputField = document.createElement("input");
-		inputField.setAttribute("type", "hidden");
-		inputField.setAttribute("value", "insertDepartmentInput");
 
-		form.appendChild(inputField);
+			form.submit();
+		}
 
-		// フォームをDOMに追加
+		function insertDepartmentSubmit() {
-		document.body.appendChild(form);
+			const form = document.createElement('form');
+			form.setAttribute('method', 'post');
+			form.setAttribute('action', 'insertDepartmentInput');
 
-		form.submit();
+			// 動的送信用のHidden
-	}
+			// 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
-</script>
+			const inputField = document.createElement("input");
+			inputField.setAttribute("type", "hidden");
+			inputField.setAttribute("value", "insertDepartmentInput");
+
+			form.appendChild(inputField);
+
+			// フォームをDOMに追加
+			document.body.appendChild(form);
+
+			form.submit();
+		}
+	</script>
 
 </html>

src/main/resources/templates/selectDepartment.html

@@ -3,106 +3,84 @@
 
 <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="selectDepartmentInfo" method="post" th:object="${searchConditionDepartment}">
+	<form action="selectDepartment" method="post" th:object="${searchConditionDepartmentForm}">
-
 		<div class="msgBox error" th:if="${messageError} != null">
 			<span class="error" th:text="${messageError.message}"></span>
 		</div>
-
 		<table>
 			<tr>
 				<th class="header">部署ID</th>
-				<td>
+				<td><input placeholder="部署ID" th:field="*{idDepartment}" type="number" /></td>
-					<input placeholder="部署ID" th:field="*{idDepartment}" type="number" />
-				</td>
 			</tr>
 			<tr>
 				<th class="header">部署名</th>
-				<td>
+				<td><input placeholder="部署名" th:field="*{nmDepartment}" type="text" /></td>
-					<input placeholder="部署名" th:field="*{nmDepartment}" type="text" />
-				</td>
 			</tr>
 			<tr>
-				<td class="btnArea" colspan="2">
+				<td class="btnArea" colspan="2"><input type="submit" value="検索" /></td>
-					<input type="submit" value="検索" />
+				<td class="btnArea" colspan="2"><button onclick="clearInput()">クリア</button></td>
-				</td>
-				<td class="btnArea" colspan="2">
-					<button onclick="clearInput()">クリア</button>
-				</td>
 			</tr>
 		</table>
 	</form>
 
-	<div class="header-spacing"></div>
 	<a href="showMenu">メニューに戻る</a>
-	<div class="header-spacing"></div>
 	<h1><span>検索結果</span></h1>
-	<div class="header-spacing"></div>
+
-	<th:block th:if="${messageInfo != null}">
+	<!-- 【修正】th:ifのリスト名を controller と一致させる -->
-		<script th:inline="javascript">
+	<table class="table-grid table-striped table-hover"
-			alert([[${messageInfo.message}]]);
+		th:if="${departmentFormList != null and departmentFormList.size() > 0}">
-		</script>
+		<thead>
+			<tr>
+				<th style="width: 60px;">部署ID</th>
+				<th style="width: 100px;">部署名</th>
+				<th style="width: 150px;">操作</th>
+			</tr>
+		</thead>
+		<tbody>
+			<!-- 【修正】ループ内で使う変数名を departmentForm に統一 -->
+			<tr th:each="departmentForm : ${departmentFormList}">
+				<td th:text="${departmentForm.idDepartment}"></td>
+				<td th:text="${departmentForm.nmDepartment}"></td>
+				<td>
+					<!-- 更新フォーム -->
+					<form action="showUpdate" method="post" style="display: inline;">
+						<input name="idDepartment" th:value="${departmentForm.idDepartment}" type="hidden">
+						<input type="submit" value="更新">
+					</form>
+					<!-- 削除フォーム -->
+					<form action="deleteDepartment" method="post" onsubmit="return confirm('本当に削除しますか？');"
+						style="display: inline;">
+						<input name="idDepartment" th:value="${departmentForm.idDepartment}" type="hidden">
+						<input type="submit" value="削除">
+					</form>
+				</td>
+			</tr>
+		</tbody>
+	</table>
+
+	<!-- 0件の時にメッセージを表示 -->
+	<th:block th:if="${departmentFormList != null and departmentFormList.size() == 0}">
+		<p>検索結果はありません</p>
 	</th:block>
-	<div class="header-spacing"></div>
-	<th:block th:if="${departmentFormList != null and departmentFormList.size() > 0}">
-		<!-- 検索結果が1件以上ある場合 -->
-		<table class="table-grid table-striped table-hover">
-			<thead>
-				<tr>
-					<th style="width: 60px;">部署ID</th>
-					<th style="width: 100px;">部署名</th>
-					<th style="width: 60px;">操作</th>
-				</tr>
-</body>
-</thead>
-<tbody>
-	<tr th:each="departmentForm : ${departmentFormList}">
-		<td th:text="${departmentForm.idDepartment}"></td>
-		<td th:text="${departmentForm.nmDepartment}"></td>
-		<td>
-			<!-- 更新フォーム -->
-			<form action="showUpdateDepartment" method="post" style="display: inline;">
-				<input name="idDepartment" th:value="${departmentForm.idDepartment}" type="hidden">
-				<input type="submit" value="更新">
-			</form>
-			<!-- 削除フォーム -->
-			<form action="deleteDepartment" method="post" onsubmit="return confirm('本当に削除しますか？');"
-				style="display: inline;">
-				<input name="idDepartment" th:value="${departmentForm.idDepartment}" type="hidden">
-				<input type="submit" value="削除">
-			</form>
-
-		</td>
-	</tr>
-</tbody>
-</table>
-</th:block>
-<th:block th:if="${departmentFormList == null or departmentFormList.size() == 0}">
-	<!-- 検索結果が0件の場合 -->
-	検索結果はありません。
-</th:block>
 
 </body>
+
 <script type="text/javascript">
-
 	function clearInput() {
 		document.getElementById('idDepartment').value = '';
 		document.getElementById('nmDepartment').value = '';

src/main/resources/templates/selectEmployee.html

@@ -3,155 +3,144 @@
 
 <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>
-    検索条件入力　　　
-    <div class="rightSection">
-        <span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
-        <button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
-    </div>
-</h1>
-<form action="selectEmployeeInfo"
-      method="post"
-      th:object="${searchConditionEmployeeForm}">
 
-    <div class="msgBox error" th:if="${messageError} != null">
+<body>
-        <span class="error" th:text="${messageError.message}"></span>
+	<h1>
-    </div>
+		検索条件入力　　　
-    <table>
+		<div class="rightSection">
-        <tr>
+			<span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
-            <th class="header">社員ID</th>
+			<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
-            <td>
+		</div>
-                <input placeholder="社員ID"
+	</h1>
-                       th:field="*{idEmployee}"
+	<form action="selectEmployeeInfo" method="post" th:object="${searchConditionEmployeeForm}">
-                       type="number"/>
+
-            </td>
+		<div class="msgBox error" th:if="${messageError} != null">
-        </tr>
+			<span class="error" th:text="${messageError.message}"></span>
-        <tr>
+		</div>
-            <th class="header">社員名</th>
+		<table>
-            <td>
+			<tr>
-                <input placeholder="社員名"
+				<th class="header">社員ID</th>
-                       th:field="*{nmEmployee}"
+				<td>
-                       type="text"/>
+					<input placeholder="社員ID" th:field="*{idEmployee}" type="number" />
-            </td>
+				</td>
-        </tr>
+			</tr>
-        <tr>
+			<tr>
-            <th class="header">社員名フリガナ</th>
+				<th class="header">社員名</th>
-            <td>
+				<td>
-                <input oninput="convertToKatakana(this)"
+					<input placeholder="社員名" th:field="*{nmEmployee}" type="text" />
-                       placeholder="フリガナ"
+				</td>
-                       th:field="*{knEmployee}"
+			</tr>
-                       type="text"/>
+			<tr>
-            </td>
+				<th class="header">社員名フリガナ</th>
-        </tr>
+				<td>
-        <tr>
+					<input oninput="convertToKatakana(this)" placeholder="フリガナ" th:field="*{knEmployee}" type="text" />
-            <th class="header">メールアドレス</th>
+				</td>
-            <td>
+			</tr>
-                <input placeholder="メールアドレス"
+			<tr>
-                       th:field="*{mailAddress}"
+				<th class="header">メールアドレス</th>
-                       type="email"/>
+				<td>
-            </td>
+					<input placeholder="メールアドレス" th:field="*{mailAddress}" type="email" />
-        </tr>
+				</td>
-        <tr>
+			</tr>
-            <th class="header">所属部署</th>
+			<tr>
-            <td>
+				<th class="header">所属部署</th>
-                <select th:field="*{idDepartment}">
+				<td>
-                    <option value=""></option>
+					<select th:field="*{idDepartment}">
-                    <option th:each="department : ${departmentFormList}"
+						<option value=""></option>
-                            th:selected="${searchConditionEmployeeForm.idDepartment != null && department.idDepartment == searchConditionEmployeeForm.idDepartment}"
+						<option th:each="department : ${departmentFormList}"
-                            th:text="${department.nmDepartment}"
+							th:selected="${searchConditionEmployeeForm.idDepartment != null && department.idDepartment == searchConditionEmployeeForm.idDepartment}"
-                            th:value="${department.idDepartment}">
+							th:text="${department.nmDepartment}" th:value="${department.idDepartment}">
-                    </option>
+						</option>
-                </select>
+					</select>
-            </td>
+				</td>
-        </tr>
+			</tr>
-        <tr>
+			<tr>
-            <td class="btnArea" colspan="2">
+				<td class="btnArea" colspan="2">
-                <input type="submit" value="検索"/>
+					<input type="submit" value="検索" />
-            </td>
+				</td>
-            <td class="btnArea" colspan="2">
+				<td class="btnArea" colspan="2">
-                <button onclick="clearInput()">クリア</button>
+					<button onclick="clearInput()">クリア</button>
-            </td>
+				</td>
-        </tr>
+			</tr>
-    </table>
+		</table>
-</form>
+	</form>
-<div class="header-spacing"></div>
+
-<a href="showMenu">メニューに戻る</a>
+	<div class="header-spacing"></div>
-<div class="header-spacing"></div>
+	<a href="showMenu">メニューに戻る</a>
-<h1><span>検索結果</span></h1>
+	<div class="header-spacing"></div>
-<div class="header-spacing"></div>
+	<h1><span>検索結果</span></h1>
-<th:block th:if="${messageInfo != null}">
+	<div class="header-spacing"></div>
-    <script th:inline="javascript">
+	<th:block th:if="${messageInfo != null}">
-        alert([[${messageInfo.message}]]);
+		<script th:inline="javascript">
-    </script>
+			alert([[${messageInfo.message}]]);
-</th:block>
+		</script>
-<div class="header-spacing"></div>
+	</th:block>
-<th:block th:if="${employeeInfoFormList != null and employeeInfoFormList.size() > 0}">
+	<div class="header-spacing"></div>
-    <!-- 検索結果が1件以上ある場合 -->
+	<th:block th:if="${employeeInfoFormList != null and employeeInfoFormList.size() > 0}">
-    <table class="table-grid table-striped table-hover">
+		<!-- 検索結果が1件以上ある場合 -->
-        <thead>
+		<table class="table-grid table-striped table-hover">
-        <tr>
+			<thead>
-            <th style="width: 60px;">社員ID</th>
+				<tr>
-            <th style="width: 100px;">社員名</th>
+					<th style="width: 60px;">社員ID</th>
-            <th style="width: 150px;">フリガナ</th>
+					<th style="width: 100px;">社員名</th>
-            <th style="width: 150px;">メールアドレス</th>
+					<th style="width: 150px;">フリガナ</th>
-            <th style="width: 100px;">パスワード</th>
+					<th style="width: 150px;">メールアドレス</th>
-            <th style="width: 70px;">管理者フラグ</th>
+					<th style="width: 100px;">パスワード</th>
-            <th style="width: 150px;">所属部署</th>
+					<th style="width: 70px;">管理者フラグ</th>
-            <th style="width: 150px;">操作</th>
+					<th style="width: 150px;">所属部署</th>
-        </tr>
+					<th style="width: 150px;">操作</th>
-        </thead>
+				</tr>
-        <tbody>
+			</thead>
-        <tr th:each="employeeInfoForm : ${employeeInfoFormList}">
+			<tbody>
-            <td th:text="${employeeInfoForm.idEmployee}"></td>
+				<tr th:each="employeeInfoForm : ${employeeInfoFormList}">
-            <td th:text="${employeeInfoForm.nmEmployee}"></td>
+					<td th:text="${employeeInfoForm.idEmployee}"></td>
-            <td th:text="${employeeInfoForm.knEmployee}"></td>
+					<td th:text="${employeeInfoForm.nmEmployee}"></td>
-            <td th:text="${employeeInfoForm.mailAddress}"></td>
+					<td th:text="${employeeInfoForm.knEmployee}"></td>
-            <td th:text="${employeeInfoForm.password}"></td>
+					<td th:text="${employeeInfoForm.mailAddress}"></td>
-            <td th:text="${employeeInfoForm.adminAuth}"></td>
+					<td th:text="${employeeInfoForm.password}"></td>
-            <td th:text="${employeeInfoForm.nmDepartment}"></td>
+					<td th:text="${employeeInfoForm.adminAuth}"></td>
-            <td>
+					<td th:text="${employeeInfoForm.nmDepartment}"></td>
-                <!-- 更新フォーム -->
+					<td>
-                <form action="showUpdateEmployee" method="post" style="display: inline;">
+						<!-- 更新フォーム -->
-                    <input name="idEmployee" th:value="${employeeInfoForm.idEmployee}" type="hidden">
+						<form action="showUpdateEmployee" method="post" style="display: inline;">
-                    <input type="submit" value="更新">
+							<input name="idEmployee" th:value="${employeeInfoForm.idEmployee}" type="hidden">
-                </form>
+							<input type="submit" value="更新">
-                <!-- 削除フォーム -->
+						</form>
-                <form action="deleteEmployee" method="post" onsubmit="return confirm('本当に削除しますか？');"
+						<!-- 削除フォーム -->
-                      style="display: inline;">
+						<form action="deleteEmployee" method="post" onsubmit="return confirm('本当に削除しますか？');"
-                    <input name="idEmployee" th:value="${employeeInfoForm.idEmployee}" type="hidden">
+							style="display: inline;">
-                    <input type="submit" value="削除">
+							<input name="idEmployee" th:value="${employeeInfoForm.idEmployee}" type="hidden">
-                </form>
+							<input type="submit" value="削除">
-            </td>
+						</form>
-        </tr>
+					</td>
-        </tbody>
+				</tr>
-    </table>
+			</tbody>
-</th:block>
+		</table>
-<th:block th:if="${employeeInfoFormList == null or employeeInfoFormList.size() == 0}">
+	</th:block>
-    <!-- 検索結果が0件の場合 -->
+	<th:block th:if="${employeeInfoFormList == null or employeeInfoFormList.size() == 0}">
-    検索結果はありません。
+		<!-- 検索結果が0件の場合 -->
-</th:block>
+		検索結果はありません。
+	</th:block>
 
 </body>
+
 <script type="text/javascript">
 
-    function clearInput() {
+	function clearInput() {
-        document.getElementById('idEmployee').value = '';
+		document.getElementById('idDepartment').value = '';
-        document.getElementById('nmEmployee').value = '';
+		document.getElementById('nmDepartment').value = '';
-        document.getElementById('knEmployee').value = '';
+	}
-        document.getElementById('mailAddress').value = '';
-        document.getElementById('idDepartment').selectedIndex = 0;
-    }
 
 
 </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

@@ -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/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>