em-Springの課題です。

.classpath

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

.gitignore

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

.project

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

.settings/.jsdtscope

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,5 +1,7 @@
 package com.example.rhizome.app.domain.model;
 
+import java.util.List;
+
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -17,5 +19,9 @@ public class Department {
      * 部署名
      */
     private final String nmDepartment;
+	public static Object convertFrom(List<Department> departmentList) {
+		// TODO 自動生成されたメソッド・スタブ
+		return departmentList;
+	}
 
 }

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

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

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

@@ -1,10 +1,13 @@
 package com.example.rhizome.app.domain.service;
 
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+
 import com.example.rhizome.app.domain.model.Department;
 import com.example.rhizome.app.domain.model.SearchConditionDepartment;
 
-import java.util.List;
+@Service
-
 public interface SearchDepartment {
     List<Department> selectAll();
 

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

@@ -1,27 +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.service.DeleteDepartment;
-import com.example.rhizome.app.infra.repository.DepartmentRepository;
-
-//@Srviceをつけ忘れるとControllerで使うときに起動時エラーになってしまう
-@Service
-@Transactional
-public class DeleteDepartmentImpl implements DeleteDepartment {
-
-	DepartmentRepository departmentRepository;
-
-	@Autowired
-	public DeleteDepartmentImpl(DepartmentRepository departmentRepository) {
-		this.departmentRepository = departmentRepository;
-	}
-
-	public void deleteDepartment(Integer idDepartment) {
-		// ★考える：Repository のどのメソッドで「IDを指定して削除」できる？
-		//          （お手本の DeleteEmployeeImpl を見る）
-		departmentRepository.deleteById(idDepartment);
-	}
-}

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

@@ -1,17 +1,18 @@
 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.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 java.util.List;
 
 /**
  * 部署情報検索系の機能を集約させるサービスクラスです。

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

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

@@ -1,59 +0,0 @@
-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,17 +1,16 @@
 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/infra/entity/EmployeeDepartmentEntity.java

@@ -16,7 +16,6 @@ import org.hibernate.annotations.Fetch;
 import org.hibernate.annotations.FetchMode;
 
 import com.example.rhizome.app.domain.model.Department;
-import com.example.rhizome.app.domain.model.DepartmentInfo;
 import com.example.rhizome.app.domain.model.Employee;
 import com.example.rhizome.app.domain.model.EmployeeInfo;
 
@@ -126,7 +125,12 @@ public class EmployeeDepartmentEntity {
 
     }
 
-	public static List<DepartmentInfo> createDepartmentInfoList(List<EmployeeDepartmentEntity> all) {
+	public static List<Department> createDepartmentInfoList(List<EmployeeDepartmentEntity> all) {
+		// TODO 自動生成されたメソッド・スタブ
+		return null;
+	}
+
+	public static List<Department> createDepartmentList(List<EmployeeDepartmentEntity> all) {
 		// TODO 自動生成されたメソッド・スタブ
 		return null;
 	}

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

@@ -1,28 +0,0 @@
-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,12 +1,11 @@
 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:
@@ -54,9 +53,9 @@ public interface EmployeeInfoRepository extends JpaRepository<EmployeeDepartment
                         (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder.like(root.get("mailAddress"), "%" + mailAddress + "%");
     }
 
-    static Specification<EmployeeDepartmentEntity> idDepartmentEqual(Integer integer) {
+    static Specification<EmployeeDepartmentEntity> idDepartmentEqual(Integer idDepartment) {
         return (root, query, criteriaBuilder) ->
-                integer == null ? null :
+                idDepartment == null ? null :
-                        criteriaBuilder.equal(root.join("department").get("idDepartment"), integer);
+                        criteriaBuilder.equal(root.join("department").get("idDepartment"), idDepartment);
     }
 }

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

@@ -1,79 +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.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import com.example.rhizome.app.domain.model.SearchConditionDepartment;
-import com.example.rhizome.app.domain.service.DeleteDepartment;
-import com.example.rhizome.app.domain.service.SearchDepartment;
-import com.example.rhizome.app.domain.service.SearchEmployee;
-import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
-import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.MessageForm;
-
-@Controller
-public class DeleteDepartmentController {
-
-	private final static Logger LOGGER = Logger.getLogger(DeleteDepartmentController.class.getName());
-	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
-
-	HttpSession httpSession;
-	DeleteDepartment deleteDepartment;
-	SearchDepartment searchDepartment;
-	SearchEmployee searchEmployee; // 所属社員の確認に使う（既存）
-
-	@Autowired
-	public DeleteDepartmentController(HttpSession httpSession, DeleteDepartment deleteDepartment,
-			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) {
-
-		final String UNKNOWN_ID = "削除対象のIDが不明です。";
-		final String HAS_EMPLOYEE = "1名以上が所属している部署は削除出来ません。";
-		final String DELETE_COMPLETE = "削除しました。";
-
-		try {
-			// ★① idDepartment が null、または searchDepartment.searchBy(new SearchConditionDepartment(idDepartment, null)) が空
-			//     → MESSAGE_ERROR に UNKNOWN_ID を載せて一覧へ
-			if (idDepartment == null
-					|| searchDepartment.searchBy(new SearchConditionDepartment(idDepartment, null)).isEmpty()) {
-				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(UNKNOWN_ID));
-				return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
-			}
-			// ★② searchEmployee.searchEmployeeByIdDepartment(idDepartment) が空でない
-			//     → MESSAGE_ERROR に HAS_EMPLOYEE を載せて一覧へ
-			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;
-		}
-	}
-}

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

@@ -9,7 +9,7 @@ import com.example.rhizome.app.domain.service.SearchDepartment;
 import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
 import com.example.rhizome.app.presentation.controller.pageproperty.SessionKeyword;
 import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.DepartmentInfoForm;
+import com.example.rhizome.app.presentation.form.DepartmentForm;
 import com.example.rhizome.app.presentation.form.LoginUserForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -66,7 +66,7 @@ public class DeleteEmployeeController {
             // 作成した部署一覧をセット
             model.addAttribute(
                     PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-                    DepartmentInfoForm.convertFrom(searchDepartment.selectAll())
+                    DepartmentForm.convertFrom(searchDepartment.selectAll())
             );
 
             // 削除処理実施

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

@@ -9,7 +9,7 @@ import com.example.rhizome.app.domain.service.impl.SearchDepartmentImpl;
 import com.example.rhizome.app.domain.service.impl.SearchEmployeeImpl;
 import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
 import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.DepartmentInfoForm;
+import com.example.rhizome.app.presentation.form.DepartmentForm;
 import com.example.rhizome.app.presentation.form.InsertEmployeeForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -75,7 +75,7 @@ public class InsertEmployeeConfirmController {
             // 作成した部署一覧をセット
             model.addAttribute(
                     PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-                    DepartmentInfoForm.convertFrom(
+                    DepartmentForm.convertFrom(
                             searchDepartment.selectAll()
                     ));
 

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

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

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

@@ -1,79 +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 com.example.rhizome.app.domain.model.Department;
-import com.example.rhizome.app.domain.model.SearchConditionDepartment;
-import com.example.rhizome.app.domain.service.SearchDepartment;
-import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
-import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.SearchConditionDepartmentForm;
-
-@Controller
-public class SelectDepartmentController {
-
-	private final static Logger LOGGER = Logger.getLogger(SelectDepartmentController.class.getName());
-	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
-
-	HttpSession httpSession;
-	SearchDepartment searchDepartment;
-
-	@Autowired
-	public SelectDepartmentController(HttpSession httpSession, SearchDepartment searchDepartment) {
-		this.httpSession = httpSession;
-		this.searchDepartment = searchDepartment;
-	}
-
-	/** 空の検索条件Formを、この Controller の画面用に用意する */
-	@ModelAttribute
-	public SearchConditionDepartmentForm searchConditionDepartmentForm() {
-		return new SearchConditionDepartmentForm();
-	}
-
-	@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT, method = RequestMethod.POST)
-	public String select(SearchConditionDepartmentForm searchConditionDepartmentForm, 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);
-
-			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)
-	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;
-		}
-
-	}
-}

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

