Compare commits
2 Commits
a84431b57c
...
y-nakano
| Author | SHA1 | Date | |
|---|---|---|---|
| ac83447128 | |||
|
|
aae31940db |
5
build.cmd
Normal file
5
build.cmd
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
@echo off
|
||||||
|
setlocal
|
||||||
|
cd /d "%~dp0"
|
||||||
|
call mvnw.cmd clean install %*
|
||||||
|
endlocal
|
||||||
5
pom.xml
5
pom.xml
@@ -17,6 +17,7 @@
|
|||||||
<description>Demo project for Spring Boot</description>
|
<description>Demo project for Spring Boot</description>
|
||||||
<properties>
|
<properties>
|
||||||
<java.version>17</java.version>
|
<java.version>17</java.version>
|
||||||
|
<lombok.version>1.18.34</lombok.version>
|
||||||
</properties>
|
</properties>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
@@ -56,10 +57,6 @@
|
|||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-starter-validation</artifactId>
|
<artifactId>spring-boot-starter-validation</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>org.projectlombok</groupId>
|
|
||||||
<artifactId>lombok</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.fasterxml.jackson.core</groupId>
|
<groupId>com.fasterxml.jackson.core</groupId>
|
||||||
<artifactId>jackson-databind</artifactId>
|
<artifactId>jackson-databind</artifactId>
|
||||||
|
|||||||
5
run.cmd
Normal file
5
run.cmd
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
@echo off
|
||||||
|
setlocal
|
||||||
|
cd /d "%~dp0"
|
||||||
|
call mvnw.cmd spring-boot:run %*
|
||||||
|
endlocal
|
||||||
@@ -1,5 +1,7 @@
|
|||||||
package com.example.rhizome.app.domain.model;
|
package com.example.rhizome.app.domain.model;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
|
|
||||||
@@ -17,5 +19,9 @@ public class Department {
|
|||||||
* 部署名
|
* 部署名
|
||||||
*/
|
*/
|
||||||
private final String nmDepartment;
|
private final String nmDepartment;
|
||||||
|
public static Object convertFrom(List<Department> departmentList) {
|
||||||
|
// TODO 自動生成されたメソッド・スタブ
|
||||||
|
return departmentList;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,10 +1,13 @@
|
|||||||
package com.example.rhizome.app.domain.service;
|
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.Department;
|
||||||
import com.example.rhizome.app.domain.model.SearchConditionDepartment;
|
import com.example.rhizome.app.domain.model.SearchConditionDepartment;
|
||||||
|
|
||||||
import java.util.List;
|
@Service
|
||||||
|
|
||||||
public interface SearchDepartment {
|
public interface SearchDepartment {
|
||||||
List<Department> selectAll();
|
List<Department> selectAll();
|
||||||
|
|
||||||
|
|||||||
@@ -1,17 +1,18 @@
|
|||||||
package com.example.rhizome.app.domain.service.impl;
|
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.Department;
|
||||||
import com.example.rhizome.app.domain.model.SearchConditionDepartment;
|
import com.example.rhizome.app.domain.model.SearchConditionDepartment;
|
||||||
import com.example.rhizome.app.domain.service.SearchDepartment;
|
import com.example.rhizome.app.domain.service.SearchDepartment;
|
||||||
import com.example.rhizome.app.infra.entity.DepartmentEntity;
|
import com.example.rhizome.app.infra.entity.DepartmentEntity;
|
||||||
import com.example.rhizome.app.infra.repository.DepartmentRepository;
|
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;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 部署情報検索系の機能を集約させるサービスクラスです。
|
* 部署情報検索系の機能を集約させるサービスクラスです。
|
||||||
|
|||||||
@@ -1,16 +1,27 @@
|
|||||||
package com.example.rhizome.app.infra.entity;
|
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.Department;
|
||||||
import com.example.rhizome.app.domain.model.Employee;
|
import com.example.rhizome.app.domain.model.Employee;
|
||||||
import com.example.rhizome.app.domain.model.EmployeeInfo;
|
import com.example.rhizome.app.domain.model.EmployeeInfo;
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
||||||
import org.hibernate.annotations.Fetch;
|
|
||||||
import org.hibernate.annotations.FetchMode;
|
|
||||||
|
|
||||||
import javax.persistence.*;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Employee + Department の Join 情報を保持するEntity
|
* Employee + Department の Join 情報を保持するEntity
|
||||||
@@ -114,5 +125,15 @@ 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;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,5 +14,6 @@ public class PageReturnAttributeKeyword {
|
|||||||
public static final String LOGIN_INFO_FORM = "loginInfoForm";
|
public static final String LOGIN_INFO_FORM = "loginInfoForm";
|
||||||
public static final String UPDATE_PERSONAL_EMPLOYEE_USER_FORM = "updatePersonalEmployeeUserForm";
|
public static final String UPDATE_PERSONAL_EMPLOYEE_USER_FORM = "updatePersonalEmployeeUserForm";
|
||||||
public static final String EMPLOYEE_INFO_FORM_LIST = "employeeInfoFormList";
|
public static final String EMPLOYEE_INFO_FORM_LIST = "employeeInfoFormList";
|
||||||
|
public static final String DEPARTMENT_INFO_FORM_LIST = "departmentInfoList";
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -42,12 +42,25 @@ public class TransitionTargetPageNameKeyword {
|
|||||||
public static final String SHOW_MENU = "/showMenu";
|
public static final String SHOW_MENU = "/showMenu";
|
||||||
public static final String SELECT_EMPLOYEE_INFO = "/selectEmployeeInfo";
|
public static final String SELECT_EMPLOYEE_INFO = "/selectEmployeeInfo";
|
||||||
public static final String SELECT_EMPLOYEE_INFO_FORM_EMPTY = "/selectAll";
|
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 SHOW_UPDATE_EMPLOYEE = "/showUpdateEmployee";
|
||||||
public static final String UPDATE_EMPLOYEE_RESULT = "/updateEmployeeResult";
|
public static final String UPDATE_EMPLOYEE_RESULT = "/updateEmployeeResult";
|
||||||
|
|
||||||
|
|
||||||
// Department
|
// Department
|
||||||
// HTML
|
// HTML
|
||||||
|
public static final String SELECT_DEPARTMENT_HTML = "selectDepartment";
|
||||||
// Controller
|
// 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,
|
||||||
SELECT_EMPLOYEE_INFO_FORM_EMPTY,
|
SELECT_EMPLOYEE_INFO_FORM_EMPTY,
|
||||||
SHOW_UPDATE_EMPLOYEE,
|
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
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -33,6 +33,16 @@
|
|||||||
<td class="description">新規でユーザ追加を行います。</td>
|
<td class="description">新規でユーザ追加を行います。</td>
|
||||||
</tr>
|
</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>
|
</table>
|
||||||
</body>
|
</body>
|
||||||
|
|
||||||
|
|||||||
@@ -91,7 +91,7 @@
|
|||||||
<div class="header-spacing"></div>
|
<div class="header-spacing"></div>
|
||||||
<th:block th:if="${messageInfo != null}">
|
<th:block th:if="${messageInfo != null}">
|
||||||
<script th:inline="javascript">
|
<script th:inline="javascript">
|
||||||
alert([[${messageInfo.message}]]);
|
alert([[$,{messageInfo,message}]]);
|
||||||
</script>
|
</script>
|
||||||
</th:block>
|
</th:block>
|
||||||
<div class="header-spacing"></div>
|
<div class="header-spacing"></div>
|
||||||
|
|||||||
Reference in New Issue
Block a user