第二段階途中

.classpath

@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" output="target/classes" path="src/main/resources">
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="optional" value="true"/>
@@ -14,21 +14,20 @@
 	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
-			<attribute name="test" value="true"/>
 			<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="test" value="true"/>
 			<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="module" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>

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

@@ -1,17 +1,14 @@
 package com.example.rhizome.app.domain.service;
 
-import java.util.List;
-
 import com.example.rhizome.app.domain.model.Department;
 import com.example.rhizome.app.domain.model.SearchConditionDepartment;
 
+import java.util.List;
+
 public interface SearchDepartment {
-	//すべての部署を取得する
     List<Department> selectAll();
-    //部署ID・部署目の完全一致検索
+
     List<Department> searchBy(SearchConditionDepartment searchConditionDepartment);
-    //部署名の部分一致検索
+
     List<Department> searchByWithLike(SearchConditionDepartment searchConditionDepartment);
-    //↑下から変更 SelectDepartmentControllerのsearchByWithLikeでエラーでたから
-    //List<Department> searchByWithLike(SearchConditionDepartment searchConditionDepartment);
 }

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

@@ -1,11 +1,17 @@
 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
@@ -18,5 +24,4 @@ public class DeleteDepartmentImpl implements DeleteDepartment {
 		//          （お手本の DeleteEmployeeImpl を見る）
 		departmentRepository.deleteById(idDepartment);
 	}
-
 }

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

@@ -1,12 +1,10 @@
 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.DeleteEmployee;
 import com.example.rhizome.app.infra.repository.EmployeeRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * Employee レコード削除関連の機能を持つサービス

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

@@ -1,15 +1,13 @@
 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.LoginInfo;
 import com.example.rhizome.app.domain.model.LoginUser;
 import com.example.rhizome.app.domain.service.Login;
 import com.example.rhizome.app.infra.entity.EmployeeEntity;
 import com.example.rhizome.app.infra.repository.EmployeeRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * ログイン系の機能を集約させるサービスクラスです。

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

@@ -1,29 +1,25 @@
 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;
 
 /**
  * 部署情報検索系の機能を集約させるサービスクラスです。
  */
-//サービスクラスとして登録
 @Service
