first stept
This commit is contained in:
@@ -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));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,39 @@
|
||||
package com.example.rhizome.app.presentation.controller;
|
||||
|
||||
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.PostMapping;
|
||||
|
||||
import com.example.rhizome.app.domain.model.Department;
|
||||
import com.example.rhizome.app.domain.service.SearchDepartment;
|
||||
import com.example.rhizome.app.presentation.form.DepartmentForm;
|
||||
import com.example.rhizome.app.presentation.form.SearchConditionDepartmentForm;
|
||||
|
||||
@Controller
|
||||
public class SelectDepartmentController {
|
||||
|
||||
@Autowired
|
||||
private SearchDepartment searchDepartment;
|
||||
|
||||
/** 部署検索画面の初期表示 */
|
||||
@GetMapping("/showSelectDepartment")
|
||||
public String showSelectDepartment(@ModelAttribute SearchConditionDepartmentForm searchConditionDepartmentForm) {
|
||||
return "department/selectDepartment";
|
||||
}
|
||||
|
||||
/** 部署検索処理 */
|
||||
@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";
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,36 @@
|
||||
package com.example.rhizome.app.presentation.form;
|
||||
|
||||
import com.example.rhizome.app.domain.model.SearchConditionDepartment;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
/**
|
||||
* 部署検索条件用のFormクラス
|
||||
*/
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class SearchConditionDepartmentForm {
|
||||
|
||||
/** 部署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) {
|
||||
return new SearchConditionDepartment(
|
||||
form.getIdDepartment(),
|
||||
form.getNmDepartment()
|
||||
);
|
||||
}
|
||||
}
|
||||
78
src/main/resources/templates/selectDepartment.html
Normal file
78
src/main/resources/templates/selectDepartment.html
Normal file
@@ -0,0 +1,78 @@
|
||||
<!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>
|
||||
<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="${searchConditionDepartmentForm}">
|
||||
<table>
|
||||
<tr>
|
||||
<th class="header">部署ID</th>
|
||||
<td>
|
||||
<input id="idDepartment" placeholder="部署ID" th:field="*{idDepartment}" type="number"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th class="header">部署名</th>
|
||||
<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 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>
|
||||
|
||||
<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>
|
||||
</tbody>
|
||||
</table>
|
||||
</th:block>
|
||||
|
||||
<th:block th:if="${departmentFormList == null or departmentFormList.size() == 0}">
|
||||
検索結果はありません。
|
||||
</th:block>
|
||||
|
||||
<script type="text/javascript">
|
||||
function clearInput() {
|
||||
document.getElementById('idDepartment').value = '';
|
||||
document.getElementById('nmDepartment').value = '';
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
</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>
|
||||
|
||||
Reference in New Issue
Block a user