Merge branch 'main' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/em-spring into h-hein

.classpath

@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" output="target/classes" path="src/main/resources">
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="optional" value="true"/>
@@ -14,21 +14,20 @@
 	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
-			<attribute name="test" value="true"/>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
 		<attributes>
-			<attribute name="test" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
 			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
-			<attribute name="module" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>

.project

@@ -16,12 +16,12 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>

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

@@ -7,5 +7,5 @@ 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.release=disabled
 org.eclipse.jdt.core.compiler.source=17

pom.xml

@@ -20,6 +20,12 @@
         <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>

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

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

src/main/java/com/example/rhizome/app/domain/service/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/DeleteDepartmentImpl.java

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

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

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

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

@@ -1,29 +1,25 @@
 package com.example.rhizome.app.domain.service.impl;
 
 
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.example.rhizome.app.domain.model.Department;
 import com.example.rhizome.app.domain.model.SearchConditionDepartment;
 import com.example.rhizome.app.domain.service.SearchDepartment;
 import com.example.rhizome.app.infra.entity.DepartmentEntity;
 import com.example.rhizome.app.infra.repository.DepartmentRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
 
 /**
  * 部署情報検索系の機能を集約させるサービスクラスです。
  */
-//サービスクラスとして登録
 @Service
-//トランザクション管理
 @Transactional
 public class SearchDepartmentImpl implements SearchDepartment {
 
-	//Repositoryを保持するフィールド
     DepartmentRepository departmentRepository;
 
     /**
@@ -71,7 +67,6 @@ public class SearchDepartmentImpl implements SearchDepartment {
      * @param searchConditionDepartment 検索条件
      * @return 検索結果のレコード
      */
-    @Override
     public List<Department> searchByWithLike(SearchConditionDepartment searchConditionDepartment) {
         // 動的に検索条件を絞り込む
         // Specification は Criteria API の Predicate をラップしたもの

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

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

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

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

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

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

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

@@ -1,127 +1,39 @@
 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 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.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
+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.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;
+    private SearchDepartment searchDepartment;
+
+    /** 部署検索画面の初期表示 */
+    @GetMapping("/showSelectDepartment")
+    public String showSelectDepartment(@ModelAttribute SearchConditionDepartmentForm searchConditionDepartmentForm) {
+        return "department/selectDepartment";
     }
 
-	//空の検索条件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;
-
-		}
+    /** 部署検索処理 */
+    @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";
     }
 }
