pre

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

@@ -1,7 +1,5 @@
 package com.example.rhizome.app.domain.model;
 
-import java.util.List;
-
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -19,9 +17,5 @@ public class Department {
      * 部署名
      */
     private final String nmDepartment;
-	public static Object convertFrom(List<Department> departmentList) {
-		// TODO 自動生成されたメソッド・スタブ
-		return departmentList;
-	}
 
 }

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

@@ -1,13 +1,10 @@
 package com.example.rhizome.app.domain.service;
 
-import java.util.List;
-
-import org.springframework.stereotype.Service;
-
 import com.example.rhizome.app.domain.model.Department;
 import com.example.rhizome.app.domain.model.SearchConditionDepartment;
 
-@Service
+import java.util.List;
+
 public interface SearchDepartment {
     List<Department> selectAll();
 

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;
 
 /**
  * 部署情報検索系の機能を集約させるサービスクラスです。

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

@@ -1,27 +1,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.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedEntityGraph;
-import javax.persistence.Table;
-
-import org.hibernate.annotations.Fetch;
-import org.hibernate.annotations.FetchMode;
-
 import com.example.rhizome.app.domain.model.Department;
 import com.example.rhizome.app.domain.model.Employee;
 import com.example.rhizome.app.domain.model.EmployeeInfo;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Fetch;
+import org.hibernate.annotations.FetchMode;
+
+import javax.persistence.*;
+import java.util.List;
 
 /**
  * Employee + Department の Join 情報を保持するEntity
@@ -125,15 +114,5 @@ public class EmployeeDepartmentEntity {
 
     }
 
-	public static List<Department> createDepartmentInfoList(List<EmployeeDepartmentEntity> all) {
-		// TODO 自動生成されたメソッド・スタブ
-		return null;
-	}
-
-	public static List<Department> createDepartmentList(List<EmployeeDepartmentEntity> all) {
-		// TODO 自動生成されたメソッド・スタブ
-		return null;
-	}
-
 
 }

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

@@ -14,6 +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 = "departmentInfoList";
 
 }

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

@@ -42,25 +42,12 @@ public class TransitionTargetPageNameKeyword {
     public static final String SHOW_MENU = "/showMenu";
     public static final String SELECT_EMPLOYEE_INFO = "/selectEmployeeInfo";
     public static final String SELECT_EMPLOYEE_INFO_FORM_EMPTY = "/selectAll";
-    public static final String SELECT_DEPARTMENT_FORM_EMPTY = "/selectDepartmentAll";
     public static final String SHOW_UPDATE_EMPLOYEE = "/showUpdateEmployee";
     public static final String UPDATE_EMPLOYEE_RESULT = "/updateEmployeeResult";
 
-
     // Department
     // HTML
-	public static final String SELECT_DEPARTMENT_HTML = "selectDepartment";
     // Controller
-	public static final String SELECT_DEPARTMENT = "/selectDepartment";
-	public static final String DELETE_DEPARTMENT = "/deleteDepartment";
-	
-	// TransitionTargetPageNameKeyword
-	public static final String UPDATE_DEPARTMENT_INPUT_HTML = "updateDepartmentInput";   // HTML
-	public static final String SHOW_UPDATE_DEPARTMENT = "/showUpdateDepartment";         // Controller
-	public static final String UPDATE_DEPARTMENT_RESULT = "/updateDepartmentResult";
-
-	// PageReturnAttributeKeyword
-	public static final String UPDATE_DEPARTMENT_FORM = "updateDepartmentForm";
 
     /**
      * 管理者向けのページリストを返す
@@ -83,15 +70,7 @@ public class TransitionTargetPageNameKeyword {
                 SELECT_EMPLOYEE_INFO,
                 SELECT_EMPLOYEE_INFO_FORM_EMPTY,
                 SHOW_UPDATE_EMPLOYEE,
-                UPDATE_EMPLOYEE_RESULT,
-                SELECT_DEPARTMENT_HTML,
-                SELECT_DEPARTMENT,
-                DELETE_DEPARTMENT,
-                SELECT_DEPARTMENT_FORM_EMPTY,
-                UPDATE_DEPARTMENT_INPUT_HTML,
-                SHOW_UPDATE_DEPARTMENT,
-                UPDATE_DEPARTMENT_RESULT,
-                UPDATE_DEPARTMENT_FORM
+                UPDATE_EMPLOYEE_RESULT
         );
     }
 

src/main/resources/templates/menu.html

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

src/main/resources/templates/selectEmployee.html

@@ -91,7 +91,7 @@
 <div class="header-spacing"></div>
 <th:block th:if="${messageInfo != null}">
     <script th:inline="javascript">
-        alert([[$,{messageInfo,message}]]);
+        alert([[${messageInfo.message}]]);
     </script>
 </th:block>
 <div class="header-spacing"></div>