From ac83447128d65d658993c5a39b8e224887a0f403 Mon Sep 17 00:00:00 2001 From: y-nakano <26-y-nakano-tmn@it-college.co.jp> Date: Wed, 14 Oct 2026 16:39:39 +0900 Subject: [PATCH] =?UTF-8?q?em-Spring=E3=81=AE=E8=AA=B2=E9=A1=8C=E3=81=A7?= =?UTF-8?q?=E3=81=99=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rhizome/app/domain/model/Department.java | 6 ++++ .../app/domain/service/SearchDepartment.java | 7 +++-- .../service/impl/SearchDepartmentImpl.java | 13 ++++---- .../entity/EmployeeDepartmentEntity.java | 31 ++++++++++++++++--- .../PageReturnAttributeKeyword.java | 1 + .../TransitionTargetPageNameKeyword.java | 23 +++++++++++++- src/main/resources/templates/menu.html | 10 ++++++ .../resources/templates/selectEmployee.html | 2 +- 8 files changed, 78 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/example/rhizome/app/domain/model/Department.java b/src/main/java/com/example/rhizome/app/domain/model/Department.java index 360afc8..53ed27d 100644 --- a/src/main/java/com/example/rhizome/app/domain/model/Department.java +++ b/src/main/java/com/example/rhizome/app/domain/model/Department.java @@ -1,5 +1,7 @@ package com.example.rhizome.app.domain.model; +import java.util.List; + import lombok.AllArgsConstructor; import lombok.Getter; @@ -17,5 +19,9 @@ public class Department { * 部署名 */ private final String nmDepartment; + public static Object convertFrom(List departmentList) { + // TODO 自動生成されたメソッド・スタブ + return departmentList; + } } diff --git a/src/main/java/com/example/rhizome/app/domain/service/SearchDepartment.java b/src/main/java/com/example/rhizome/app/domain/service/SearchDepartment.java index 572dcee..46f1681 100644 --- a/src/main/java/com/example/rhizome/app/domain/service/SearchDepartment.java +++ b/src/main/java/com/example/rhizome/app/domain/service/SearchDepartment.java @@ -1,10 +1,13 @@ 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; -import java.util.List; - +@Service public interface SearchDepartment { List selectAll(); diff --git a/src/main/java/com/example/rhizome/app/domain/service/impl/SearchDepartmentImpl.java b/src/main/java/com/example/rhizome/app/domain/service/impl/SearchDepartmentImpl.java index feb6b37..6fe0ce1 100644 --- a/src/main/java/com/example/rhizome/app/domain/service/impl/SearchDepartmentImpl.java +++ b/src/main/java/com/example/rhizome/app/domain/service/impl/SearchDepartmentImpl.java @@ -1,17 +1,18 @@ 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; /** * 部署情報検索系の機能を集約させるサービスクラスです。 diff --git a/src/main/java/com/example/rhizome/app/infra/entity/EmployeeDepartmentEntity.java b/src/main/java/com/example/rhizome/app/infra/entity/EmployeeDepartmentEntity.java index 989d2cc..c3f1f33 100644 --- a/src/main/java/com/example/rhizome/app/infra/entity/EmployeeDepartmentEntity.java +++ b/src/main/java/com/example/rhizome/app/infra/entity/EmployeeDepartmentEntity.java @@ -1,16 +1,27 @@ 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 @@ -114,5 +125,15 @@ public class EmployeeDepartmentEntity { } + public static List createDepartmentInfoList(List all) { + // TODO 自動生成されたメソッド・スタブ + return null; + } + + public static List createDepartmentList(List all) { + // TODO 自動生成されたメソッド・スタブ + return null; + } + } diff --git a/src/main/java/com/example/rhizome/app/presentation/controller/pageproperty/PageReturnAttributeKeyword.java b/src/main/java/com/example/rhizome/app/presentation/controller/pageproperty/PageReturnAttributeKeyword.java index 5e9ec04..b68e8f4 100644 --- a/src/main/java/com/example/rhizome/app/presentation/controller/pageproperty/PageReturnAttributeKeyword.java +++ b/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 = "departmentInfoList"; } diff --git a/src/main/java/com/example/rhizome/app/presentation/controller/pageproperty/TransitionTargetPageNameKeyword.java b/src/main/java/com/example/rhizome/app/presentation/controller/pageproperty/TransitionTargetPageNameKeyword.java index 90ded96..b306f73 100644 --- a/src/main/java/com/example/rhizome/app/presentation/controller/pageproperty/TransitionTargetPageNameKeyword.java +++ b/src/main/java/com/example/rhizome/app/presentation/controller/pageproperty/TransitionTargetPageNameKeyword.java @@ -42,12 +42,25 @@ 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"; /** * 管理者向けのページリストを返す @@ -70,7 +83,15 @@ public class TransitionTargetPageNameKeyword { SELECT_EMPLOYEE_INFO, SELECT_EMPLOYEE_INFO_FORM_EMPTY, SHOW_UPDATE_EMPLOYEE, - UPDATE_EMPLOYEE_RESULT + 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 ); } diff --git a/src/main/resources/templates/menu.html b/src/main/resources/templates/menu.html index 6d0ee4a..c87065b 100644 --- a/src/main/resources/templates/menu.html +++ b/src/main/resources/templates/menu.html @@ -33,6 +33,16 @@ 新規でユーザ追加を行います。 + + 部署検索 + + 登録済みの部署一覧表示と
更新、削除を行います。 + + + + 部署登録 + 新規で部署追加を行います。 + diff --git a/src/main/resources/templates/selectEmployee.html b/src/main/resources/templates/selectEmployee.html index 47cf487..318db91 100644 --- a/src/main/resources/templates/selectEmployee.html +++ b/src/main/resources/templates/selectEmployee.html @@ -91,7 +91,7 @@