2段階_途中まで

.classpath

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

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

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

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

@@ -2,7 +2,6 @@ package com.example.rhizome.app.domain.service;
 
 import com.example.rhizome.app.domain.model.Department;
 
-
 public interface RegisterDepartment {
     void registerDepartment(Department department);
 }

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

@@ -1,26 +0,0 @@
-package com.example.rhizome.app.domain.service;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.example.rhizome.app.domain.model.Department;
-import com.example.rhizome.app.infra.entity.DepartmentEntity;
-import com.example.rhizome.app.infra.repository.DepartmentRepository;
-
-@Service
-@Transactional
-public class RegisterDepartmentImpl implements RegisterDepartment {
-	
-	DepartmentRepository departmentRepository;
-	
-	@Autowired
-	public RegisterDepartmentImpl(DepartmentRepository departmentRepository) {
-		this.departmentRepository = departmentRepository;
-	}
-	
-	public void registerDepartment(Department department) {
-		departmentRepository.save(DepartmentEntity.convertFrom(department));
-	}
-
-}

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

@@ -1,14 +1,17 @@
 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/SearchDepartmentInfo.java

@@ -1,12 +0,0 @@
-package com.example.rhizome.app.domain.service;
-
-import java.util.List;
-
-import com.example.rhizome.app.domain.model.Department;
-import com.example.rhizome.app.domain.model.SearchConditionDepartment;
-
-public interface SearchDepartmentInfo {
-	List<Department> selectAll();
-	
-	List<Department> searchBy(SearchConditionDepartment searchConditionDepartment);
-}

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

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

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

@@ -1,26 +1,22 @@
 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;
 
-@Service
-@Transactional
 public class DeleteDepartmentImpl implements DeleteDepartment {
+	 DepartmentRepository departmentRepository;
 
-	DepartmentRepository departmentRepository;
-	@Autowired
-	public DeleteDepartmentImpl(DepartmentRepository departmentRepository) {
-		this.departmentRepository = departmentRepository;
-	}
-	
-	
-	public void deleteDepartment(Integer idDepartment) {
-		departmentRepository.deleteById(idDepartment);
+	    @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/DeleteEmployeeImpl.java

@@ -1,11 +1,13 @@
 package com.example.rhizome.app.domain.service.impl;
 
-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;
 
+import com.example.rhizome.app.domain.service.DeleteEmployee;
+import com.example.rhizome.app.infra.repository.EmployeeRepository;
+
 /**
  * Employee レコード削除関連の機能を持つサービス
  */

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

@@ -1,13 +1,15 @@
 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,25 +1,29 @@
 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;
 
     /**
@@ -67,6 +71,7 @@ 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/UpdateDepartmentImpl.java

@@ -1,32 +0,0 @@
-package com.example.rhizome.app.domain.service.impl;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.example.rhizome.app.domain.model.Department;
-import com.example.rhizome.app.domain.service.UpdateDepartment;
-import com.example.rhizome.app.infra.entity.DepartmentEntity;
-import com.example.rhizome.app.infra.repository.DepartmentRepository;
-
-@Service
-@Transactional
-public class UpdateDepartmentImpl implements UpdateDepartment {
-
-	DepartmentRepository departmentRepository;
-	
-	@Autowired
-	public UpdateDepartmentImpl(DepartmentRepository departmentRepository) {
-		this.departmentRepository = departmentRepository;
-	}
-	
-	public void updateDepartment(Department beforeDepartment, Department updateDepertment) {
-		departmentRepository.save(DepartmentEntity.convertFrom(mergeDepartment(beforeDepartment,updateDepertment)));
-
-	}
-	
-	private Department mergeDepartment(Department beforeDepartment, Department updateDepartment) {
-		return new Department(updateDepartment.getIdDepartment(),updateDepartment.getNmDepartment());
-	}
-
-}

src/main/java/com/example/rhizome/app/infra/entity/EmployeeEntity.java

@@ -7,16 +7,23 @@
 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
  *
@@ -36,6 +43,7 @@ public class EmployeeEntity {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id_employee", nullable = false)
     private Integer idEmployee;
+    
 
     /**
      * 社員名
@@ -64,6 +72,7 @@ public class EmployeeEntity {
     /**
      * 管理者権限
      */
+//    @Transient
     @Column(name = "admin_auth", nullable = false)
     private Integer adminAuth;
 

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

@@ -1,11 +1,13 @@
 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:
@@ -19,11 +21,15 @@ import org.springframework.stereotype.Repository;
  * 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> にキャスト
@@ -33,7 +39,9 @@ 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/presentation/controller/DeleteDepartmentController.java

@@ -1,7 +1,5 @@
 package com.example.rhizome.app.presentation.controller;
 
-import java.util.List;
-import java.util.Objects;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -14,114 +12,61 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import com.example.rhizome.aop.aspect.PermissionCheck;
-import com.example.rhizome.aop.aspect.SessionCheck;
-import com.example.rhizome.app.domain.model.EmployeeInfo;
-import com.example.rhizome.app.domain.model.LoginUser;
-import com.example.rhizome.app.domain.model.SearchConditionEmployee;
 import com.example.rhizome.app.domain.service.DeleteDepartment;
 import com.example.rhizome.app.domain.service.SearchDepartment;
-import com.example.rhizome.app.domain.service.SearchEmployeeInfo;
+import com.example.rhizome.app.domain.service.SearchEmployee;
 import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
-import com.example.rhizome.app.presentation.controller.pageproperty.SessionKeyword;
 import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
 import com.example.rhizome.app.presentation.form.DepartmentForm;
-import com.example.rhizome.app.presentation.form.LoginUserForm;
-import com.example.rhizome.app.presentation.form.MessageForm;
 import com.example.rhizome.app.presentation.form.SearchConditionDepartmentForm;
 
 @Controller
 public class DeleteDepartmentController {
+	 private final static Logger LOGGER = Logger.getLogger(DeleteDepartmentController.class.getName());
+	    private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
 
-	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;
+	    }
 
-	private final HttpSession httpSession;
-	private final DeleteDepartment deleteDepartment;
-	private final SearchDepartment searchDepartment;
-	private final SearchEmployeeInfo searchEmployeeInfo;
+	    @RequestMapping(value = TransitionTargetPageNameKeyword.DELETE_DEPARTMENT, method = RequestMethod.POST)
+	    public String deleteDepartment(@RequestParam(value = "idDepartment", required = false) Integer idDepartment, Model model) {
 
-	@Autowired
-	public DeleteDepartmentController(DeleteDepartment deleteDepartment, SearchDepartment searchDepartment,
-			SearchEmployeeInfo searchEmployeeInfo, HttpSession httpSession) {
-		this.httpSession = httpSession;
-		this.deleteDepartment = deleteDepartment;
-		this.searchDepartment = searchDepartment;
-		this.searchEmployeeInfo = searchEmployeeInfo;
-	}
+	        final String UNKNOWN_ID = "削除対象のIDが不明です。";
+	        final String HAS_EMPLOYEE = "1名以上が所属している部署は削除出来ません。";
+	        final String DELETE_COMPLETE = "削除しました。";
 
-	@PermissionCheck
-	@SessionCheck
-	@RequestMapping(value = "/deleteDepartment", method = RequestMethod.POST)
-	public String deleteDepartment(@RequestParam(value = "idDepartment", required = false) Integer idDepartment,
-			Model model) {
+	        try {
+	            // ★① idDepartment が null、または searchDepartment.searchBy(new SearchConditionDepartment(idDepartment, null)) が空
+	            //     → MESSAGE_ERROR に UNKNOWN_ID を載せて一覧へ
+	        	deleteDepartment.deleteDepartment(idDepartment);
+	            // ★② 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());
 
-		try {
-			// 削除対象の部署IDが存在しない場合
-			if (idDepartment == null) {
-				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm("削除対象のIDが不明です。"));
-				model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-						DepartmentForm.convertFrom(searchDepartment.selectAll()));
-				return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
-			}
-
-			// ログインユーザー情報を取得
-			LoginUser loginUser = LoginUserForm
-					.convertTo((LoginUserForm) httpSession.getAttribute(SessionKeyword.LOGIN_USER));
-
-			// 削除バリデーションと削除の実行
-			deleteExec(model, idDepartment, loginUser);
-
-			// 最新の部署一覧を再取得してセット
-			model.addAttribute(
-					PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-					DepartmentForm.convertFrom(searchDepartment.selectAll()));
-			
-			model.addAttribute("searchConditionDepartmentForm", new SearchConditionDepartmentForm());
-
-			return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
-
-		} catch (Exception e) {
-			httpSession.invalidate();
-			e.printStackTrace();
-			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-			return TransitionTargetPageNameKeyword.ERROR_HTML;
-		}
-	}
-
-	private boolean deleteExec(Model model, Integer idDepartment, LoginUser loginUser) {
-		final String DELETE_TARGET_ID_CAN_NOT_DELETE = "ログイン者自身は削除出来ません。";
-		final String BELONG_EMPLOYEE_EXIST_ERROR = "1名以上が所属している部署は削除出来ません。";
-		final String DELETE_COMPLETE = "削除しました。";
-
-		// ログイン者自身の部署削除ブロック
-		if (loginUser != null && Objects.equals(loginUser.getIdDepartment(), idDepartment)) {
-			model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
-					new MessageForm(DELETE_TARGET_ID_CAN_NOT_DELETE));
-			return false;
-		}
-
-		SearchConditionEmployee searchCondition = new SearchConditionEmployee(
-				null,
-				null,
-				null,
-				null,
-				idDepartment);
-
-		// 社員検索サービスを呼び出す
-		List<EmployeeInfo> employeeList = searchEmployeeInfo.searchBy(searchCondition);
-
-		// 1件以上レコードが返ってきた（所属社員がいた）場合は削除を中断
-		if (employeeList != null && !employeeList.isEmpty()) {
-			model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(BELONG_EMPLOYEE_EXIST_ERROR));
-			return false;
-		}
-
-		// すべてのバリデーションチェックを通過したら削除を実施
-		deleteDepartment.deleteDepartment(idDepartment);
-
-		// 削除完了メッセージをセット（画面側のアラートボックスと連動）
-		model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(DELETE_COMPLETE));
-		return true;
-	}
+//	            return "一覧へ戻る（ステップ 2-5 で決める）";
+	        	return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
+	        } 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;
+	        }
+	    }
 }

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

