second stept

.classpath

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

.gitignore

@@ -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.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</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=disabled
+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

build.cmd

@@ -1,5 +0,0 @@
-@echo off
-setlocal
-cd /d "%~dp0"
-call mvnw.cmd clean install %*
-endlocal

pom.xml

@@ -17,9 +17,14 @@
     <description>Demo project for Spring Boot</description>
     <properties>
         <java.version>17</java.version>
-        <lombok.version>1.18.34</lombok.version>
     </properties>
     <dependencies>
+    	<dependency>
+	    	<groupId>org.projectlombok</groupId>
+    		<artifactId>lombok</artifactId>
+    		<version>1.18.30</version>
+    		<scope>provided</scope>
+		</dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
@@ -57,6 +62,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-validation</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>

run.cmd

@@ -1,5 +0,0 @@
-@echo off
-setlocal
-cd /d "%~dp0"
-call mvnw.cmd spring-boot:run %*
-endlocal

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

@@ -1,25 +1,14 @@
 package com.example.rhizome.app.domain.service;
 
+import com.example.rhizome.app.domain.model.Department;
+import com.example.rhizome.app.domain.model.SearchConditionDepartment;
+
 import java.util.List;
 
-import com.example.rhizome.app.domain.model.Department;
-import com.example.rhizome.app.domain.model.Employee;
-import com.example.rhizome.app.domain.model.LoginUser;
-import com.example.rhizome.app.domain.model.SearchConditionDepartment;
-
 public interface SearchDepartment {
+    List<Department> selectAll();
 
-	List<Department> searchDepartmentBynmDepartment(String nmDepartment);
+    List<Department> searchBy(SearchConditionDepartment searchConditionDepartment);
-
-	List<Department> searchDepartmentByIdDepartment(Integer idDepartment);
-
-	// これはなにをしている？　SearchEmployeeより
-	LoginUser searchLoginUser(String mailAddress);
-
-	Employee searchEmployeeByIdEmployee(Integer idEmployee);
-
-	List<Department> selectAll();
-
-	List<Department> searchByWithLike(SearchConditionDepartment condition);
 
+    List<Department> searchByWithLike(SearchConditionDepartment searchConditionDepartment);
 }

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