-
-/**
- * 社員検索画面表示処理コントローラ
- *
- * @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,17 +1,5 @@
 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;
@@ -21,6 +9,16 @@ 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;
 
 /**
  * 社員検索画面用コントローラ　リスト全件表示、検索表示、更新、削除が可能
@@ -33,8 +31,6 @@ public class SelectEmployeeController {
     // エラーメッセージ用の定数フィールド
     private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
 
-    public static final String SELECT_DEPARTMENT_FORM_EMPTY = "/selectDepartmentAll";
-
     HttpSession httpSession;
     SearchDepartment searchDepartment;
     SearchEmployeeInfo searchEmployeeInfo;
@@ -65,7 +61,6 @@ public class SelectEmployeeController {
 
         try {
 
-
             // 部署一覧を取得し、画面に返す用のクラスに詰め替える
             // 作成した部署一覧をセット
             model.addAttribute(
@@ -80,7 +75,6 @@ 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,7 +21,6 @@ public class TransitionTargetPageNameKeyword {
     public static final String INSERT_EMPLOYEE_CONFIRM_HTML = "insertEmployeeConfirm";
     public static final String INSERT_EMPLOYEE_RESULT_HTML = "insertEmployeeResult";
     public static final String UPDATE_EMPLOYEE_INPUT_HTML = "updateEmployeeInput";
-    public static final String DEPARTMENT_HTML = "department";
 
     public static final String ERROR_HTML = "error";
 
@@ -31,7 +30,6 @@ public class TransitionTargetPageNameKeyword {
     public static final String INDEX_LOGIN = "/login";
     public static final String LOGOUT = "/logout";
     public static final String DO_LOGIN = "/doLogin";
-//    public static final String DEPARTMENT_HTML = "/department";
 
     // 一般向け(Controller)
     public static final String PERSONAL_UPDATE_RESULT = "/updatePersonalEmployeeResult";
@@ -46,24 +44,10 @@ public class TransitionTargetPageNameKeyword {
     public static final String SELECT_EMPLOYEE_INFO_FORM_EMPTY = "/selectAll";
     public static final String SHOW_UPDATE_EMPLOYEE = "/showUpdateEmployee";
     public static final String UPDATE_EMPLOYEE_RESULT = "/updateEmployeeResult";
-    public static final String SHOW_DEPARTMENT = "/department";
-//    public static final String SELECT_DEPARTMENT = "/selectDepartment";
-    
-
-
-    
 
     // Department
-    // HTML             実装手順書ステップ1-2通りの定数追加
-    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";
+    // HTML
+    // Controller
 
     /**
      * 管理者向けのページリストを返す
@@ -86,9 +70,7 @@ public class TransitionTargetPageNameKeyword {
                 SELECT_EMPLOYEE_INFO,
                 SELECT_EMPLOYEE_INFO_FORM_EMPTY,
                 SHOW_UPDATE_EMPLOYEE,
-                UPDATE_EMPLOYEE_RESULT,
-                SELECT_DEPARTMENT              
-            
+                UPDATE_EMPLOYEE_RESULT
         );
     }
 
@@ -104,8 +86,7 @@ public class TransitionTargetPageNameKeyword {
                 INDEX_LOGIN,
                 LOGOUT,
                 DO_LOGIN,
-                PERSONAL_UPDATE_RESULT,
-                SHOW_DEPARTMENT
+                PERSONAL_UPDATE_RESULT
         );
     }
 

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

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

@@ -6,18 +6,28 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-//          部署の検索条件
+/**
+ * 部署検索条件用のFormクラス
+ */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 public class SearchConditionDepartmentForm {
-	//部署ID
+
+    /** 部署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) {
-		//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=rezouser1
-spring.datasource.password=Rezo_0001
+spring.datasource.username=rezouser
+spring.datasource.password=Rezo_0000

src/main/resources/templates/menu.html

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

@@ -1,28 +1,15 @@
 <!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">
+    <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>
@@ -30,55 +17,62 @@
 </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>
+            <td>
+                <input id="idDepartment" placeholder="部署ID" th:field="*{idDepartment}" type="number"/>
+            </td>
         </tr>
         <tr>
             <th class="header">部署名</th>
-            <td><input type="text" th:field="*{nmDepartment}"></td>
+            <td>
+                <input id="nmDepartment" placeholder="部署名" th:field="*{nmDepartment}" type="text"/>
+            </td>
         </tr>
         <tr>
-            <td class="btnArea" colspan="2"><input type="submit" value="検索"/></td>
-            <td class="btnArea" colspan="2"><button onclick="clearInput()">クリア</button></td>
+            <td class="btnArea" colspan="2">
+                <input type="submit" value="検索"/>
+            </td>
+            <td class="btnArea" colspan="2">
+                <button type="button" onclick="clearInput()">クリア</button>
+            </td>
         </tr>
     </table>
 </form>
 
+<div class="header-spacing"></div>
 <a href="showMenu">メニューに戻る</a>
+<div class="header-spacing"></div>
 <h1><span>検索結果</span></h1>
+<div class="header-spacing"></div>
 
-<!-- ★検索結果が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}">-->
+<th:block th:if="${departmentFormList != null and departmentFormList.size() > 0}">
+    <table class="table-grid table-striped table-hover">
+        <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>
-</table>
+        </tbody>
+    </table>
+</th:block>
 
-<p th:if="${departmentFormList != null and departmentFormList.isEmpty()}">
+<th:block th:if="${departmentFormList == null or departmentFormList.size() == 0}">
     検索結果はありません。
-</p>
+</th:block>
 
-
-</body>
 <script type="text/javascript">
     function clearInput() {
         document.getElementById('idDepartment').value = '';
-        // ★部署名の入力欄も空にする（id は th:field が自動で作る）
-		
+        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>