@@ -1,95 +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.aop.aspect.PermissionCheck;
-import com.example.rhizome.aop.aspect.SessionCheck;
-import com.example.rhizome.app.domain.service.RegisterDepartment;
-import com.example.rhizome.app.domain.service.SearchDepartment;
-import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
-import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.DepartmentForm;
-import com.example.rhizome.app.presentation.form.InsertDepartmentForm;
-import com.example.rhizome.app.presentation.form.MessageForm;
-
-@Controller
-public class InsertDepartmentController {
-
-	private final static Logger LOGGER = Logger.getLogger(InsertDepartmentController.class.getName());
-	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
-
-	private final HttpSession httpSession;
-	private final RegisterDepartment registerDepartment;
-	private final SearchDepartment searchDepartment;
-
-	@Autowired
-	public InsertDepartmentController(HttpSession httpSession, RegisterDepartment registerDepartment,
-			SearchDepartment searchDepartment) {
-		this.httpSession = httpSession;
-		this.registerDepartment = registerDepartment;
-		this.searchDepartment = searchDepartment;
-	}
-
-	@ModelAttribute
-	public InsertDepartmentForm insertDepartmentForm() {
-		return new InsertDepartmentForm();
-	}
-
-	@PermissionCheck
-	@SessionCheck
-	@RequestMapping(value = "/insertDepartmentInput", method = RequestMethod.POST)
-	public String showInsertInput(@ModelAttribute("insertDepartmentForm") InsertDepartmentForm insertDepartmentForm) {
-		return TransitionTargetPageNameKeyword.INSERT_DEPARTMENT_INPUT_HTML;
-	}
-
-	@PermissionCheck
-	@SessionCheck
-	@RequestMapping(value = "/insertDepartmentConfirm", method = RequestMethod.POST)
-	public String confirmDepartment(@ModelAttribute("insertDepartmentForm") InsertDepartmentForm insertDepartmentForm,
-			Model model) {
-
-		List<String> error = insertDepartmentForm.validateParameter();
-
-		if (!error.isEmpty()) {
-			model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
-					new MessageForm(String.join(", ", error) + "が不正です。"));
-			return TransitionTargetPageNameKeyword.INSERT_DEPARTMENT_INPUT_HTML;
-		}
-
-		return TransitionTargetPageNameKeyword.INSERT_DEPARTMENT_CONFIRM_HTML;
-	}
-
-	@PermissionCheck
-	@SessionCheck
-	@RequestMapping(value = "/insertDepartment", method = RequestMethod.POST)
-	public String insertDepartment(@ModelAttribute("insertDepartmentForm") InsertDepartmentForm insertDepartmentForm,
-			Model model) {
-		try {
-			model.addAttribute(
-					PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-					DepartmentForm.convertFrom(searchDepartment.selectAll()));
-
-			registerDepartment.registerDepartment(InsertDepartmentForm.convertTo(insertDepartmentForm));
-
-			return TransitionTargetPageNameKeyword.INSERT_DEPARTMENT_RESULT_HTML;
-
-		} catch (Exception e) {
-			httpSession.invalidate();
-			e.printStackTrace();
-
-			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-			return TransitionTargetPageNameKeyword.ERROR_HTML;
-		}
-	}
-}

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

@@ -1,21 +1,5 @@
 package com.example.rhizome.app.presentation.controller;
 
-import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.*;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.servlet.http.HttpSession;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
 import com.example.rhizome.aop.aspect.PermissionCheck;
 import com.example.rhizome.aop.aspect.SessionCheck;
 import com.example.rhizome.app.domain.service.RegisterEmployee;
