[ADD] 第一段階まで完了しました。

.gitignore

@@ -1,4 +0,0 @@
-/target/
-/bin/
-.classpath
-.project

.settings/.jsdtscope

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -15,7 +15,15 @@ public class SearchConditionDepartment {
     private final Integer idDepartment;
     /**
      * 部署名
+     * 
      */
     private final String nmDepartment;
     
+    
+    
+	public static SearchConditionDepartment convertTo(SearchConditionDepartment searchConditionDepartment) {
+		// TODO 自動生成されたメソッド・スタブ
+		return null;
+	}
+
 }

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

@@ -1,10 +1,10 @@
 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();
 

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

@@ -0,0 +1,7 @@
+package com.example.rhizome.app.domain.service;
+
+public interface SearchDepartmentInfo {
+//    List<DepartmentInfo> selectAll();
+//
+//    List<DepartmentInfo> searchBy(SearchConditionEmployee searchConditionEmployee);
+}

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

@@ -0,0 +1,57 @@
+//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 org.springframework.transaction.annotation.Transactional;
+//
+//import com.example.rhizome.app.domain.model.EmployeeInfo;
+//import com.example.rhizome.app.domain.model.SearchConditionEmployee;
+//import com.example.rhizome.app.infra.entity.EmployeeDepartmentEntity;
+//import com.example.rhizome.app.infra.repository.EmployeeInfoRepository;
+//
+//@Service
+//@Transactional
+//public class SearchDepartmentInfoImpl implements SearchDepartmentInfo{
+//
+//	DepartmentInfoRepository departmentInfoRepository;
+//
+//	    @Autowired
+//	    public SearchDepartmentInfoImpl(EmployeeInfoRepository employeeInfoRepository) {
+//	        this.departmentInfoRepository = departmentInfoRepository;
+//	    }
+//
+//
+//	    /**
+//	     * EmployeeInfo (employee join department) のレコードを全件取得
+//	     *
+//	     * @return 取得したレコード全件
+//	     */
+//	    public List<DepartmentInfo> selectAll() {
+//
+//	        return EmployeeDepartmentEntity.createEmployeeInfoList(departmentInfoRepository.findAll());
+//
+//	    }
+//
+//	    /**
+//	     * SearchConditionEmployee の情報を元に EmployeeInfo (employee join department) のレコードを取得
+//	     *
+//	     * @param searchConditionEmployee 検索条件
+//	     * @return 検索結果のレコードリスト
+//	     */
+//	    public List<DepartmentInfo> searchBy(SearchConditionEmployee searchConditionEmployee) {
+//	        // 動的に検索条件を絞り込む
+//	        // Specification は Criteria API の Predicate をラップしたもの
+//	        return EmployeeDepartmentEntity
+//	                .createEmployeeInfoList(
+//	                        employeeInfoRepository.findAll(Specification
+//	                                .where(EmployeeInfoRepository.idEmployeeEqual(searchConditionEmployee.getIdEmployee()))
+//	                                .and(EmployeeInfoRepository.nmEmployeeEqual(searchConditionEmployee.getNmEmployee()))
+//	                               
+//	                        )
+//	                );
+//
+//	    }
+//	}

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