@@ -1,27 +1,24 @@
 package com.example.rhizome.app.presentation.controller;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.servlet.http.HttpSession;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
 import com.example.rhizome.aop.aspect.PermissionCheck;
 import com.example.rhizome.aop.aspect.SessionCheck;
 import com.example.rhizome.app.domain.service.SearchDepartment;
 import com.example.rhizome.app.domain.service.SearchEmployeeInfo;
 import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
 import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.DepartmentInfoForm;
+import com.example.rhizome.app.presentation.form.DepartmentForm;
 import com.example.rhizome.app.presentation.form.EmployeeInfoForm;
 import com.example.rhizome.app.presentation.form.SearchConditionEmployeeForm;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import javax.servlet.http.HttpSession;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * 社員検索画面用コントローラ　リスト全件表示、検索表示、更新、削除が可能
@@ -59,7 +56,7 @@ public class SelectEmployeeController {
      */
     @PermissionCheck
     @SessionCheck
-    @PostMapping(TransitionTargetPageNameKeyword.SELECT_EMPLOYEE_INFO)
+    @RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_EMPLOYEE_INFO, method = RequestMethod.POST)
     public String select(SearchConditionEmployeeForm searchConditionEmployeeForm, Model model) {
 
         try {
@@ -68,7 +65,7 @@ public class SelectEmployeeController {
             // 作成した部署一覧をセット
             model.addAttribute(
                     PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-                    DepartmentInfoForm.convertFrom(searchDepartment.selectAll())
+                    DepartmentForm.convertFrom(searchDepartment.selectAll())
             );
 
             // 検索条件を元に検索を実施
@@ -108,7 +105,7 @@ public class SelectEmployeeController {
         // 作成した部署一覧をセット
         model.addAttribute(
                 PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-                DepartmentInfoForm.convertFrom(searchDepartment.selectAll())
+                DepartmentForm.convertFrom(searchDepartment.selectAll())
         );
 
         // 検索条件を元に検索を実施

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

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

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

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

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

@@ -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 DEPARTMENT_INFO_FORM_LIST = "departmentInfoList";
 
-	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

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

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

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

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

@@ -1,40 +0,0 @@
-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/resources/templates/insertDpartmentInput.html

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

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

@@ -1,90 +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>
-	<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="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><input placeholder="部署ID" th:field="*{idDepartment}" type="number" /></td>
-			</tr>
-			<tr>
-				<th class="header">部署名</th>
-				<td><input placeholder="部署名" th:field="*{nmDepartment}" type="text" /></td>
-			</tr>
-			<tr>
-				<td class="btnArea" colspan="2"><input type="submit" value="検索" /></td>
-				<td class="btnArea" colspan="2"><button onclick="clearInput()">クリア</button></td>
-			</tr>
-		</table>
-	</form>
-
-	<a href="showMenu">メニューに戻る</a>
-	<h1><span>検索結果</span></h1>
-
-	<!-- 【修正】th:ifのリスト名を controller と一致させる -->
-	<table class="table-grid table-striped table-hover"
-		th:if="${departmentFormList != null and departmentFormList.size() > 0}">
-		<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>
-
-</body>
-
-<script type="text/javascript">
-	function clearInput() {
-		document.getElementById('idDepartment').value = '';
-		document.getElementById('nmDepartment').value = '';
-	}
-</script>
-
-</html>

src/main/resources/templates/selectEmployee.html

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