@@ -27,6 +11,20 @@ import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTa
 import com.example.rhizome.app.presentation.form.DepartmentForm;
 import com.example.rhizome.app.presentation.form.InsertEmployeeForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import javax.servlet.http.HttpSession;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.INSERT_EMPLOYEE;
 
 /**
  * 新規登録用のコントローラ
@@ -34,163 +32,167 @@ import com.example.rhizome.app.presentation.form.MessageForm;
 @Controller
 public class InsertEmployeeController {
 
-	// ログ出力用インスタンス
-	private final static Logger LOGGER = Logger.getLogger(InsertEmployeeController.class.getName());
+    // ログ出力用インスタンス
+    private final static Logger LOGGER = Logger.getLogger(InsertEmployeeController.class.getName());
 
-	// エラーメッセージ用の定数フィールド
-	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
+    // エラーメッセージ用の定数フィールド
+    private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
 
-	HttpSession httpSession;
-	RegisterEmployee registerEmployee;
-	SearchDepartment searchDepartment;
+    HttpSession httpSession;
+    RegisterEmployee registerEmployee;
+    SearchDepartment searchDepartment;
 
-	@Autowired
-	public InsertEmployeeController(HttpSession httpSession, RegisterEmployeeImpl registerEmployee,
-			SearchDepartmentImpl searchDepartment) {
-		this.httpSession = httpSession;
-		this.registerEmployee = registerEmployee;
-		this.searchDepartment = searchDepartment;
-	}
+    @Autowired
+    public InsertEmployeeController(HttpSession httpSession, RegisterEmployeeImpl registerEmployee, SearchDepartmentImpl searchDepartment) {
+        this.httpSession = httpSession;
+        this.registerEmployee = registerEmployee;
+        this.searchDepartment = searchDepartment;
+    }
 
-	@ModelAttribute
-	public InsertEmployeeForm insertEmployeeForm() {
-		return new InsertEmployeeForm();
-	}
+    @ModelAttribute
+    public InsertEmployeeForm insertEmployeeForm() {
+        return new InsertEmployeeForm();
+    }
 
-	/**
-	 * 新規登録画面表示処理
-	 *
-	 * @param insertEmployeeForm 登録情報
-	 * @param model              ビューにデータを渡すためのコンテナ
-	 * @return 遷移先の画面
-	 */
-	@PermissionCheck
-	@SessionCheck
-	@RequestMapping(value = INSERT_EMPLOYEE, method = RequestMethod.POST)
-	public String insertEmployee(InsertEmployeeForm insertEmployeeForm, Model model) {
+    /**
+     * 新規登録画面表示処理
+     *
+     * @param insertEmployeeForm 登録情報
+     * @param model              ビューにデータを渡すためのコンテナ
+     * @return 遷移先の画面
+     */
+    @PermissionCheck
+    @SessionCheck
+    @RequestMapping(value = INSERT_EMPLOYEE, method = RequestMethod.POST)
+    public String insertEmployee(InsertEmployeeForm insertEmployeeForm, Model model) {
 
-		try {
-			// 部署一覧を取得し、画面に返す用のクラスに詰め替える
-			// 作成した部署一覧をセット
-			model.addAttribute(
-					PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-					DepartmentForm.convertFrom(
-							searchDepartment.selectAll()));
+        try {
+            // 部署一覧を取得し、画面に返す用のクラスに詰め替える
+            // 作成した部署一覧をセット
+            model.addAttribute(
+                    PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+                    DepartmentForm.convertFrom(
+                            searchDepartment.selectAll()
+                    ));
 
-			// Confirm画面から渡ってきた値をチェック
-			List<String> error = validateParameter(
-					insertEmployeeForm.getNmEmployee(),
-					insertEmployeeForm.getKnEmployee(),
-					insertEmployeeForm.getMailAddress(),
-					insertEmployeeForm.getPassword(),
-					insertEmployeeForm.getAdminAuth(),
-					insertEmployeeForm.getIdDepartment());
+            // Confirm画面から渡ってきた値をチェック
+            List<String> error = validateParameter(
+                    insertEmployeeForm.getNmEmployee(),
+                    insertEmployeeForm.getKnEmployee(),
+                    insertEmployeeForm.getMailAddress(),
+                    insertEmployeeForm.getPassword(),
+                    insertEmployeeForm.getAdminAuth(),
+                    insertEmployeeForm.getIdDepartment()
+            );
 
-			// エラーが1件以上有る場合
-			if (!error.isEmpty()) {
-				// エラー内容を画面に表示
-				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
-						new MessageForm(String.join(", ", error) + "が不正です。"));
-				// 登録画面に遷移
-				return TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_INPUT_HTML;
-			}
+            // エラーが1件以上有る場合
+            if (!error.isEmpty()) {
+                // エラー内容を画面に表示
+                model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(String.join(", ", error) + "が不正です。"));
+                // 登録画面に遷移
+                return TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_INPUT_HTML;
+            }
 
-			// 登録処理
-			registerEmployee.registerEmployee(InsertEmployeeForm.convertTo(insertEmployeeForm));
-			// 登録結果画面に遷移
-			return TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_RESULT_HTML;
+            // 登録処理
+            registerEmployee.registerEmployee(InsertEmployeeForm.convertTo(insertEmployeeForm));
+            // 登録結果画面に遷移
+            return TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_RESULT_HTML;
 
-		} catch (Exception e) {
-			// ログイン情報の破棄
-			httpSession.invalidate();
+        } catch (Exception e) {
+            // ログイン情報の破棄
+            httpSession.invalidate();
 
-			e.printStackTrace();
+            e.printStackTrace();
 
-			// エラーログ出力
-			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-			// エラー画面遷移
-			return TransitionTargetPageNameKeyword.ERROR_HTML;
-		}
-	}
+            // エラーログ出力
+            LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
+            // エラー画面遷移
+            return TransitionTargetPageNameKeyword.ERROR_HTML;
+        }
+    }
 