-//トランザクション管理
 @Transactional
 public class SearchDepartmentImpl implements SearchDepartment {
 
-	//Repositoryを保持するフィールド
     DepartmentRepository departmentRepository;
 
     /**
@@ -71,7 +67,6 @@ public class SearchDepartmentImpl implements SearchDepartment {
      * @param searchConditionDepartment 検索条件
      * @return 検索結果のレコード
      */
-    @Override
     public List<Department> searchByWithLike(SearchConditionDepartment searchConditionDepartment) {
         // 動的に検索条件を絞り込む
         // Specification は Criteria API の Predicate をラップしたもの

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

@@ -1,16 +1,28 @@
 package com.example.rhizome.app.infra.entity;
 
-import com.example.rhizome.app.domain.model.Department;
-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;
+import java.util.List;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+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 java.util.List;
+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;
+
+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/entity/EmployeeEntity.java

@@ -7,23 +7,16 @@
 package com.example.rhizome.app.infra.entity;
 
 
-import java.util.List;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
 import com.example.rhizome.app.domain.model.Employee;
 import com.example.rhizome.app.domain.model.LoginUser;
 import com.example.rhizome.app.domain.model.SearchConditionEmployee;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.persistence.*;
+import java.util.List;
+
 /**
  * EmployeeテーブルのEntity
  *
@@ -44,7 +37,6 @@ public class EmployeeEntity {
     @Column(name = "id_employee", nullable = false)
     private Integer idEmployee;
 
-
     /**
      * 社員名
      */
@@ -72,7 +64,6 @@ public class EmployeeEntity {
     /**
      * 管理者権限
      */
-//    @Transient
     @Column(name = "admin_auth", nullable = false)
     private Integer adminAuth;
 

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

@@ -1,13 +1,11 @@
 package com.example.rhizome.app.infra.repository;
 
+import com.example.rhizome.app.infra.entity.DepartmentEntity;
 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;
 
-//DepartmentRntity: 部署の実体
-import com.example.rhizome.app.infra.entity.DepartmentEntity;
-
 
 /**
  * Specification:
@@ -21,15 +19,11 @@ import com.example.rhizome.app.infra.entity.DepartmentEntity;
  * CriteriaBuilder:条件式（Where句以降の条件）の部分のクエリを作るためのビルダーです。
  * 戻り値はクエリを格納しているPredicateオブジェクトとなります。
  */
-
-//部署情報をデータベースから取得するRepository
-//                                           JpaRepositoryを継承する
 @Repository
 public interface DepartmentRepository extends JpaRepository<DepartmentEntity, Integer>, JpaSpecificationExecutor<DepartmentEntity> {
 
-//部署IDの完全一致検索条件を作成する
+
     static Specification<DepartmentEntity> idDepartmentEqual(Integer idDepartment) {
-        //部署IDがnullなら条件を設定しない
         return idDepartment == null ?
                 null :
                 // 戻り値の型 Specification<DepartmentEntity> にキャスト
@@ -39,9 +33,7 @@ public interface DepartmentRepository extends JpaRepository<DepartmentEntity, In
                         (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder.equal(root.get("idDepartment"), idDepartment);
     }
 
-    //部署名の完全一致条件を作成する
     static Specification<DepartmentEntity> nmDepartmentEqual(String nmDepartment) {
-    	//部署名が未入力なら条件を設定しない
         return (nmDepartment == null || nmDepartment.isEmpty()) ?
                 null :
                 (Specification<DepartmentEntity>)

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 :
-                        criteriaBuilder.equal(root.join("department").get("idDepartment"), idDepartment);
+                integer == null ? null :
+                        criteriaBuilder.equal(root.join("department").get("idDepartment"), integer);
     }
 }

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

@@ -12,16 +12,17 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import com.example.rhizome.app.domain.model.SearchConditionDepartment;
 import com.example.rhizome.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.DepartmentForm;
-import com.example.rhizome.app.presentation.form.SearchConditionDepartmentForm;
+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 = "エラーが発生しました！";
 
@@ -30,7 +31,6 @@ public class DeleteDepartmentController {
 	SearchDepartment searchDepartment;
 	SearchEmployee searchEmployee; // 所属社員の確認に使う（既存）
 
-        //コンストラクタ
 	@Autowired
 	public DeleteDepartmentController(HttpSession httpSession, DeleteDepartment deleteDepartment,
 			SearchDepartment searchDepartment, SearchEmployee searchEmployee) {
@@ -41,7 +41,8 @@ public class DeleteDepartmentController {
 	}
 
 	@RequestMapping(value = TransitionTargetPageNameKeyword.DELETE_DEPARTMENT, method = RequestMethod.POST)
-	    public String deleteDepartment(@RequestParam(value = "idDepartment", required = false) Integer idDepartment, Model model) {
+	public String deleteDepartment(@RequestParam(value = "idDepartment", required = false) Integer idDepartment,
+			Model model) {
 
 		final String UNKNOWN_ID = "削除対象のIDが不明です。";
 		final String HAS_EMPLOYEE = "1名以上が所属している部署は削除出来ません。";
@@ -50,23 +51,29 @@ public class DeleteDepartmentController {
 		try {
 			// ★① idDepartment が null、または searchDepartment.searchBy(new SearchConditionDepartment(idDepartment, null)) が空
 			//     → MESSAGE_ERROR に UNKNOWN_ID を載せて一覧へ
-	        	deleteDepartment.deleteDepartment(idDepartment);
+			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 を載せて一覧へ
-	        	model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,DepartmentForm.convertFrom(searchDepartment.selectAll()));
-	            // ★③ deleteDepartment.deleteDepartment(idDepartment) → MESSAGE_INFO に DELETE_COMPLETE を載せて一覧へ
-	        	model.addAttribute("searchConditinDepartmentForm", new SearchConditionDepartmentForm());
-
-//	            return "一覧へ戻る（ステップ 2-5 で決める）";
+			if (!searchEmployee.searchEmployeeByIdDepartment(idDepartment).isEmpty()) {
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(UNKNOWN_ID));
 				return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
-	        } catch (Exception e) {
+			}
+			// ★③ 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);
-	            model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,"部署を削除できませんでした");
-//	            return TransitionTargetPageNameKeyword.ERROR_HTML;
-	            return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
+			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.DepartmentForm;
+import com.example.rhizome.app.presentation.form.DepartmentInfoForm;
 import com.example.rhizome.app.presentation.form.LoginUserForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -66,7 +66,7 @@ public class DeleteEmployeeController {
             // 作成した部署一覧をセット
             model.addAttribute(
                     PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-                    DepartmentForm.convertFrom(searchDepartment.selectAll())
+                    DepartmentInfoForm.convertFrom(searchDepartment.selectAll())
             );
 
             // 削除処理実施

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

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

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

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

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

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

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

@@ -1,20 +1,6 @@
 package com.example.rhizome.app.presentation.controller;
 
 
-import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.*;
-
-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.LoginInfo;
 import com.example.rhizome.app.domain.model.LoginUser;
 import com.example.rhizome.app.domain.service.Login;
@@ -25,6 +11,18 @@ import com.example.rhizome.app.presentation.form.LoginInfoForm;
 import com.example.rhizome.app.presentation.form.LoginUserForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
 import com.example.rhizome.app.presentation.form.UpdatePersonalUserForm;
+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;
+
+import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.DO_LOGIN;
 
 /**
  * ログイン関連のコントローラ
@@ -108,8 +106,7 @@ public class LoginController {
                 // 編集対象のログイン者の情報を画面に渡す値にセット
                 model.addAttribute(PageReturnAttributeKeyword.UPDATE_PERSONAL_EMPLOYEE_USER_FORM, UpdatePersonalUserForm.convertFrom(loginUser));
                 // 個人の情報更新ページに遷移
-                  return TransitionTargetPageNameKeyword.MENU_HTML;
-//                return TransitionTargetPageNameKeyword.UPDATE_PERSONAL_EMPLOYEE_INPUT_HTML;
+                return TransitionTargetPageNameKeyword.UPDATE_PERSONAL_EMPLOYEE_INPUT_HTML;
             }
 
             // メニュー画面に遷移

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

@@ -1,8 +1,8 @@
 package com.example.rhizome.app.presentation.controller;
 
+import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-//import java.util.List;
 
 import javax.servlet.http.HttpSession;
 
@@ -13,39 +13,29 @@ 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.DepartmentForm;
 import com.example.rhizome.app.presentation.form.SearchConditionDepartmentForm;
 
-/**
- * 部署検索画面用コントローラ　リスト全件表示、検索表示、更新、削除が可能
- */
-
-//          検索Controller
 @Controller
 public class SelectDepartmentController {
 
-	// ログ出力用インスタンス
 	private final static Logger LOGGER = Logger.getLogger(SelectDepartmentController.class.getName());
-	// エラーメッセージ用の定数フィールド
 	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
 
-	//    public static final String SELECT_DEPARTMENT_FORM_EMPTY = "/selectDepartmentAll";
-
-	//    private static final String DEPARTMENT_HTML = "/department";
-
 	HttpSession httpSession;
 	SearchDepartment searchDepartment;
 
 	@Autowired
-	public SelectDepartmentController(HttpSession httpSession, SearchDepartment serchDepartment) {
+	public SelectDepartmentController(HttpSession httpSession, SearchDepartment searchDepartment) {
 		this.httpSession = httpSession;
-		this.searchDepartment = serchDepartment;
+		this.searchDepartment = searchDepartment;
 	}
 
-	//空の検索条件FormをこのControllerの画面用に用意する
+	/** 空の検索条件Formを、この Controller の画面用に用意する */
 	@ModelAttribute
 	public SearchConditionDepartmentForm searchConditionDepartmentForm() {
 		return new SearchConditionDepartmentForm();
@@ -57,22 +47,18 @@ public class SelectDepartmentController {
 			// ★考える：①検索サービスを呼ぶ（Form→Model変換 → 部分一致のメソッド）
 			//          ②結果(List<Department>)を DepartmentForm.convertFrom(...) で画面用に変換
 			//          ③ model に PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST という名前で載せる
-			model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm
-					.convertFrom(searchDepartment.searchByWithLike(SearchConditionDepartmentForm
-							.convertTo(searchConditionDepartmentForm))));
+			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を破棄
 			httpSession.invalidate();
-
-			//エラー内容を出力
 			e.printStackTrace();
-
-			//ログにエラーを記録
 			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-
-			//エラー画面へ遷移
 			return TransitionTargetPageNameKeyword.ERROR_HTML;
 		}
 	}
@@ -87,41 +73,7 @@ public class SelectDepartmentController {
 			e.printStackTrace();
 			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
 			return TransitionTargetPageNameKeyword.ERROR_HTML;
-
 		}
 
 	}
 }
-
-/**
- * 社員検索画面表示処理コントローラ
- *
- * @param searchConditionEmployeeForm 検索画面のフォーム
- * @param model                       ビューにデータを渡すためのコンテナ
- * @return 遷移先の画面
- */
-
-//    @PermissionCheck
-//    @SessionCheck
-//    @RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT,
-//    method = RequestMethod.POST)
-//    public String showDepartment() {
-//    	
-//        return TransitionTargetPageNameKeyword.DEPARTMENT_HTML;
-//
-//    
-//    @RequestMapping(value =TransitionTargetPageNameKeyword.SELECT_DEPARTMENT, method = RequestMethod.POST)
-//    public String select(DepartmentForm departmentForm, Model model) {
-//    	try {
-//    		
-//    		model.addAttribute(
-//    				PageReturnAttributeKeyword.EMPLOYEE_INFO_FORM_LIST,EmployeeInfoForm.convertFrom(searchEmployeeInfo.searchBy(
-//                          SearchConditionEmployeeForm.convertTo(searchConditionEmployeeForm())
-//    				);		
-
-//    /**
-//     * 社員検索画面表示処理コントローラ
-//     * 検索条件無しの状態を作るため、空の検索条件で検索した結果を画面に返す
-//     *
-//     * @param model ビューにデータを渡すためのコンテナ
-//     * @return 遷移先の画面

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;
 
@@ -18,7 +19,7 @@ import com.example.rhizome.app.domain.service.SearchDepartment;
 import com.example.rhizome.app.domain.service.SearchEmployeeInfo;
 import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
 import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.DepartmentForm;
+import com.example.rhizome.app.presentation.form.DepartmentInfoForm;
 import com.example.rhizome.app.presentation.form.EmployeeInfoForm;
 import com.example.rhizome.app.presentation.form.SearchConditionEmployeeForm;
 
@@ -33,8 +34,6 @@ public class SelectEmployeeController {
     // エラーメッセージ用の定数フィールド
     private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
 
-    public static final String SELECT_DEPARTMENT_FORM_EMPTY = "/selectDepartmentAll";
-
     HttpSession httpSession;
     SearchDepartment searchDepartment;
     SearchEmployeeInfo searchEmployeeInfo;
@@ -60,17 +59,16 @@ 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 {
 
-
             // 部署一覧を取得し、画面に返す用のクラスに詰め替える
             // 作成した部署一覧をセット
             model.addAttribute(
                     PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-                    DepartmentForm.convertFrom(searchDepartment.selectAll())
+                    DepartmentInfoForm.convertFrom(searchDepartment.selectAll())
             );
 
             // 検索条件を元に検索を実施
@@ -80,7 +78,6 @@ public class SelectEmployeeController {
             return TransitionTargetPageNameKeyword.SELECT_EMPLOYEE_HTML;
 
 
-            
         } catch (Exception e) {
             // ログイン情報の破棄
             httpSession.invalidate();
@@ -111,7 +108,7 @@ public class SelectEmployeeController {
         // 作成した部署一覧をセット
         model.addAttribute(
                 PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-                DepartmentForm.convertFrom(searchDepartment.selectAll())
+                DepartmentInfoForm.convertFrom(searchDepartment.selectAll())
         );
 
         // 検索条件を元に検索を実施

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

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

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

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

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

@@ -14,5 +14,6 @@ public class PageReturnAttributeKeyword {
 	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,7 +21,6 @@ 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 DEPARTMENT_HTML = "department";
 
 	public static final String ERROR_HTML = "error";
 
@@ -31,7 +30,6 @@ public class TransitionTargetPageNameKeyword {
 	public static final String INDEX_LOGIN = "/login";
 	public static final String LOGOUT = "/logout";
 	public static final String DO_LOGIN = "/doLogin";
-//    public static final String DEPARTMENT_HTML = "/department";
 
 	// 一般向け(Controller)
 	public static final String PERSONAL_UPDATE_RESULT = "/updatePersonalEmployeeResult";
@@ -46,23 +44,13 @@ 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 SHOW_DEPARTMENT = "/department";
-//    public static final String SELECT_DEPARTMENT = "/selectDepartment";
-    
-
-
-    
 
 	// Department
-    // HTML             実装手順書ステップ1-2通りの定数追加
+	// HTML
 	public static final String SELECT_DEPARTMENT_HTML = "selectDepartment";
-    
-    // Controller       実装手順書ステップ1-2通りの定数追加 -> 管理者向けと重複、エラーでたため一旦コメアウト
+	// Controller
 	public static final String SELECT_DEPARTMENT = "/selectDepartment";
-    
- // ステップ2-3*TransitionTargetPageNameKeyword の Department(Controller) の枠に追記
 	public static final String DELETE_DEPARTMENT = "/deleteDepartment";
-    
 	public static final String SELECT_DEPARTMENT_FORM_EMPTY = "/selectDepartmentAll";
 
 	/**
@@ -86,10 +74,7 @@ public class TransitionTargetPageNameKeyword {
 				SELECT_EMPLOYEE_INFO,
 				SELECT_EMPLOYEE_INFO_FORM_EMPTY,
 				SHOW_UPDATE_EMPLOYEE,
-                UPDATE_EMPLOYEE_RESULT,
-                SELECT_DEPARTMENT              
-            
-        );
+				UPDATE_EMPLOYEE_RESULT);
 	}
 
 	/**
@@ -104,9 +89,7 @@ public class TransitionTargetPageNameKeyword {
 				INDEX_LOGIN,
 				LOGOUT,
 				DO_LOGIN,
-                PERSONAL_UPDATE_RESULT,
-                SHOW_DEPARTMENT
-        );
+				PERSONAL_UPDATE_RESULT);
 	}
 
 }

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

@@ -1,21 +1,19 @@
 package com.example.rhizome.app.presentation.form;
 
-import java.util.List;
-
 import com.example.rhizome.app.domain.model.Department;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 /**
  * 画面の表示に使う部署コード管理用のクラス
  */
-//            部署のフォーム
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class DepartmentForm {
+public class DepartmentInfoForm {
     /**
      * 部署ID
      */
@@ -32,8 +30,8 @@ public class DepartmentForm {
      * @param department business 層の Department インスタンス
      * @return 画面用（presentation 層）の DepartmentForm インスタンス
      */
-    public static DepartmentForm convertFrom(Department department) {
-        return new DepartmentForm(department.getIdDepartment(), department.getNmDepartment());
+    public static DepartmentInfoForm convertFrom(Department department) {
+        return new DepartmentInfoForm(department.getIdDepartment(), department.getNmDepartment());
     }
 
     /**
@@ -43,7 +41,7 @@ public class DepartmentForm {
      * @param departmentList business 層の Department インスタンスのリスト
      * @return 画面用（presentation 層）の DepartmentForm インスタンスのリスト
      */
-    public static List<DepartmentForm> convertFrom(List<Department> departmentList) {
-        return departmentList.stream().map(DepartmentForm::convertFrom).toList();
+    public static List<DepartmentInfoForm> convertFrom(List<Department> departmentList) {
+        return departmentList.stream().map(DepartmentInfoForm::convertFrom).toList();
     }
 }

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

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

src/main/resources/application.properties

@@ -1,3 +1,3 @@
 spring.datasource.url=jdbc:mysql://localhost:3306/rezodb
-spring.datasource.username=rezouser1
-spring.datasource.password=Rezo_0001
+spring.datasource.username=rezouser
+spring.datasource.password=Rezo_0000

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

@@ -10,17 +10,6 @@
 	<link rel="stylesheet" th:href="@{/css/all.css}">
 	<link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
 	<title>メニュー</title>
-	    <style>
-			.container{
-				width: 100%;
-				overflow: hidden;
-			}
-			.column{
-				width: 48%;
-				float: left;
-				margin: 1%;
-			}
-		</style>
 
 </head>
 
@@ -36,7 +25,7 @@
 		<tr>
 			<td><a class="menuClass" href="javascript:selectEmployeeSubmit()"><i class="fas fa-search"></i> 社員検索 </a>
 			</td>
-        <td class="description">登録済みのユーザ一覧表示と更新、削除を行います。</td>
+			<td class="description">登録済みのユーザ一覧表示と</br>更新、削除を行います。</td>
 		</tr>
 
 		<tr>
@@ -44,19 +33,17 @@
 			<td class="description">新規でユーザ追加を行います。</td>
 		</tr>
 
+		<!--部署検索機能表示-->
 		<tr>
 			<td><a class="menuClass" href="javascript:selectDepartmentSubmit()"><i class="fas fa-search"></i> 部署検索 </a>
 			</td>
-	    <td class="description">登録済みの部署一覧表示と更新、削除を行います。</td>
-	</tr>
-	
-	<tr>
-	    <td><a class="menuClass" href="javascript:insertEmployeeSubmit()"><i class="fas fa-plus"></i> 部署登録 </a></td>
-	    <td class="description">新規で部署追加を行います。</td>
+			<td class="description">登録済みの部署一覧表示と</br>更新、削除を行います。</td>
 		</tr>
 
 	</table>
-</body>
+
+
+
 
 	<script type="text/javascript">
 		function selectEmployeeSubmit() {

src/main/resources/templates/selectDepartment.html

@@ -1,18 +1,6 @@
 <!DOCTYPE html>
-<!--<html>   HTML文書の開始タグ-->
-<!--<head>   ページの設定情報を含む部分-->
-<!--<title>  ページのタイトルを指定するタグ-->
-<!--<body>   実際に表示される内容を記述する部分-->
-<!--<h1>     見出し最大サイズ・<p>段落の基本タグ-->
-<!--<div>    汎用のブロック要素　複数の要素をまとめてレイアウトするためのコンテナ-->
-<!--<table>	 表全体を囲む-->
-<!--<tr>     行全体を囲む-->
-<!--<th>     行見出しセルを囲む-->
-<!--<td>     行データセルを囲む-->
-<!--<a href ="URL"> 飛び先のURLを指定"> -->
-	
-	
 <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>
@@ -20,6 +8,7 @@
 	<link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
 	<title>部署検索</title>
 </head>
+
 <body>
 	<h1>
 		部署検索条件入力　　　
@@ -40,7 +29,7 @@
 			</tr>
 			<tr>
 				<th class="header">部署名</th>
-            <td><input type="text" th:field="*{nmDepartment}"></td>
+				<td><input placeholder="部署名" th:field="*{nmDepartment}" type="text" /></td>
 			</tr>
 			<tr>
 				<td class="btnArea" colspan="2"><input type="submit" value="検索" /></td>
@@ -52,33 +41,50 @@
 	<a href="showMenu">メニューに戻る</a>
 	<h1><span>検索結果</span></h1>
 
-<!-- ★検索結果が1件以上：表(部署ID・部署名)を th:each で繰り返す。変数は departmentFormList -->
-
-<!--<table th:if="${departmentFormList != null and !departmentFromList.isEmpty()}">-->
-
-	<table th:each="departmentForm : ${departmentFormList}">
-
+	<!-- 【修正】th:ifのリスト名を controller と一致させる -->
+	<table class="table-grid table-striped table-hover"
+		th:if="${departmentFormList != null and departmentFormList.size() > 0}">
+		<thead>
 			<tr>
-	<th>部署ID</th>
-	<th>部署名</th>
+				<th style="width: 60px;">部署ID</th>
+				<th style="width: 100px;">部署名</th>
+				<th style="width: 150px;">操作</th>
 			</tr>
-<!--    <tr th:each="department:${departmentFormList}">-->
+		</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>
 
-<p th:if="${departmentFormList != null and departmentFormList.isEmpty()}">
-	検索結果はありません。
-</p>
-
+	<!-- 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 = '';
-        // ★部署名の入力欄も空にする（id は th:field が自動で作る）
-		
+		document.getElementById('nmDepartment').value = '';
 	}
 </script>
+
 </html>

src/main/resources/templates/selectEmployee.html

@@ -12,6 +12,7 @@
 	<title>検索</title>
 
 </head>
+
 <body>
 	<h1>
 		検索条件入力　　　
@@ -20,9 +21,7 @@
 			<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
 		</div>
 	</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">
 			<span class="error" th:text="${messageError.message}"></span>
@@ -31,34 +30,25 @@
 			<tr>
 				<th class="header">社員ID</th>
 				<td>
-                <input placeholder="社員ID"
-                       th:field="*{idEmployee}"
-                       type="number"/>
+					<input placeholder="社員ID" th:field="*{idEmployee}" type="number" />
 				</td>
 			</tr>
 			<tr>
 				<th class="header">社員名</th>
 				<td>
-                <input placeholder="社員名"
-                       th:field="*{nmEmployee}"
-                       type="text"/>
+					<input placeholder="社員名" th:field="*{nmEmployee}" type="text" />
 				</td>
 			</tr>
 			<tr>
 				<th class="header">社員名フリガナ</th>
 				<td>
-                <input oninput="convertToKatakana(this)"
-                       placeholder="フリガナ"
-                       th:field="*{knEmployee}"
-                       type="text"/>
+					<input oninput="convertToKatakana(this)" placeholder="フリガナ" th:field="*{knEmployee}" type="text" />
 				</td>
 			</tr>
 			<tr>
 				<th class="header">メールアドレス</th>
 				<td>
-                <input placeholder="メールアドレス"
-                       th:field="*{mailAddress}"
-                       type="email"/>
+					<input placeholder="メールアドレス" th:field="*{mailAddress}" type="email" />
 				</td>
 			</tr>
 			<tr>
@@ -68,8 +58,7 @@
 						<option value=""></option>
 						<option th:each="department : ${departmentFormList}"
 							th:selected="${searchConditionEmployeeForm.idDepartment != null && department.idDepartment == searchConditionEmployeeForm.idDepartment}"
-                            th:text="${department.nmDepartment}"
-                            th:value="${department.idDepartment}">
+							th:text="${department.nmDepartment}" th:value="${department.idDepartment}">
 						</option>
 					</select>
 				</td>
@@ -84,6 +73,7 @@
 			</tr>
 		</table>
 	</form>
+
 	<div class="header-spacing"></div>
 	<a href="showMenu">メニューに戻る</a>
 	<div class="header-spacing"></div>
@@ -142,16 +132,15 @@
 	</th:block>
 
 </body>
+
 <script type="text/javascript">
 
 	function clearInput() {
-        document.getElementById('idEmployee').value = '';
-        document.getElementById('nmEmployee').value = '';
-        document.getElementById('knEmployee').value = '';
-        document.getElementById('mailAddress').value = '';
-        document.getElementById('idDepartment').selectedIndex = 0;
+		document.getElementById('idDepartment').value = '';
+		document.getElementById('nmDepartment').value = '';
 	}
 
 
 </script>
+
 </html>