@@ -1,18 +1,17 @@
 package com.example.rhizome.app.domain.service.impl;
 
 
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.example.rhizome.app.domain.model.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;
 
 /**
  * 部署情報検索系の機能を集約させるサービスクラスです。
@@ -55,7 +54,7 @@ public class SearchDepartmentImpl implements SearchDepartment {
                 .createDepartmentList(
                         departmentRepository.findAll(Specification
                                 .where(DepartmentRepository.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
-                                .and(DepartmentRepository.nmDepartmentLike(searchConditionDepartment.getNmDepartment()))
+                                .and(DepartmentRepository.nmDepartmentEqual(searchConditionDepartment.getNmDepartment()))
                         )
                 );
 

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

@@ -1,86 +0,0 @@
-package com.example.rhizome.app.presentation.controller;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.servlet.http.HttpSession;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.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;
-import com.example.rhizome.app.domain.service.SearchDepartment;
-import com.example.rhizome.app.domain.service.impl.RegisterEmployeeImpl;
-import com.example.rhizome.app.domain.service.impl.SearchDepartmentImpl;
-import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.InsertEmployeeForm;
-
-/**
- * 新規登録用のコントローラ
- */
-@Controller
-public class InsertDepartmentController {
-
-    // ログ出力用インスタンス
-    private final static Logger LOGGER = Logger.getLogger(InsertDepartmentController.class.getName());
-
-    // エラーメッセージ用の定数フィールド
-    private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
-
-    HttpSession httpSession;
-    RegisterEmployee registerEmployee;
-    SearchDepartment searchDepartment;
-
-    @Autowired
-    public InsertDepartmentController(HttpSession httpSession, RegisterEmployeeImpl registerEmployee, SearchDepartmentImpl searchDepartment) {
-        this.httpSession = httpSession;
-        this.registerEmployee = registerEmployee;
-        this.searchDepartment = searchDepartment;
-    }
-
-    @ModelAttribute
-    public InsertEmployeeForm insertEmployeeForm() {
-        return new InsertEmployeeForm();
-    }
-
-    /**
-     * 新規登録画面表示処理
-     *
-     * @param insertEmployeeForm 登録情報
-     * @param model              ビューにデータを渡すためのコンテナ
-     * @return 遷移先の画面
-     */
-    @PermissionCheck
-    @SessionCheck
-    @RequestMapping(value = TransitionTargetPageNameKeyword.INSERT_DEPARTMENT, method = RequestMethod.POST)
-    public String insertEmployee(InsertEmployeeForm insertEmployeeForm, Model model) {
-
-        try {
-
-            // 登録結果画面に遷移
-            return TransitionTargetPageNameKeyword.INSERT_DEVELOPMENT_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/InsertDepartmentInputController.java

@@ -0,0 +1,85 @@
+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.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;
+import com.example.rhizome.app.domain.service.SearchDepartment;
+import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
+import com.example.rhizome.app.presentation.form.InsertEmployeeForm;
+
+
+/**
+ * 登録画面表示用コントローラ
+ */
+@Controller
+public class InsertDepartmentInputController {
+
+
+	    // ログ出力用インスタンス
+	    private final static Logger LOGGER = Logger.getLogger(InsertEmployeeInputController.class.getName());
+
+	    // エラーメッセージ用の定数フィールド
+	    private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
+
+	    HttpSession httpSession;
+	    RegisterEmployee registerEmployee;
+	    SearchDepartment searchDepartment;
+
+	    @Autowired
+	    public InsertDepartmentInputController(HttpSession httpSession, RegisterEmployee registerEmployee, SearchDepartment searchDepartment) {
+	        this.httpSession = httpSession;
+	        this.registerEmployee = registerEmployee;
+	        this.searchDepartment = searchDepartment;
+	    }
+
+	    @ModelAttribute
+	    public InsertEmployeeForm insertEmployeeForm() {
+	        return new InsertEmployeeForm();
+	    }
+
+
+	    /**
+	     * 登録画面表示処理
+	     *
+	     * @param insertEmployeeForm 登録画面のフォーム
+	     * @param model              ビューにデータを渡すためのコンテナ
+	     * @return 遷移先の画面
+	     */
+	    @SessionCheck
+	    @PermissionCheck
+	    @RequestMapping(value = INSERT_DEPARTMENT_INPUT, method = RequestMethod.POST)
+	    public String insertInput() {
+
+	        try {
+	            
+	        	
+
+	            // 登録画面に遷移
+	            return TransitionTargetPageNameKeyword.INSERT_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/SelectDepartmentController.java

@@ -14,20 +14,20 @@ 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.SearchConditionDepartment;
 import com.example.rhizome.app.domain.service.SearchDepartment;
 import com.example.rhizome.app.domain.service.SearchEmployeeInfo;
 import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
 import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
 import com.example.rhizome.app.presentation.form.DepartmentForm;
+import com.example.rhizome.app.presentation.form.SearchConditionDepartmentForm;
+
 
-/**
- * 社員検索画面用コントローラ　リスト全件表示、検索表示、更新、削除が可能
- */
 @Controller
 public class SelectDepartmentController {
 
 	// ログ出力用インスタンス
-    private final static Logger LOGGER = Logger.getLogger(SelectDepartmentController.class.getName());
+    private final static Logger LOGGER = Logger.getLogger(SelectEmployeeController.class.getName());
     // エラーメッセージ用の定数フィールド
     private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
 
@@ -43,38 +43,38 @@ public class SelectDepartmentController {
     }
 
     @ModelAttribute
-    public DepartmentForm departmentForm() {
-        return new DepartmentForm();
+    public SearchConditionDepartmentForm searchConditionDepartmentForm() {
+        return new SearchConditionDepartmentForm();
     }
 
+    
     /**
-     * 社員検索画面表示処理コントローラ
+     * 部署検索画面表示処理コントローラ
      *
      * @param searchConditionEmployeeForm 検索画面のフォーム
      * @param model                       ビューにデータを渡すためのコンテナ
      * @return 遷移先の画面
      */
+    
     @PermissionCheck
     @SessionCheck
-    @RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT, method = RequestMethod.POST)
-    public String select(DepartmentForm departmentForm, Model model) {
+    @RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO, method = RequestMethod.POST)
+    public String select(SearchConditionDepartment searchConditionDepartment, Model model) {
 
         try {
+
             // 部署一覧を取得し、画面に返す用のクラスに詰め替える
             // 作成した部署一覧をセット
-        	System.out.println(departmentForm);
-            model.addAttribute(
-                    PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-                    DepartmentForm.convertFrom(searchDepartment.selectAll())
-            );
-           System.out.println(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST);
-           System.out.println(DepartmentForm.convertFrom(searchDepartment.selectAll()));
-           System.out.println(model.getAttribute("departmentFormList"));
+//            model.addAttribute(
+//                    PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+//                    DepartmentForm.convertFrom(searchDepartment.selectAll())
+//            );
 
             // 検索条件を元に検索を実施
-           // 取得した  department の情報を画面に返す用の型に詰め替えてセット
-           model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(searchDepartment.searchBy(DepartmentForm.convertTo(departmentForm))));
-
+            // 取得した EmployeeInfo（ employee + department ）の情報を画面に返す用の型に詰め替えてセット
+            model.addAttribute(
+            		PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+            		DepartmentForm.convertFrom(searchDepartment.searchByWithLike(searchConditionDepartment)));
             // 検索ページに遷移
             return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
 
@@ -95,4 +95,38 @@ public class SelectDepartmentController {
     
     
     
+    @PermissionCheck
+    @SessionCheck
+    @RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT, method = RequestMethod.POST)
+    public String select1(SearchConditionDepartment searchConditionDepartment, Model model) {
+
+        try {
+
+        	 model.addAttribute(
+                     PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+                     DepartmentForm.convertFrom(searchDepartment.selectAll())
+             );
+        	 
+            // 検索ページに遷移
+            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

@@ -72,7 +72,9 @@ public class SelectEmployeeController {
 
             // 検索条件を元に検索を実施
             // 取得した EmployeeInfo（ employee + department ）の情報を画面に返す用の型に詰め替えてセット
-            model.addAttribute(PageReturnAttributeKeyword.EMPLOYEE_INFO_FORM_LIST, EmployeeInfoForm.convertFrom(searchEmployeeInfo.searchBy(SearchConditionEmployeeForm.convertTo(searchConditionEmployeeForm))));
+            model.addAttribute(
+            		PageReturnAttributeKeyword.EMPLOYEE_INFO_FORM_LIST,
+            		EmployeeInfoForm.convertFrom(searchEmployeeInfo.searchBy(SearchConditionEmployeeForm.convertTo(searchConditionEmployeeForm))));
             // 検索ページに遷移
             return TransitionTargetPageNameKeyword.SELECT_EMPLOYEE_HTML;
 

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

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

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

@@ -21,7 +21,7 @@ public class TransitionTargetPageNameKeyword {
     public static final String INSERT_EMPLOYEE_INPUT_HTML = "insertEmployeeInput";
     public static final String INSERT_EMPLOYEE_CONFIRM_HTML = "insertEmployeeConfirm";
     public static final String INSERT_EMPLOYEE_RESULT_HTML = "insertEmployeeResult";
-    public static final String INSERT_DEVELOPMENT_INPUT_HTML = "insertDevelopmentInput";
+    public static final String INSERT_DEPARTMENT_INPUT_HTML = "/insertDepartmentInput";
     public static final String UPDATE_EMPLOYEE_INPUT_HTML = "updateEmployeeInput";
 
     public static final String ERROR_HTML = "error";
@@ -38,21 +38,17 @@ public class TransitionTargetPageNameKeyword {
 
     // 管理者向け(Controller)
     public static final String DELETE_EMPLOYEE = "/deleteEmployee";
-//    public static final String DELETE_DEPARTMENT = "/deleteDepartment";
     public static final String INSERT_EMPLOYEE_INPUT = "/insertEmployeeInput";
     public static final String INSERT_EMPLOYEE_CONFIRM = "/insertEmployeeConfirm";
     public static final String INSERT_EMPLOYEE = "/insertEmployee";
-    public static final String INSERT_DEPARTMENT = "/insertDepartmentInput";
-//    public static final String INSERT_DEPARTMENT_INPUT = "/selectDepartmentInfo";
-//    public static final String INSERT_DEPARTMENT_CONFIRM = "/selectDepartmentConfirm";
+    public static final String INSERT_DEPARTMENT_INPUT = "/insertDepartmentInput";
     public static final String SHOW_MENU = "/showMenu";
     public static final String SELECT_EMPLOYEE_INFO = "/selectEmployeeInfo";
+    public static final String SELECT_DEPARTMENT = "/selectDepartment";
+    public static final String SELECT_DEPARTMENT_INFO = "/selectDepartmentInfo";
     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 SELECT_DEPARTMENT = "/selectDepartment";
-    public static final String SELECT_DEPARTMENT_INFO_FORM_EMPTY = "/selectDepartmentAll";
-    
 
     // Department
     // HTML
@@ -75,10 +71,11 @@ public class TransitionTargetPageNameKeyword {
                 INSERT_EMPLOYEE_INPUT,
                 INSERT_EMPLOYEE_CONFIRM,
                 INSERT_EMPLOYEE,
-                INSERT_DEPARTMENT,
+                INSERT_DEPARTMENT_INPUT,
                 SHOW_MENU,
                 SELECT_EMPLOYEE_INFO,
                 SELECT_DEPARTMENT,
+                SELECT_DEPARTMENT_INFO,
                 SELECT_EMPLOYEE_INFO_FORM_EMPTY,
                 SHOW_UPDATE_EMPLOYEE,
                 UPDATE_EMPLOYEE_RESULT

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

@@ -1,14 +1,12 @@
 package com.example.rhizome.app.presentation.form;
 
-import java.util.List;
-
 import com.example.rhizome.app.domain.model.Department;
-import com.example.rhizome.app.domain.model.SearchConditionDepartment;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 /**
  * 画面の表示に使う部署コード管理用のクラス
  */
@@ -46,19 +44,4 @@ public class DepartmentForm {
     public static List<DepartmentForm> convertFrom(List<Department> departmentList) {
         return departmentList.stream().map(DepartmentForm::convertFrom).toList();
     }
-    
-    /**
-     * 画面用（presentation 層）の DepartmentForm クラスから business 層の SearchConditionDepartment クラスに
-     * 変換します。
-     *
-     * @param departmentForm 画面用（presentation 層）の departmentForm インスタンス
-     * @return business 層の searchConditionDepartment インスタンス
-     */
-    public static SearchConditionDepartment convertTo(DepartmentForm departmentForm) {
-        return new SearchConditionDepartment(
-        		departmentForm.getIdDepartment(),
-        		departmentForm.getNmDepartment()
-                
-        );
-    }
 }

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

@@ -0,0 +1,35 @@
+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 {
+
+	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) {
+	        return new SearchConditionDepartment(
+	        		searchConditionDepartmentForm.getIdDepartment(),
+	        		searchConditionDepartmentForm.getNmDepartment()
+	        );      
+	        		
+	    }
+}

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

@@ -1,6 +1,7 @@
 package com.example.rhizome.app.presentation.form;
 
 import com.example.rhizome.app.domain.model.SearchConditionEmployee;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/resources/application.properties

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

src/main/resources/templates/insertDepartmentInput.html

@@ -9,15 +9,16 @@
     <!-- CSSの読み込み -->
     <link rel="stylesheet" th:href="@{/css/all.css}">
     <link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
-    <title>社員登録</title>
-</head>
+    <title>検索</title>
 
+</head>
 <body>
 <h1>
-    社員登録　　　
+    新規登録　　　
     
 </h1>
 
-<a href="showMenu">メニューに戻る</a>
+
+
 </body>
 </html>

src/main/resources/templates/menu.html

@@ -25,7 +25,7 @@
     <tr>
         <td><a class="menuClass" href="javascript:selectEmployeeSubmit()"><i class="fas fa-search"></i> 社員検索 </a>
         </td>
-        <td class="description">登録済みのユーザ一覧表示と更新、削除を行います。</td>
+        <td class="description">登録済みのユーザ一覧表示と</br>更新、削除を行います。</td>
     </tr>
 
     <tr>
@@ -33,19 +33,23 @@
         <td class="description">新規でユーザ追加を行います。</td>
     </tr>
 
+</table>
+
+<table class="menuClass">
     <tr>
         <td><a class="menuClass" href="javascript:selectDepartmentSubmit()"><i class="fas fa-search"></i> 部署検索 </a>
         </td>
-	    <td class="description">登録済みの部署一覧表示と更新、削除を行います。</td>
+        <td class="description">登録済みの部署一覧表示と</br>更新、削除を行います。</td>
     </tr>
 
     <tr>
-	    <td><a class="menuClass" href="javascript:insertDepartmentSubmit()"><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>
 
 </table>
+
+
 </body>
 
 <script type="text/javascript">
@@ -54,6 +58,7 @@
         form.setAttribute('method', 'post');
         form.setAttribute('action', 'selectEmployeeInfo');
 		
+		
         // 動的送信用のHidden
         // 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
         const inputField = document.createElement("input");

src/main/resources/templates/selectDepartment.html

@@ -19,10 +19,10 @@
 	        <span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
 	        <button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
 	    </div>
-</h1>
-<form action="selectDepartment"
+	</h1>
+	<form action="selectDepartmentInfo"
 	      method="post"                
-      th:object="${departmentForm}">
+	      th:object="${searchConditionDepartment}">
 
 	    <div class="msgBox error" th:if="${messageError} != null">
 	        <span class="error" th:text="${messageError.message}"></span>
@@ -41,7 +41,7 @@
 	            <td>
 	                <input placeholder="部署名"
 	                       th:field="*{nmDepartment}"
-                       type="text"/>部署名
+	                       type="text"/>
 	            </td>
 	        </tr>
 	        
@@ -54,58 +54,62 @@
 	            </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}">
+	</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>
-<th:block th:if="${departmentFormList != null and departmentFormList.size() > 0}">
+	</th:block>
+	<div class="header-spacing"></div>
+	<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: 60px;">社員ID</th>
+			            <th style="width: 150px;">所属部署</th>
 			            <th style="width: 150px;">操作</th>
 			        </tr>
 			        </thead>
 			        <tbody>
-        <tr th:each="departmentFormList : ${departmentFormList}">
-            <td th:text="${departmentFormList.idDepartment}"></td>
-            <td th:text="${departmentFormList.nmDepartment}"></td>
+			        <tr th:each="departmentForm : ${departmentFormList}">
+			            <td th:text="${departmentForm.idDepartment}"></td>
+			            <td th:text="${departmentForm.nmDepartment}"></td>
 			            <td>
 			                <!-- 更新フォーム -->
-
+			                <form action="showUpdateEmployee" method="post" style="display: inline;">
+			                    <input name="idEmployee" th:value="${departmentForm.idDepartment}" type="hidden">
+			                    <input type="submit" value="更新">
+			                </form>
 			                <!-- 削除フォーム -->
-
-                
+			                <form action="deleteEmployee" method="post" onsubmit="return confirm('本当に削除しますか？');"
+			                      style="display: inline;">
+			                    <input name="idEmployee" th:value="${departmentForm.idDepartment}" type="hidden">
+			                    <input type="submit" value="削除">
+			                </form>
 			            </td>
 			        </tr>
 			        </tbody>
 			    </table>
-</th:block>
-<th:block th:if="${departmentFormList == null or departmentFormList.size() == 0}">
+
+	</th:block>
+	<th:block th:if="${departmentFormList == null or departmentFormList.size() == 0}">
 	    <!-- 検索結果が0件の場合 -->
 	    検索結果はありません。
-</th:block>
-
+	</th:block>
 </body>
-<script type="text/javascript">
+	<script type="text/javascript">
 
 	    function clearInput() {
-        document.getElementById('idDepartment').value = '';
 	        document.getElementById('nmDepartment').value = '';
+	        document.getElementById('idDepartment').value = '';
 	    }
 
 
-</script>
-
-
-</html>
+	</script>
+	</html>

src/main/webapp/selectDepartment.html

@@ -0,0 +1,115 @@
+<!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="selectDepartment"
+      method="post"                
+      th:object="${searchConditionDepartment}">
+
+    <div class="msgBox error" th:if="${messageError} != null">
+        <span class="error" th:text="${messageError.message}"></span>
+    </div>
+    <table>
+        <tr>
+            <th class="header">部署ID</th>
+            <td>
+                <input placeholder="部署ID"
+                       th:field="*{idDepartment}"
+                       type="number"/>
+            </td>
+        </tr>
+        <tr>
+            <th class="header">部署名</th>
+            <td>
+                <input placeholder="部署名"
+                       th:field="*{nmDepartment}"
+                       type="text"/>
+            </td>
+        </tr>
+        
+        <tr>
+            <td class="btnArea" colspan="2">
+                <input type="submit" value="検索"/>
+            </td>
+            <td class="btnArea" colspan="2">
+                <button onclick="clearInput()">クリア</button>
+            </td>
+        </tr>
+    </table>
+</form>
+<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>
+<th:block th:if="${departmentFormList != null and employeeInfoFormList.size() > 0}">
+    <!-- 検索結果が1件以上ある場合 -->
+    <table class="table-grid table-striped table-hover">
+        <thead>
+        <tr>
+            <th style="width: 60px;">社員ID</th>
+            <th style="width: 150px;">所属部署</th>
+            <th style="width: 150px;">操作</th>
+        </tr>
+        </thead>
+        <tbody>
+        <tr th:each="departmentForm : ${departmentFormList}">
+            <td th:text="${departmentForm.idEmployee}"></td>
+            <td th:text="${departmentForm.nmDepartment}"></td>
+            <td>
+                <!-- 更新フォーム -->
+                <form action="showUpdateEmployee" method="post" style="display: inline;">
+                    <input name="idEmployee" th:value="${employeeInfoForm.idEmployee}" type="hidden">
+                    <input type="submit" value="更新">
+                </form>
+                <!-- 削除フォーム -->
+                <form action="deleteEmployee" method="post" onsubmit="return confirm('本当に削除しますか？');"
+                      style="display: inline;">
+                    <input name="idEmployee" th:value="${employeeInfoForm.idEmployee}" type="hidden">
+                    <input type="submit" value="削除">
+                </form>
+            </td>
+        </tr>
+        </tbody>
+    </table>
+</th:block>
+<th:block th:if="${employeeInfoFormList == null or employeeInfoFormList.size() == 0}">
+    <!-- 検索結果が0件の場合 -->
+    検索結果はありません。
+</th:block>
+
+</body>
+<script type="text/javascript">
+
+    function clearInput() {
+        document.getElementById('idEmployee').value = '';
+        document.getElementById('idDepartment').selectedIndex = 0;
+    }
+
+
+</script>
+</html>