-	/**
-	 * @param employeeName 登録対象の名前
-	 * @param employeeKana 登録対象のカナ
-	 * @param mailAddress  登録対象のメールアドレス
-	 * @param password     登録対象のパスワード
-	 * @param management   システム権限
-	 * @param departmentId 部署ID
-	 * @return エラーが有った場合はエラー文言、無ければ空のリストが返る
-	 */
-	private List<String> validateParameter(
-			String employeeName,
-			String employeeKana,
-			String mailAddress,
-			String password,
-			Integer management,
-			Integer departmentId) {
+    /**
+     * @param employeeName 登録対象の名前
+     * @param employeeKana 登録対象のカナ
+     * @param mailAddress  登録対象のメールアドレス
+     * @param password     登録対象のパスワード
+     * @param management   システム権限
+     * @param departmentId 部署ID
+     * @return エラーが有った場合はエラー文言、無ければ空のリストが返る
+     */
+    private List<String> validateParameter(
+            String employeeName,
+            String employeeKana,
+            String mailAddress,
+            String password,
+            Integer management,
+            Integer departmentId
+    ) {
 
-		final String EMPLOYEE_NAME_NULL_BLANK = "社員名";
-		final String EMPLOYEE_KANA_NULL_BLANK = "社員名フリガナ";
-		final String MAIL_ADDRESS_NULL_BLANK = "メールアドレス";
-		final String PASSWORD_NULL_BLANK = "パスワード";
-		final String MANAGEMENT_ERROR = "管理者権限指定";
-		final String DEPARTMENT_ID_NULL_BLANK = "所属部署";
+        final String EMPLOYEE_NAME_NULL_BLANK = "社員名";
+        final String EMPLOYEE_KANA_NULL_BLANK = "社員名フリガナ";
+        final String MAIL_ADDRESS_NULL_BLANK = "メールアドレス";
+        final String PASSWORD_NULL_BLANK = "パスワード";
+        final String MANAGEMENT_ERROR = "管理者権限指定";
+        final String DEPARTMENT_ID_NULL_BLANK = "所属部署";
 
-		List<String> error = new ArrayList<>();
+        List<String> error = new ArrayList<>();
 
-		// null or 空文字判定
-		if (isNullOrBlank(employeeName)) {
-			// エラー内容を追加
-			error.add(EMPLOYEE_NAME_NULL_BLANK);
-		}
+        // null or 空文字判定
+        if (isNullOrBlank(employeeName)) {
+            // エラー内容を追加
+            error.add(EMPLOYEE_NAME_NULL_BLANK);
+        }
 
-		// null or 空文字判定
-		if (isNullOrBlank(employeeKana)) {
-			// エラー内容を追加
-			error.add(EMPLOYEE_KANA_NULL_BLANK);
-		}
+        // null or 空文字判定
+        if (isNullOrBlank(employeeKana)) {
+            // エラー内容を追加
+            error.add(EMPLOYEE_KANA_NULL_BLANK);
+        }
 
-		// null or 空文字判定
-		if (isNullOrBlank(mailAddress)) {
-			// エラー内容を追加
-			error.add(MAIL_ADDRESS_NULL_BLANK);
-		}
+        // null or 空文字判定
+        if (isNullOrBlank(mailAddress)) {
+            // エラー内容を追加
+            error.add(MAIL_ADDRESS_NULL_BLANK);
+        }
 
-		// null or 空文字判定
-		if (isNullOrBlank(password)) {
-			// エラー内容を追加
-			error.add(PASSWORD_NULL_BLANK);
-		}
+        // null or 空文字判定
+        if (isNullOrBlank(password)) {
+            // エラー内容を追加
+            error.add(PASSWORD_NULL_BLANK);
+        }
 
-		// 管理者権限の値が不正か
-		if (management == null) {
-			// エラー内容を追加
-			error.add(MANAGEMENT_ERROR);
-		}
+        // 管理者権限の値が不正か
+        if (management == null) {
+            // エラー内容を追加
+            error.add(MANAGEMENT_ERROR);
+        }
 
-		// 所属部署の値が不正か
-		if (departmentId == null) {
-			// エラー内容を追加
-			error.add(DEPARTMENT_ID_NULL_BLANK);
-		}
+        // 所属部署の値が不正か
+        if (departmentId == null) {
+            // エラー内容を追加
+            error.add(DEPARTMENT_ID_NULL_BLANK);
+        }
 
-		return error;
+        return error;
 
-	}
+    }
 
-	/**
-	 * 仮引数を null or 空 判定する
-	 *
-	 * @param str 判定対象の文字列
-	 * @return true:null or 空 false:null or 空 では無い
-	 */
-	private static boolean isNullOrBlank(String str) {
-		if (null == str) {
-			return true;
-		}
+    /**
+     * 仮引数を null or 空 判定する
+     *
+     * @param str 判定対象の文字列
+     * @return true:null or 空 false:null or 空 では無い
+     */
+    private static boolean isNullOrBlank(String str) {
+        if (null == str) {
+            return true;
+        }
 
-		return str.isBlank();
-	}
+        return str.isBlank();
+    }
 
 }
+
+
+

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

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

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

