2段階_途中まで

.classpath

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="optional" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="test" value="true"/>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" 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="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>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

.gitignore

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

.project

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

.settings/.jsdtscope

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,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/impl/DeleteDepartmentImpl.java

@@ -0,0 +1,22 @@
+package com.example.rhizome.app.domain.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.example.rhizome.app.domain.service.DeleteDepartment;
+import com.example.rhizome.app.infra.repository.DepartmentRepository;
+
+public class DeleteDepartmentImpl implements DeleteDepartment {
+	 DepartmentRepository departmentRepository;
+
+	    @Autowired
+	    public DeleteDepartmentImpl(DepartmentRepository departmentRepository) {
+	        this.departmentRepository = departmentRepository;
+	    }
+
+	    public void deleteDepartment(Integer idDepartment) {
+	        // ★考える：Repository のどのメソッドで「IDを指定して削除」できる？
+	        //          （お手本の DeleteEmployeeImpl を見る）
+	    	departmentRepository.deleteById(idDepartment);
+	    }
+
+}

src/main/java/com/example/rhizome/app/domain/service/impl/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/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
  *
@@ -37,6 +44,7 @@ public class EmployeeEntity {
     @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

@@ -0,0 +1,72 @@
+package com.example.rhizome.app.presentation.controller;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.servlet.http.HttpSession;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import com.example.rhizome.app.domain.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;
+
+@Controller
+public class DeleteDepartmentController {
+	 private final static Logger LOGGER = Logger.getLogger(DeleteDepartmentController.class.getName());
+	    private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
+
+	    HttpSession httpSession;
+	    DeleteDepartment deleteDepartment;
+	    SearchDepartment searchDepartment;
+	    SearchEmployee searchEmployee;   // 所属社員の確認に使う（既存）
+	    
+        //コンストラクタ
+	    @Autowired
+	    public DeleteDepartmentController(HttpSession httpSession, DeleteDepartment deleteDepartment,
+	                                      SearchDepartment searchDepartment, SearchEmployee searchEmployee) {
+	        this.httpSession = httpSession;
+	        this.deleteDepartment = deleteDepartment;
+	        this.searchDepartment = searchDepartment;
+	        this.searchEmployee = searchEmployee;
+	    }
+
+	    @RequestMapping(value = TransitionTargetPageNameKeyword.DELETE_DEPARTMENT, method = RequestMethod.POST)
+	    public String deleteDepartment(@RequestParam(value = "idDepartment", required = false) Integer idDepartment, Model model) {
+
+	        final String UNKNOWN_ID = "削除対象のIDが不明です。";
+	        final String HAS_EMPLOYEE = "1名以上が所属している部署は削除出来ません。";
+	        final String DELETE_COMPLETE = "削除しました。";
+
+	        try {
+	            // ★① idDepartment が null、または searchDepartment.searchBy(new SearchConditionDepartment(idDepartment, null)) が空
+	            //     → MESSAGE_ERROR に UNKNOWN_ID を載せて一覧へ
+	        	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());
+
+//	            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/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/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;
 
 /**
  * 社員検索画面用コントローラ　リスト全件表示、検索表示、更新、削除が可能
@@ -31,6 +33,8 @@ 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;
@@ -61,6 +65,7 @@ public class SelectEmployeeController {
 
         try {
         	
+
             // 部署一覧を取得し、画面に返す用のクラスに詰め替える
             // 作成した部署一覧をセット
             model.addAttribute(
@@ -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/pageproperty/TransitionTargetPageNameKeyword.java

@@ -21,6 +21,7 @@ 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";
 
@@ -30,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";
@@ -44,10 +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
-    // HTML
-    // Controller
+    // HTML             実装手順書ステップ1-2通りの定数追加
+    public static final String SELECT_DEPARTMENT_HTML = "selectDepartment";
+    
+    // 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";
 
     /**
      * 管理者向けのページリストを返す
@@ -70,7 +86,9 @@ public class TransitionTargetPageNameKeyword {
                 SELECT_EMPLOYEE_INFO,
                 SELECT_EMPLOYEE_INFO_FORM_EMPTY,
                 SHOW_UPDATE_EMPLOYEE,
-                UPDATE_EMPLOYEE_RESULT
+                UPDATE_EMPLOYEE_RESULT,
+                SELECT_DEPARTMENT              
+            
         );
     }
 
@@ -86,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/SearchConditionDepartmentForm.java

@@ -0,0 +1,26 @@
+package com.example.rhizome.app.presentation.form;
+
+import com.example.rhizome.app.domain.model.SearchConditionDepartment;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+//          部署の検索条件
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class SearchConditionDepartmentForm {
+	//部署ID
+	private Integer idDepartment;
+	//部署名
+	private String nmDepartment;
+	
+	public static SearchConditionDepartment convertTo(SearchConditionDepartmentForm form) {
+		//SearchConditonDepartment();の中身：Formの2つの値を返す
+		return new SearchConditionDepartment(
+				form.getIdDepartment(),
+				form.getNmDepartment()
+				);
+	}
+}

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/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,7 +36,7 @@
     <tr>
         <td><a class="menuClass" href="javascript:selectEmployeeSubmit()"><i class="fas fa-search"></i> 社員検索 </a>
         </td>
-        <td class="description">登録済みのユーザ一覧表示と</br>更新、削除を行います。</td>
+        <td class="description">登録済みのユーザ一覧表示と更新、削除を行います。</td>
     </tr>
 
     <tr>
@@ -33,6 +44,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>
+	</tr>
+
 </table>
 </body>
 

src/main/resources/templates/selectDepartment.html

@@ -0,0 +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>
+    <link rel="stylesheet" th:href="@{/css/all.css}">
+    <link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
+    <title>部署検索</title>
+</head>
+<body>
+<h1>
+    部署検索条件入力　　　
+    <div class="rightSection">
+        <span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
+        <button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
+    </div>
+</h1>
+
+<form action="selectDepartment" method="post" th:object="${searchConditionDepartmentForm}">
+    <div class="msgBox error" th:if="${messageError} != null">
+        <span class="error" th:text="${messageError.message}"></span>
+    </div>
+    <table>
+        <tr>
+            <th class="header">部署ID</th>
+            <td><input placeholder="部署ID" th:field="*{idDepartment}" type="number"/></td>
+        </tr>
+        <tr>
+            <th class="header">部署名</th>
+            <td><input 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>
+
+<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}">
+
+<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>
+
+
+</body>
+<script type="text/javascript">
+    function clearInput() {
+        document.getElementById('idDepartment').value = '';
+        // ★部署名の入力欄も空にする（id は th:field が自動で作る）
+		
+    }
+</script>
+</html>