@@ -0,0 +1,42 @@
+package com.example.rhizome.app.domain.service;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+
+import com.example.rhizome.app.domain.model.Department;
+import com.example.rhizome.app.domain.model.SearchConditionDepartment;
+import com.example.rhizome.app.infra.entity.DepartmentEntity;
+import com.example.rhizome.app.infra.repository.DepartmentRepository;
+
+@Service
+public class SearchDepartmentImpl implements SearchDepartment {
+
+    @Autowired
+    private DepartmentRepository departmentRepository;
+
+    @Override
+    public List<Department> selectAll() {
+        return DepartmentEntity.createDepartmentList(departmentRepository.findAll());
+    }
+
+    @Override
+    public List<Department> searchBy(SearchConditionDepartment searchConditionDepartment) {
+        Specification<DepartmentEntity> spec = Specification
+                .where(DepartmentRepository.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
+                .and(DepartmentRepository.nmDepartmentEqual(searchConditionDepartment.getNmDepartment()));
+
+        return DepartmentEntity.createDepartmentList(departmentRepository.findAll(spec));
+    }
+
+    @Override
+    public List<Department> searchByWithLike(SearchConditionDepartment searchConditionDepartment) {
+        Specification<DepartmentEntity> spec = Specification
+                .where(DepartmentRepository.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
+                .and(DepartmentRepository.nmDepartmentLike(searchConditionDepartment.getNmDepartment()));
+
+        return DepartmentEntity.createDepartmentList(departmentRepository.findAll(spec));
+    }
+}

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

@@ -1,20 +1,17 @@
 package com.example.rhizome.app.domain.service.impl;
 
 
-import java.util.List;
+import com.example.rhizome.app.domain.model.Department;
-
+import com.example.rhizome.app.domain.model.SearchConditionDepartment;
+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 com.example.rhizome.app.domain.model.Department;
+import java.util.List;
-import com.example.rhizome.app.domain.model.Employee;
-import com.example.rhizome.app.domain.model.LoginUser;
-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;
 
 /**
  * 部署情報検索系の機能を集約させるサービスクラスです。
@@ -82,28 +79,4 @@ public class SearchDepartmentImpl implements SearchDepartment {
                 );
 
     }
-
-	@Override
-	public List<Department> searchDepartmentBynmDepartment(String nmDepartment) {
-		// TODO 自動生成されたメソッド・スタブ
-		return null;
-	}
-
-	@Override
-	public List<Department> searchDepartmentByIdDepartment(Integer idDepartment) {
-		// TODO 自動生成されたメソッド・スタブ
-		return null;
-	}
-
-	@Override
-	public LoginUser searchLoginUser(String mailAddress) {
-		// TODO 自動生成されたメソッド・スタブ
-		return null;
-	}
-
-	@Override
-	public Employee searchEmployeeByIdEmployee(Integer idEmployee) {
-		// TODO 自動生成されたメソッド・スタブ
-		return null;
-	}
 }

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

@@ -1,21 +1,6 @@
 package com.example.rhizome.app.presentation.controller;
 
 
-import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.*;
-
-import java.util.Objects;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-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.aop.aspect.PermissionCheck;
 import com.example.rhizome.aop.aspect.SessionCheck;
 import com.example.rhizome.app.domain.model.LoginUser;
@@ -27,9 +12,22 @@ import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTa
 import com.example.rhizome.app.presentation.form.DepartmentForm;
 import com.example.rhizome.app.presentation.form.LoginUserForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
+import org.springframework.beans.factory.annotation.Autowired;
+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 javax.servlet.http.HttpSession;
+import java.util.Objects;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.DELETE_EMPLOYEE;
 
 /**
- * 削除処理のコントローラ
+ * 削除処理のコントロータ
  */
 @Controller
 public class DeleteEmployeeController {

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

@@ -1,132 +1,133 @@
-//package com.example.rhizome.app.presentation.controller;
+package com.example.rhizome.app.presentation.controller;
-//
+
-//import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.*;
+import com.example.rhizome.aop.aspect.PermissionCheck;
-//
+import com.example.rhizome.aop.aspect.SessionCheck;
-//import java.util.List;
+import com.example.rhizome.app.domain.model.Employee;
-//import java.util.logging.Level;
+import com.example.rhizome.app.domain.service.SearchDepartment;
-//import java.util.logging.Logger;
+import com.example.rhizome.app.domain.service.SearchEmployee;
-//
+import com.example.rhizome.app.domain.service.impl.SearchDepartmentImpl;
-//import javax.servlet.http.HttpSession;
+import com.example.rhizome.app.domain.service.impl.SearchEmployeeImpl;
-//
+import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
-//import org.springframework.beans.factory.annotation.Autowired;
+import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-//import org.springframework.stereotype.Controller;
+import com.example.rhizome.app.presentation.form.DepartmentForm;
-//import org.springframework.ui.Model;
+import com.example.rhizome.app.presentation.form.InsertEmployeeForm;
-//import org.springframework.web.bind.annotation.ModelAttribute;
+import com.example.rhizome.app.presentation.form.MessageForm;
-//import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.stereotype.Controller;
-//
+import org.springframework.ui.Model;
-//import com.example.rhizome.aop.aspect.PermissionCheck;
+import org.springframework.web.bind.annotation.ModelAttribute;
-//import com.example.rhizome.aop.aspect.SessionCheck;
+import org.springframework.web.bind.annotation.RequestMapping;
-//import com.example.rhizome.app.domain.model.Employee;
+import org.springframework.web.bind.annotation.RequestMethod;
-//import com.example.rhizome.app.domain.service.SearchDepartment;
+
-//import com.example.rhizome.app.domain.service.SearchEmployee;
+import javax.servlet.http.HttpSession;
-//import com.example.rhizome.app.domain.service.impl.SearchDepartmentImpl;
+import java.util.List;
-//import com.example.rhizome.app.domain.service.impl.SearchEmployeeImpl;
+import java.util.logging.Level;
-//import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
+import java.util.logging.Logger;
-//import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
+
-//import com.example.rhizome.app.presentation.form.DepartmentForm;
+import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_CONFIRM;
-//import com.example.rhizome.app.presentation.form.InsertEmployeeForm;
+
-//import com.example.rhizome.app.presentation.form.MessageForm;
+/**
-//
+ * 新規登録者情報チェック用のコントローラ
-///**
+ */
-// * 新規登録者情報チェック用のコントローラ
+@Controller
-// */
+public class InsertEmployeeConfirmController {
-//@Controller
+
-//public class InsertEmployeeConfirmController {
+    // ログ出力用インスタンス
-//
+    private final static Logger LOGGER = Logger.getLogger(InsertEmployeeConfirmController.class.getName());
-//    // ログ出力用インスタンス
+
-//    private final static Logger LOGGER = Logger.getLogger(InsertEmployeeConfirmController.class.getName());
+    // エラーメッセージ用の定数フィールド
-//
+    private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
-//    // エラーメッセージ用の定数フィールド
+
-//    private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
+    HttpSession httpSession;
-//
+    SearchDepartment searchDepartment;
-//    HttpSession httpSession;
+    SearchEmployee searchEmployee;
-//    SearchDepartment searchDepartment;
+
-//    SearchEmployee searchEmployee;
+    @Autowired
-//
+    public InsertEmployeeConfirmController(
-//    @Autowired
+            HttpSession httpSession,
-//    public InsertEmployeeConfirmController(
+            SearchDepartmentImpl searchDepartment,
-//            HttpSession httpSession,
+            SearchEmployeeImpl searchEmployee
-//            SearchDepartmentImpl searchDepartment,
+    ) {
-//            SearchEmployeeImpl searchEmployee
+        this.httpSession = httpSession;
-//    ) {
+        this.searchDepartment = searchDepartment;
-//        this.httpSession = httpSession;
+        this.searchEmployee = searchEmployee;
-//        this.searchDepartment = searchDepartment;
+    }
-//        this.searchEmployee = searchEmployee;
+
-//    }
+    @ModelAttribute
-//
+    public InsertEmployeeForm insertEmployeeForm() {
-//    @ModelAttribute
+        return new InsertEmployeeForm();
-//    public InsertEmployeeForm insertEmployeeForm() {
+    }
-//        return new InsertEmployeeForm();
+
-//    }
+    /**
-//
+     * 登録情報のチェックを行う
-//    /**
+     *
-//     * 登録情報のチェックを行う
+     * @param insertEmployeeForm 登録情報
-//     *
+     * @param model              ビューにデータを渡すためのコンテナ
-//     * @param insertEmployeeForm 登録情報
+     * @return 遷移先の画面
-//     * @param model              ビューにデータを渡すためのコンテナ
+     */
-//     * @return 遷移先の画面
+    @PermissionCheck
-//     */
+    @SessionCheck
-//    @PermissionCheck
+    @RequestMapping(value = INSERT_EMPLOYEE_CONFIRM, method = RequestMethod.POST)
-//    @SessionCheck
+    public String insertEmployeeConfirm(InsertEmployeeForm insertEmployeeForm, Model model) {
-//    @RequestMapping(value = INSERT_EMPLOYEE_CONFIRM, method = RequestMethod.POST)
+
-//    public String insertEmployeeConfirm(InsertEmployeeForm insertEmployeeForm, Model model) {
+        try {
-//
+            // 部署一覧を取得し、画面に返す用のクラスに詰め替える
-//        try {
+            // 作成した部署一覧をセット
-//            // 部署一覧を取得し、画面に返す用のクラスに詰め替える
+            model.addAttribute(
-//            // 作成した部署一覧をセット
+                    PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-//            model.addAttribute(
+                    DepartmentForm.convertFrom(
-//                    PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+                            searchDepartment.selectAll()
-//                    DepartmentForm.convertFrom(
+                    ));
-//                            searchDepartment.selectAll()
+
-//                    ));
+            // 登録用パラメータチェック
-//
+            List<String> error = insertEmployeeForm.validateParameter();
-//            // 登録用パラメータチェック
+
-//            List<String> error = insertEmployeeForm.validateParameter();
+            // 入力内容に誤りがあるか
-//
+            if (!error.isEmpty()) {
-//            // 入力内容に誤りがあるか
+                // 誤りがあった場合
-//            if (!error.isEmpty()) {
+                // 誤りがあった箇所のエラーメッセージを表示
-//                // 誤りがあった場合
+                model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(String.join(", ", error) + "が不正です。"));
-//                // 誤りがあった箇所のエラーメッセージを表示
+                // 画面に返す為の登録情報をセット
-//                model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(String.join(", ", error) + "が不正です。"));
+                model.addAttribute(PageReturnAttributeKeyword.INSERT_EMPLOYEE_FORM, insertEmployeeForm);
-//                // 画面に返す為の登録情報をセット
+                // 登録画面に遷移
-//                model.addAttribute(PageReturnAttributeKeyword.INSERT_EMPLOYEE_FORM, insertEmployeeForm);
+                return TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_INPUT_HTML;
-//                // 登録画面に遷移
+            }
-//                return TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_INPUT_HTML;
+
-//            }
+            final String DUPLICATION = "既に登録済みのメールアドレスです。";
-//
+
-//            final String DUPLICATION = "既に登録済みのメールアドレスです。";
+            // 登録対象のメールアドレスを元に検索
-//
+            List<Employee> employeeList = searchEmployee.searchEmployee(insertEmployeeForm.getMailAddress());
-//            // 登録対象のメールアドレスを元に検索
+
-//            List<Employee> employeeList = searchEmployee.searchEmployee(insertEmployeeForm.getMailAddress());
+            // 検索結果があるか
-//
+            if (!employeeList.isEmpty()) {
-//            // 検索結果があるか
+                // 検索した結果0件ではない場合
-//            if (!employeeList.isEmpty()) {
+                // 重複を許さないため、エラー処理
-//                // 検索した結果0件ではない場合
+                model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(DUPLICATION));
-//                // 重複を許さないため、エラー処理
+                // 画面に返す為の登録情報をセット
-//                model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(DUPLICATION));
+                model.addAttribute(PageReturnAttributeKeyword.INSERT_EMPLOYEE_FORM, insertEmployeeForm);
-//                // 画面に返す為の登録情報をセット
+                // 登録画面に遷移
-//                model.addAttribute(PageReturnAttributeKeyword.INSERT_EMPLOYEE_FORM, insertEmployeeForm);
+                return TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_INPUT_HTML;
-//                // 登録画面に遷移
+            }
-//                return TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_INPUT_HTML;
+
-//            }
+            // 登録確認ページに遷移
-//
+            model.addAttribute(PageReturnAttributeKeyword.INSERT_EMPLOYEE_FORM, insertEmployeeForm);
-//            // 登録確認ページに遷移
+            // 登録確認画面に遷移
-//            model.addAttribute(PageReturnAttributeKeyword.INSERT_EMPLOYEE_FORM, insertEmployeeForm);
+            return TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_CONFIRM_HTML;
-//            // 登録確認画面に遷移
+
-//            return TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_CONFIRM_HTML;
+
-//
+        } catch (Exception e) {
-//
+            // ログイン情報の破棄
-//        } catch (Exception e) {
+            httpSession.invalidate();
-//            // ログイン情報の破棄
+
-//            httpSession.invalidate();
+            e.printStackTrace();
-//
+
-//            e.printStackTrace();
+            // エラーログ出力
-//
+            LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-//            // エラーログ出力
+            // エラー画面遷移
-//            LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
+            return TransitionTargetPageNameKeyword.ERROR_HTML;
-//            // エラー画面遷移
+        }
-//            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;
 
 /**
  * 新規登録用のコントローラ
@@ -195,3 +193,6 @@ public class InsertEmployeeController {
     }
 
 }
+
+
+

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

@@ -0,0 +1,39 @@
+package com.example.rhizome.app.presentation.controller;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+
+import com.example.rhizome.app.domain.model.Department;
+import com.example.rhizome.app.domain.service.SearchDepartment;
+import com.example.rhizome.app.presentation.form.DepartmentForm;
+import com.example.rhizome.app.presentation.form.SearchConditionDepartmentForm;
+
+@Controller
+public class SelectDepartmentController {
+
+    @Autowired
+    private SearchDepartment searchDepartment;
+
+    /** 部署検索画面の初期表示 */
+    @GetMapping("/showSelectDepartment")
+    public String showSelectDepartment(@ModelAttribute SearchConditionDepartmentForm searchConditionDepartmentForm) {
+        return "department/selectDepartment";
+    }
+
+    /** 部署検索処理 */
+    @PostMapping("/selectDepartment")
+    public String selectDepartment(@ModelAttribute SearchConditionDepartmentForm searchConditionDepartmentForm, Model model) {
+        List<Department> departmentList = searchDepartment.searchByWithLike(
+                SearchConditionDepartmentForm.convertTo(searchConditionDepartmentForm)
+        );
+
+        model.addAttribute("departmentFormList", DepartmentForm.convertFrom(departmentList));
+        return "department/selectDepartment";
+    }
+}

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

@@ -14,7 +14,5 @@ public class PageReturnAttributeKeyword {
     public static final String LOGIN_INFO_FORM = "loginInfoForm";
     public static final String UPDATE_PERSONAL_EMPLOYEE_USER_FORM = "updatePersonalEmployeeUserForm";
     public static final String EMPLOYEE_INFO_FORM_LIST = "employeeInfoFormList";
-    
-	public static final String DEPARTMENT_INFO_FORM_LIST = "departmentInfoFormList";
 
 }

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

@@ -45,20 +45,10 @@ public class TransitionTargetPageNameKeyword {
     public static final String SHOW_UPDATE_EMPLOYEE = "/showUpdateEmployee";
     public static final String UPDATE_EMPLOYEE_RESULT = "/updateEmployeeResult";
 
-	public static final String SELECT_DEPARTMENT_INFO = "/selectEmployeeInfo";
-	public static final String SELECT_DEPARTMENT_INFO_FORM_EMPTY = "/selectAll";
-
-	public static final String DELETE_DEPARTMENT = "/deleteDepartment";
-
-
     // Department
     // HTML
-	public static final String SELECT_DEPARTMENT_HTML = "selectDepartment";
-	
     // Controller
-	public static final String SELECT_DEPARTMENT = "/selectDepartment";
+
-	public static final String SELECT_DEPARTMENT_FORM_EMPTY = "/selectDepartmentAll";
-	
     /**
      * 管理者向けのページリストを返す
      *

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

@@ -0,0 +1,36 @@
+package com.example.rhizome.app.presentation.form;
+
+import com.example.rhizome.app.domain.model.SearchConditionDepartment;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 部署検索条件用のFormクラス
+ */
+@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 form) {
+        return new SearchConditionDepartment(
+                form.getIdDepartment(),
+                form.getNmDepartment()
+        );
+    }
+}

src/main/resources/templates/menu.html

@@ -32,18 +32,6 @@
         <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:selectDepartmentSubmit()"><i class="fas fa-search"></i> 部署検索 </a>
-		</td>
-		<td class="description">登録済みの部署一覧表示と</br>更新、削除を行います。</td>
-	</tr>
-	<tr>
-		<td><a class="menuClass" href="javascript:selectDepartmentSubmit()"><i class="fas fa-search"></i> 部署登録 </a>
-		</td>
-		<td class="description">新規で部署追加を行います。</td>
-	</tr>
 
 </table>
 </body>

src/main/resources/templates/selectDepartment.html

@@ -1,78 +1,78 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org">
-
 <head>
-	<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
+    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
-	<script th:src="@{/js/common.js}"></script>
+    <script th:src="@{/js/common.js}"></script>
-	<link rel="stylesheet" th:href="@{/css/all.css}">
+    <link rel="stylesheet" th:href="@{/css/all.css}">
-	<link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
+    <link rel="stylesheet" th:href="@{/css/style.css}" type="text/css">
-	<title>部署検索</title>
+    <title>部署検索</title>
 </head>
-
 <body>
-	<h1>
+<h1>
-		部署検索条件入力　　　
+    部署検索条件入力
-		<div class="rightSection">
+    <div class="rightSection">
-			<span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
+        <span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
-			<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
+        <button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
-		</div>
+    </div>
-	</h1>
+</h1>
 
-	<form action="selectDepartment" method="post" th:object="${searchConditionDepartmentForm}">
+<form action="selectDepartment" method="post" th:object="${searchConditionDepartmentForm}">
-		<div class="msgBox error" th:if="${messageError} != null">
+    <table>
-			<span class="error" th:text="${messageError.message}"></span>
+        <tr>
-		</div>
+            <th class="header">部署ID</th>
-		<table>
+            <td>
-			<tr>
+                <input id="idDepartment" placeholder="部署ID" th:field="*{idDepartment}" type="number"/>
-				<th class="header">部署ID</th>
+            </td>
-				<td>
+        </tr>
-					<input placeholder="部署ID" th:field="*{idDepartment}" type="number" />
+        <tr>
-				</td>
+            <th class="header">部署名</th>
-			</tr>
+            <td>
-			<tr>
+                <input id="nmDepartment" placeholder="部署名" th:field="*{nmDepartment}" type="text"/>
-				<th class="header">部署名</th>
+            </td>
-				<!-- ★部署名の入力欄（type="text"）を作る -->
+        </tr>
-				<td>
+        <tr>
-					<input placeholder="部署名" th:field="*{nmDepartment}" type="text" />
+            <td class="btnArea" colspan="2">
-				</td>
+                <input type="submit" value="検索"/>
-			</tr>
+            </td>
-			<tr>
+            <td class="btnArea" colspan="2">
-				<td class="btnArea" colspan="2"><input type="submit" value="検索" /></td>
+                <button type="button" onclick="clearInput()">クリア</button>
-				<td class="btnArea" colspan="2"><button onclick="clearInput()">クリア</button></td>
+            </td>
-			</tr>
+        </tr>
-		</table>
+    </table>
-	</form>
+</form>
 
-	<a href="showMenu">メニューに戻る</a>
+<div class="header-spacing"></div>
-	<h1><span>検索結果</span></h1>
+<a href="showMenu">メニューに戻る</a>
+<div class="header-spacing"></div>
+<h1><span>検索結果</span></h1>
+<div class="header-spacing"></div>
 
-	<!-- ★検索結果が1件以上：表(部署ID・部署名)を th:each で繰り返す。変数は departmentFormList -->
+<th:block th:if="${departmentFormList != null and departmentFormList.size() > 0}">
-	<!-- departmentFormListから要素を順番に取り出す -->
+    <table class="table-grid table-striped table-hover">
-	<div th:if="${departmentFormList !=null and departmentFormList.size()> 0}">
+        <thead>
+        <tr>
+            <th style="width: 100px;">部署ID</th>
+            <th style="width: 200px;">部署名</th>
+        </tr>
+        </thead>
+        <tbody>
+        <tr th:each="departmentForm : ${departmentFormList}">
+            <td th:text="${departmentForm.idDepartment}"></td>
+            <td th:text="${departmentForm.nmDepartment}"></td>
+        </tr>
+        </tbody>
+    </table>
+</th:block>
 
-		<table>
+<th:block th:if="${departmentFormList == null or departmentFormList.size() == 0}">
-			<tr>
+    検索結果はありません。
-<!--				<th>部署ID</th>-->
+</th:block>
-				<th>部署名</th>
-			</tr>
 
-			<!-- 検索結果を1件ずつ取り出して表示 -->
-			<tr th:each="departmentForm : ${departmentFormList}">
-<!--				<td th:text="${departmentForm.idDepartment}"></td>-->
-				<td th:text="${departmentForm.nmDepartment}"></td>
-			</tr>
-		</table>
-
-	</div>
-
-</body>
 <script type="text/javascript">
-
+    function clearInput() {
-	<!--  ★部署名の入力欄も空にする（id は th:field が自動で作る） -->
+        document.getElementById('idDepartment').value = '';
-	function clearInput() {
+        document.getElementById('nmDepartment').value = '';
-		document.getElementById('idDepartment').value = '';
+    }
-		document.getElementById('nmDepartment').value = '';
-	}
 </script>
-
+</body>
 </html>

src/main/resources/templates/selectEmployee.html

@@ -14,7 +14,7 @@
 </head>
 <body>
 <h1>
-    検索条件入力　　　
+    検索条件入力</h1>
     <div class="rightSection">
         <span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
         <button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>

src/main/resources/templates/updateDepartmentInput.html

@@ -1,12 +0,0 @@
-// 実装手順書より
-
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="UTF-8">
-<title>Insert title here</title>
-</head>
-<body>
-
-</body>
-</html>