@@ -0,0 +1,127 @@
+package com.example.rhizome.app.presentation.controller;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+//import java.util.List;
+
+import javax.servlet.http.HttpSession;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import com.example.rhizome.app.domain.service.SearchDepartment;
+import com.example.rhizome.app.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) {
+		this.httpSession = httpSession;
+		this.searchDepartment = serchDepartment;
+	}
+
+	//空の検索条件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 という名前で載せる
+			model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm
+					.convertFrom(searchDepartment.searchByWithLike(SearchConditionDepartmentForm
+							.convertTo(searchConditionDepartmentForm))));
+
+			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;
+		}
+	}
+
+	@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;
+
+		}
+
+	}
+}
+
+/**
+ * 社員検索画面表示処理コントローラ
+ *
+ * @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/SelectDepatmentController.java

@@ -1,81 +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.aop.aspect.PermissionCheck;
-import com.example.rhizome.aop.aspect.SessionCheck;
-import com.example.rhizome.app.domain.model.Department;
-import com.example.rhizome.app.domain.model.SearchConditionDepartment;
-import com.example.rhizome.app.domain.service.SearchDepartment;
-import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
-import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.DepartmentForm;
-import com.example.rhizome.app.presentation.form.SearchConditionDepartmentForm;
-
-@Controller
-public class SelectDepatmentController {
-	
-	// ログ出力用インスタンス
-    private final static Logger LOGGER = Logger.getLogger(SelectDepatmentController.class.getName());
-    // エラーメッセージ用の定数フィールド
-    private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
-
-    HttpSession httpSession;
-    SearchDepartment searchDepartment;
-    
-    @Autowired
-    public SelectDepatmentController(HttpSession httpSession, SearchDepartment searchDepartment) {
-    	this.httpSession = httpSession;
-    	this.searchDepartment = searchDepartment;
-    }
-    
-    @ModelAttribute
-    public SearchConditionDepartmentForm searchConditionDepartmentForm() {
-    	return new SearchConditionDepartmentForm();
-    }
-    
-    @PermissionCheck
-    @SessionCheck
-    @RequestMapping(value = "/selectDepartment", method = RequestMethod.POST)
-    public String select(@ModelAttribute("searchConditionDepartmentForm") SearchConditionDepartmentForm searchConditionDepartmentForm, Model model) {
-    	
-    	try {
-           
-            SearchConditionDepartment searchCondition = SearchConditionDepartmentForm.convertTo(searchConditionDepartmentForm);
-
-            
-            List<Department> departmentList = searchDepartment.searchBy(searchCondition);
-
-            
-            model.addAttribute(
-                    PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-                    DepartmentForm.convertFrom(departmentList)
-            );
-
-            
-            return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
-
-        } catch (Exception e) { 
-            // ログイン情報の破棄
-            httpSession.invalidate();
-
-            e.printStackTrace();
-
-            // エラーログ出力
-            LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-            // エラー画面遷移
-            return TransitionTargetPageNameKeyword.ERROR_HTML;
-        }
-    } 
-} 

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

@@ -1,5 +1,17 @@
 package com.example.rhizome.app.presentation.controller;
 
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.servlet.http.HttpSession;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
 import com.example.rhizome.aop.aspect.PermissionCheck;
 import com.example.rhizome.aop.aspect.SessionCheck;
 import com.example.rhizome.app.domain.service.SearchDepartment;
@@ -9,16 +21,6 @@ import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTa
 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;
 
 /**
  * 社員検索画面用コントローラ　リスト全件表示、検索表示、更新、削除が可能
@@ -30,6 +32,8 @@ public class SelectEmployeeController {
     private final static Logger LOGGER = Logger.getLogger(SelectEmployeeController.class.getName());
     // エラーメッセージ用の定数フィールド
     private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
+    
+    public static final String SELECT_DEPARTMENT_FORM_EMPTY = "/selectDepartmentAll";
 
     HttpSession httpSession;
     SearchDepartment searchDepartment;
@@ -60,6 +64,7 @@ public class SelectEmployeeController {
     public String select(SearchConditionEmployeeForm searchConditionEmployeeForm, Model model) {
 
         try {
+        	
 
             // 部署一覧を取得し、画面に返す用のクラスに詰め替える
             // 作成した部署一覧をセット
@@ -75,6 +80,7 @@ public class SelectEmployeeController {
             return TransitionTargetPageNameKeyword.SELECT_EMPLOYEE_HTML;
 
 
+            
         } catch (Exception e) {
             // ログイン情報の破棄
             httpSession.invalidate();

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

@@ -1,82 +0,0 @@
-package com.example.rhizome.app.presentation.controller;
-
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.servlet.http.HttpSession;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import com.example.rhizome.aop.aspect.PermissionCheck;
-import com.example.rhizome.aop.aspect.SessionCheck;
-import com.example.rhizome.app.domain.model.Department;
-import com.example.rhizome.app.domain.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.MessageForm;
-import com.example.rhizome.app.presentation.form.SearchConditionDepartmentForm;
-import com.example.rhizome.app.presentation.form.UpdateDepartmentInfoForm;
-
-@Controller
-public class UpdateDepartmentController {
-
-	// ログ出力用インスタンス
-	private final static Logger LOGGER = Logger.getLogger(UpdateDepartmentController.class.getName());
-	// エラーメッセージ用の定数フィールド
-	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
-
-	private final HttpSession httpSession;
-	private final SearchDepartment searchDepartment;
-
-	@Autowired
-	public UpdateDepartmentController(HttpSession httpSession, SearchDepartment searchDepartment) {
-		this.httpSession = httpSession;
-		this.searchDepartment = searchDepartment;
-
-	}
-
-	@ModelAttribute
-	public SearchConditionDepartmentForm searchConditionDepartmentForm() {
-		return new SearchConditionDepartmentForm();
-	}
-
-	@PermissionCheck
-	@SessionCheck
-	@RequestMapping(value = "/showUpdateDepartment", method = RequestMethod.POST)
-	public String showUpdateDepartment(@RequestParam("idDepartment") Integer idDepartment, Model model) {
-		final String UPDATE_TARGET_ID_NOT_FOUND = "更新対象のデータが見つかりません。";
-
-		try {
-
-			List<Department> departmentInfoList = searchDepartment.searchBy(
-					new SearchConditionDepartment(idDepartment, null));
-
-			if (departmentInfoList == null || departmentInfoList.isEmpty()) {
-				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
-						new MessageForm(UPDATE_TARGET_ID_NOT_FOUND));
-
-				return "forward:" + TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO_FORM_EMPTY;
-			}
-
-			model.addAttribute(PageReturnAttributeKeyword.UPDATE_DEPARTMENT_FORM,
-					UpdateDepartmentInfoForm.convertForm(departmentInfoList.get(0)));
-
-			return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
-
-		} catch (Exception e) {
-			httpSession.invalidate();
-			e.printStackTrace();
-			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-			return TransitionTargetPageNameKeyword.ERROR_HTML;
-		}
-	}
-
-}

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

@@ -1,116 +0,0 @@
-package com.example.rhizome.app.presentation.controller;
-
-import java.util.List;
-import java.util.Objects;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.servlet.http.HttpSession;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-import com.example.rhizome.aop.aspect.PermissionCheck;
-import com.example.rhizome.aop.aspect.SessionCheck;
-import com.example.rhizome.app.domain.model.Department;
-import com.example.rhizome.app.domain.model.SearchConditionDepartment;
-import com.example.rhizome.app.domain.service.SearchDepartment;
-import com.example.rhizome.app.domain.service.UpdateDepartment;
-import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
-import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.MessageForm;
-import com.example.rhizome.app.presentation.form.SearchConditionDepartmentForm;
-import com.example.rhizome.app.presentation.form.UpdateDepartmentInfoForm;
-
-@Controller
-public class UpdateDepartmentResultController {
-
-	// ログ出力用インスタンス
-	private final static Logger LOGGER = Logger.getLogger(UpdateDepartmentController.class.getName());
-	// エラーメッセージ用の定数フィールド
-	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
-
-	private final HttpSession httpSession;
-	private final SearchDepartment searchDepartment;
-	private final UpdateDepartment updateDepartment;
-
-	@Autowired
-	public UpdateDepartmentResultController(HttpSession httpSession, SearchDepartment searchDepartment,
-			UpdateDepartment updateDepartment) {
-		this.httpSession = httpSession;
-		this.searchDepartment = searchDepartment;
-		this.updateDepartment = updateDepartment;
-	}
-
-	@ModelAttribute
-	public SearchConditionDepartmentForm searchConditionDepartmentForm() {
-		return new SearchConditionDepartmentForm();
-	}
-
-	@PermissionCheck
-	@SessionCheck
-	@RequestMapping(value = "/updateDepartmentResult", method = RequestMethod.POST)
-	public String departmentUpdateResult(
-			@ModelAttribute("updateDepartmentInfoForm") UpdateDepartmentInfoForm updateDepartmentInfoForm,
-			Model model) {
-
-		final String NOTHING = "項目が空欄です。";
-		final String DUPLICATION = "既に同名の部署が存在するか、値が変更されていません。";
-		final String NO_TARGET = "更新対象のデータが見つかりません。";
-		final String UPDATE_COMPLETE = "更新が完了しました。";
-
-		try {
-
-			// 必須入力チェック
-			if (UpdateDepartmentInfoForm.hasErrorParameter(updateDepartmentInfoForm)) {
-				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(NOTHING));
-				return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
-			}
-
-			List<Department> beforeList = searchDepartment.searchBy(
-					new SearchConditionDepartment(updateDepartmentInfoForm.getIdDepartment(), null));
-
-			if (beforeList == null || beforeList.isEmpty()) {
-				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(NO_TARGET));
-				return "forward:/selectDepartment";
-			}
-			Department beforeDepartment = beforeList.get(0);
-			Department updateDepartmentData = UpdateDepartmentInfoForm.convertTo(updateDepartmentInfoForm);
-
-			if (Objects.equals(beforeDepartment.getNmDepartment(), updateDepartmentData.getNmDepartment())) {
-
-				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(DUPLICATION));
-				return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
-			}
-
-			List<Department> duplicationList = searchDepartment.searchBy(
-					new SearchConditionDepartment(null, updateDepartmentData.getNmDepartment()));
-
-			if (duplicationList != null && !duplicationList.isEmpty()) {
-
-				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(DUPLICATION));
-				model.addAttribute(PageReturnAttributeKeyword.UPDATE_DEPARTMENT_INFO_FORM, updateDepartmentInfoForm);
-				return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
-
-			}
-
-			// 更新を実行 ➔ forward
-			updateDepartment.updateDepartment(beforeDepartment, updateDepartmentData);
-
-			model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(UPDATE_COMPLETE));
-			return "forward:/selectDepartment";
-
-		} catch (
-
-		Exception e) {
-			httpSession.invalidate();
-			e.printStackTrace();
-			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-			return TransitionTargetPageNameKeyword.ERROR_HTML;
-		}
-	}
-}

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

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

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

@@ -17,15 +17,11 @@ public class TransitionTargetPageNameKeyword {
     // 管理者向け
     public static final String MENU_HTML = "menu";
     public static final String SELECT_EMPLOYEE_HTML = "selectEmployee";
-    public static final String SELECT_DEPARTMENT_HTML = "selectDepartment";
     public static final String INSERT_EMPLOYEE_INPUT_HTML = "insertEmployeeInput";
-    public static final String INSERT_DEPARTMENT_INPUT_HTML = "insertDepartmentInput";
     public static final String INSERT_EMPLOYEE_CONFIRM_HTML = "insertEmployeeConfirm";
-    public static final String INSERT_DEPARTMENT_CONFIRM_HTML = "insertDepartmentConfirm";
     public static final String INSERT_EMPLOYEE_RESULT_HTML = "insertEmployeeResult";
-    public static final String INSERT_DEPARTMENT_RESULT_HTML = "insertDepartmentResult";
     public static final String UPDATE_EMPLOYEE_INPUT_HTML = "updateEmployeeInput";
-    public static final String UPDATE_DEPARTMENT_INPUT_HTML = "updateDepartmentInput";
+    public static final String DEPARTMENT_HTML = "department";
 
     public static final String ERROR_HTML = "error";
 
@@ -35,6 +31,7 @@ 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";
@@ -49,20 +46,24 @@ 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
-    public static final String DELETE_DEPARTMENT = "/deleteDepartment";
-    public static final String INSERT_DEPARTMENT_INPUT = "/insertDepartmentInput";
-    public static final String INSERT_DEPARTMENT_CONFIRM = "/insertDepartmentConfirm";
-    public static final String INSERT_DEPARTMENT = "/insertDepartment";
-    public static final String SELECT_DEPARTMENT_INFO = "/selectDepartment";
-    public static final String SHOW_UPDATE_DEPARTMENT = "/showUpdateDepartment";
-    public static final String UPDATE_DEPARTMENT_RESULT = "/updateDepartmentResult";
-    public static final String SELECT_DEPARTMENT_INFO_FORM_EMPTY = "/selectDepartmentAll";
-   
+    // HTML             実装手順書ステップ1-2通りの定数追加
+    public static final String SELECT_DEPARTMENT_HTML = "selectDepartment";
     
-    // HTML
-    // Controller
+    // Controller       実装手順書ステップ1-2通りの定数追加 -> 管理者向けと重複、エラーでたため一旦コメアウト
+    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,15 +87,8 @@ public class TransitionTargetPageNameKeyword {
                 SELECT_EMPLOYEE_INFO_FORM_EMPTY,
                 SHOW_UPDATE_EMPLOYEE,
                 UPDATE_EMPLOYEE_RESULT,
-                
-                DELETE_DEPARTMENT,
-                INSERT_DEPARTMENT_INPUT,
-                INSERT_DEPARTMENT,
-                INSERT_DEPARTMENT_CONFIRM,
-                SELECT_DEPARTMENT_INFO,
-                SELECT_DEPARTMENT_INFO_FORM_EMPTY,
-                SHOW_UPDATE_DEPARTMENT,
-                UPDATE_DEPARTMENT_RESULT
+                SELECT_DEPARTMENT              
+            
         );
     }
 
@@ -110,7 +104,8 @@ public class TransitionTargetPageNameKeyword {
                 INDEX_LOGIN,
                 LOGOUT,
                 DO_LOGIN,
-                PERSONAL_UPDATE_RESULT
+                PERSONAL_UPDATE_RESULT,
+                SHOW_DEPARTMENT
         );
     }
 

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

@@ -1,15 +1,17 @@
 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

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

@@ -1,42 +0,0 @@
-package com.example.rhizome.app.presentation.form;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.example.rhizome.app.domain.model.Department;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class InsertDepartmentForm {
-
-	private String nmDepartment;
-
-	public static Department convertTo(InsertDepartmentForm insertDepartmentForm) {
-		return new Department(
-				null,
-				insertDepartmentForm.getNmDepartment());
-	}
-
-	private static boolean isNullOrBlank(String str) {
-		if (null == str) {
-			return true;
-		}
-
-		return str.isBlank();
-	}
-
-	public List<String> validateParameter() {
-		final String DEPARTMENT_NAME_NULL_BLANK = "部署名";
-
-		List<String> error = new ArrayList<>();
-		if (isNullOrBlank(nmDepartment)) {
-			error.add(DEPARTMENT_NAME_NULL_BLANK);
-		}
-		return error;
-	}
-}

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

@@ -1,4 +1,3 @@
-// 画面から渡ってきた検索条件をまとめ、再度画面に表示する為のクラス
 package com.example.rhizome.app.presentation.form;
 
 import com.example.rhizome.app.domain.model.SearchConditionDepartment;
@@ -7,24 +6,21 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+//          部署の検索条件
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 public class SearchConditionDepartmentForm {
-
+	//部署ID
 	private Integer idDepartment;
-
+	//部署名
 	private String nmDepartment;
-
-	public static SearchConditionDepartmentForm convertFrom(SearchConditionDepartment searchConditionDepartment) {
-		return new SearchConditionDepartmentForm(
-				searchConditionDepartment.getIdDepartment(),
-				searchConditionDepartment.getNmDepartment());
-	}
-
-	public static SearchConditionDepartment convertTo(SearchConditionDepartmentForm searchConditionDepartmentForm) {
+	
+	public static SearchConditionDepartment convertTo(SearchConditionDepartmentForm form) {
+		//SearchConditonDepartment();の中身：Formの2つの値を返す
 		return new SearchConditionDepartment(
-				searchConditionDepartmentForm.getIdDepartment(),
-				searchConditionDepartmentForm.getNmDepartment());
+				form.getIdDepartment(),
+				form.getNmDepartment()
+				);
 	}
 }

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

@@ -1,48 +0,0 @@
-package com.example.rhizome.app.presentation.form;
-
-import java.util.List;
-
-import com.example.rhizome.app.domain.model.Department;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class UpdateDepartmentInfoForm {
-
-	private Integer idDepartment;
-
-	private String nmDepartment;
-
-	public static UpdateDepartmentInfoForm convertForm(Department department) {
-		return new UpdateDepartmentInfoForm(
-				department.getIdDepartment(),
-				department.getNmDepartment());
-
-	}
-
-	public static List<UpdateDepartmentInfoForm> convertForm(List<Department> departmentList) {
-		return departmentList.stream().map(UpdateDepartmentInfoForm::convertForm).toList();
-	}
-
-	public static Department convertTo(UpdateDepartmentInfoForm updateDepartmentInfoForm) {
-		return new Department(
-				updateDepartmentInfoForm.getIdDepartment(),
-				updateDepartmentInfoForm.getNmDepartment());
-	}
-
-	public static boolean hasErrorParameter(UpdateDepartmentInfoForm updateDepartmentInfoForm) {
-
-		return isNullOrBlank(updateDepartmentInfoForm.getNmDepartment());
-	}
-
-	private static boolean isNullOrBlank(String str) {
-		if (null == str) {
-			return true;
-		}
-		return str.isBlank();
-	}
-}

src/main/resources/application.properties

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

src/main/resources/templates/insertDepartmentConfilm.html

@@ -1,73 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-	<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
-	<!-- 外部のスクリプトファイルを読み込む -->
-	<script th:src="@{/js/common.js}"></script>
-	<!-- CSSの読み込み -->
-	<link rel="stylesheet" th:href="@{/css/all.css}">
-	<link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
-	<title>登録内容確認</title>
-</head>
-
-<body>
-	<h1>登録内容確認　　　
-		<div class="rightSection">
-			<span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
-			<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
-		</div>
-	</h1>
-	<form action="/insertDepartment" id="insertForm" method="post" th:object="${insertDepartmentForm}">
-
-		<div class="msgBox error" th:if="${messageError != null}">
-			<span class="error" th:each="message : ${messageError.message}" th:text="${message}"></span>
-		</div>
-		<table>
-			<tr>
-				<th class="header">部署ID</th>
-				<td>
-					<label>
-						<input class="readOnly" name="idDepartment" readonly="readonly" type="text" value="自動で設定されます" />
-					</label>
-				</td>
-			</tr>
-			<tr>
-				<th class="header">部署名</th>
-				<td>
-					<label>
-						<input class="readOnly" th:field="*{nmDepartment}" readonly="readonly" type="text" />
-					</label>
-				</td>
-			</tr>
-			<tr>
-				<td class="btnArea" colspan="2">
-					<input type="submit" value="登録" />
-				</td>
-			</tr>
-		</table>
-		<a href="javascript:onClickEdit()">登録内容の編集</a>　|　<a href="showMenu">メニューに戻る</a>
-	</form>
-	<script type="text/javascript">
-		function onClickEdit() {
-			const form = document.getElementById('insertForm');
-			form.setAttribute('method', 'post');
-			form.setAttribute('action', '/insertDepartmentInput');
-
-			// 確認画面から編集画面に戻ってきたときのフラグ（未使用）
-			const inputField = document.createElement("input");
-			inputField.setAttribute("type", "hidden");
-			inputField.setAttribute("name", "backFlg");
-			inputField.setAttribute("value", "edit");
-
-			form.appendChild(inputField);
-
-			// フォームをDOMに追加
-			document.body.appendChild(form);
-
-			form.submit();
-		}
-	</script>
-</body>
-
-</html>

src/main/resources/templates/insertDepartmentInput.html

@@ -1,56 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-	<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
-	<!-- 外部のスクリプトファイルを読み込む -->
-	<script th:src="@{/js/common.js}"></script>
-	<!-- CSSの読み込み -->
-	<link rel="stylesheet" th:href="@{/css/all.css}">
-	<link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
-	<title>部署登録</title>
-</head>
-
-<body>
-	<h1>
-		部署登録　　　
-		<div class="rightSection">
-			<span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
-			<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
-		</div>
-	</h1>
-	<form action="/insertDepartmentConfirm" method="post" th:object="${insertDepartmentForm}">
-
-		<div class="msgBox error" th:if="${messageError} != null">
-			<span class="error" th:text="${messageError.message}"></span>
-		</div>
-
-		<table>
-			<tr>
-				<th class="header">部署ID</th>
-				<td>
-					<label>
-						<input class="readOnly" readonly="readonly" type="text" value="自動で設定されます" />
-					</label>
-				</td>
-			</tr>
-			<tr>
-				<th class="header">部署名</th>
-				<td>
-					<label>
-						<input maxlength="50" placeholder="部署名" required="required" th:field="*{nmDepartment}"
-							type="text" />
-					</label>
-				</td>
-			</tr>
-			<tr>
-				<td class="btnArea" colspan="2">
-					<input type="submit" value="登録確認" />
-				</td>
-			</tr>
-		</table>
-		<a href="showMenu">メニューに戻る</a>
-	</form>
-</body>
-
-</html>

src/main/resources/templates/menu.html

@@ -10,6 +10,17 @@
     <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>
 
@@ -25,21 +36,24 @@
     <tr>
         <td><a class="menuClass" href="javascript:selectEmployeeSubmit()"><i class="fas fa-search"></i> 社員検索 </a>
         </td>
-        <td class="description">登録済みのユーザ一覧表示と</br>更新、削除を行います。</td>
-		
-		<td><a class="menuClass" href="javascript:selectDepartmentSubmit()"><i class="fas fa-search"></i> 部署検索 </a></td>
-				<td class="description">登録済みの部署一覧表示と</br>更新、削除を行います。</td>
-		
-		
+        <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>
+    </tr>
+	
 	<tr>
-		<td><a class="menuClass" href="javascript:insertEmployeeSubmit()"><i class="fas fa-plus"></i> 社員登録 </a></td>
-				        <td class="description">新規でユーザ追加を行います。</td>
-		
-		<td><a class="menuClass" href="javascript:insertDepartmentSubmit()"><i class="fas fa-plus"></i> 部署登録 </a></td>
-				<td class="description">新規で部署を追加します。</td>
-        
-    </tr>
+	    <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>
+	</tr>
 
 </table>
 </body>

src/main/resources/templates/selectDepartment.html

@@ -1,112 +1,84 @@
 <!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>
-	<!-- CSSの読み込み -->
-	<link rel="stylesheet" th:href="@{/css/all.css}">
-	<link rel="stylesheet" th:href="@{/css/style.css}" type="text/css">
-	<title>検索</title>
+    <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}">
+<h1>
+    部署検索条件入力　　　
+    <div class="rightSection">
+        <span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
+        <button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
+    </div>
+</h1>
 
-		<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>
+<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 type="text" th:field="*{nmDepartment}"></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>
 
-					<input id="idDepartment" placeholder="部署ID" th:field="*{idDepartment}" type="number" />
-				</td>
-			</tr>
-			<tr>
-				<th class="header">部署名</th>
-				<td>
+<a href="showMenu">メニューに戻る</a>
+<h1><span>検索結果</span></h1>
 
-					<input id="nmDepartment" placeholder="部署名" th:field="*{nmDepartment}" type="text" />
-				</td>
-			</tr>
-			<tr>
-				<td class="btnArea" colspan="2">
-					<input type="submit" value="検索" />
-				</td>
-				<td class="btnArea" colspan="2">
+<!-- ★検索結果が1件以上：表(部署ID・部署名)を th:each で繰り返す。変数は departmentFormList -->
 
-					<button type="button" onclick="clearInput()">クリア</button>
-				</td>
-			</tr>
-		</table>
-	</form>
-	<div class="header-spacing"></div>
-	<a href="showMenu">メニューに戻る</a>
-	<div class="header-spacing"></div>
-	<h1><span>検索結果</span></h1>
-	<div class="header-spacing"></div>
-	<th:block th:if="${messageInfo != null}">
-		<script th:inline="javascript">
-			alert([[${messageInfo.message}]]);
-		</script>
-	</th:block>
-	<div class="header-spacing"></div>
+<!--<table th:if="${departmentFormList != null and !departmentFromList.isEmpty()}">-->
 
-	<th:block th:if="${departmentFormList != null and departmentFormList.size() > 0}">
-		<!-- 検索結果が1件以上ある場合 -->
-		<table class="table-grid table-striped table-hover">
-			<thead>
-				<tr>
-					<th style="width: 60px;">部署ID</th>
-					<th style="width: 100px;">部署名</th>
-					<th style="width: 150px;">操作</th>
-				</tr>
-			</thead>
-			<tbody>
-				<tr th:each="departmentForm : ${departmentFormList}">
-					<td th:text="${departmentForm.idDepartment}"></td>
-					<td th:text="${departmentForm.nmDepartment}"></td>
-					<td>
-						<!-- 更新フォーム -->
-						<form action="/updateDepartmentResult" 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>
+	<table th:each="departmentForm : ${departmentFormList}">
+
+<tr>
+	<th>部署ID</th>
+	<th>部署名</th>
+</tr>
+<!--    <tr th:each="department:${departmentFormList}">-->
+	    <td th:text="${departmentForm.idDepartment}"></td>
+	    <td th:text="${departmentForm.nmDepartment}"></td>
+    </tr>
+</table>
+
+<p th:if="${departmentFormList != null and departmentFormList.isEmpty()}">
+	検索結果はありません。
+</p>
 
-					</td>
-				</tr>
-			</tbody>
-		</table>
-	</th:block>
 
-	<th:block th:if="${departmentFormList == null or departmentFormList.size() == 0}">
-		<!-- 検索結果が0件の場合 -->
-		検索結果はありません。
-	</th:block>
 </body>
 <script type="text/javascript">
-
-	function clearInput() {
-		document.getElementById('idDepartment').value = '';
-		document.getElementById('nmDepartment').value = '';
-	}
-
+    function clearInput() {
+        document.getElementById('idDepartment').value = '';
+        // ★部署名の入力欄も空にする（id は th:field が自動で作る）
+		
+    }
 </script>
-
 </html>

src/main/resources/templates/updateDepartmentInput.html

@@ -1,77 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-	<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
-	<!-- 外部のスクリプトファイルを読み込む -->
-	<script th:src="@{/js/common.js}"></script>
-	<!-- CSSの読み込み -->
-	<link rel="stylesheet" th:href="@{/css/all.css}">
-	<link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
-	<title>部署情報更新</title>
-</head>
-
-<body>
-	<h1>
-		部署情報更新　　　
-		<div class="rightSection">
-			<span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
-			<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
-		</div>
-	</h1>
-	<form action="/updateDepartmentResult" method="post" onsubmit="return confirm('本当によろしいですか？');"
-		th:object="${updateDepartmentInfoForm}">
-		<div class="msgBox error" th:if="${messageError != null}">
-			<span class="error" th:each="message : ${messageError.message}" th:text="${message}"></span>
-		</div>
-		<table>
-			<tr>
-				<th class="header">部署ID</th>
-				<td>
-					<label>
-						<input class="readOnly" readonly="readonly" th:field="*{idDepartment}" type="text" />
-					</label>
-				</td>
-			</tr>
-			<tr>
-				<th class="header">部署名</th>
-				<td>
-					<label>
-						<input maxlength="50" placeholder="部署名" required="required" th:field="*{nmDepartment}"
-							type="text" />
-					</label>
-				</td>
-			</tr>
-			<tr>
-				<td class="btnArea" colspan="2">
-					<input type="submit" value="更新" />
-				</td>
-			</tr>
-		</table>
-	</form>
-	<a href="javascript:selectSubmit()">一覧に戻る</a>
-</body>
-
-<script>
-	function selectSubmit() {
-		const form = document.createElement('form');
-		form.setAttribute('method', 'post');
-		form.setAttribute('action', 'selectDepartment');
-
-		// 動的送信用のHidden
-		// 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
-		const inputField = document.createElement("input");
-		inputField.setAttribute("type", "hidden");
-		inputField.setAttribute("value", "selectAll");
-
-		form.appendChild(inputField);
-
-		// フォームをDOMに追加
-		document.body.appendChild(form);
-
-		form.submit();
-	}
-
-</script>
-
-</html>

src/main/resources/templates/updatePersonalEmployeeResult.html

@@ -3,40 +3,40 @@
 
 <head>
 
-	<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
-	<!-- 外部のスクリプトファイルを読み込む -->
-	<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>
+    <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>
-	<h2>更新が完了しました</h2>
-	<br />
-	<a href="javascript:backSubmit()">戻る</a>
+<h2>更新が完了しました</h2>
+<br/>
+<a href="javascript:backSubmit()">戻る</a>
 </body>
 
 <script type="text/javascript">
-	function backSubmit() {
-		const form = document.createElement('form');
-		form.setAttribute('method', 'post');
-		form.setAttribute('action', 'updatePersonalEmployeeResult');
+    function backSubmit() {
+        const form = document.createElement('form');
+        form.setAttribute('method', 'post');
+        form.setAttribute('action', 'updatePersonalEmployeeResult');
 
-		// 動的送信用のHidden
-		// 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
-		const inputField = document.createElement("input");
-		inputField.setAttribute("type", "hidden");
-		inputField.setAttribute("value", "updatePersonalEmployeeResult");
+        // 動的送信用のHidden
+        // 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
+        const inputField = document.createElement("input");
+        inputField.setAttribute("type", "hidden");
+        inputField.setAttribute("value", "updatePersonalEmployeeResult");
 
-		form.appendChild(inputField);
+        form.appendChild(inputField);
 
-		// フォームをDOMに追加
-		document.body.appendChild(form);
+        // フォームをDOMに追加
+        document.body.appendChild(form);
 
-		form.submit();
-	}
+        form.submit();
+    }
 </script>
 
 </html>