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

.classpath

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="optional" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<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="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="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

.gitignore

@@ -0,0 +1 @@
+/target/

.project

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>em-spring</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+	</natures>
+</projectDescription>

.settings/.jsdtscope

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/webapp"/>
+	<classpathentry excluding="**/node_modules/*|**/*.min.js|**/bower_components/*" kind="src" path="target/m2e-wtp/web-resources"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+		<attributes>
+			<attribute name="hide" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+	<classpathentry kind="output" path=""/>
+</classpath>

.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
+encoding//src/test/java=UTF-8
+encoding//src/test/resources=UTF-8
+encoding/<project>=UTF-8

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

@@ -0,0 +1,11 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.methodParameters=generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+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=disabled
+org.eclipse.jdt.core.compiler.source=17

.settings/org.eclipse.wst.common.component

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="EM-Spring-0.0.1-SNAPSHOT">
+        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
+        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
+        <property name="context-root" value="EM-Spring"/>
+        <property name="java-output-path" value="/em-spring/target/classes"/>
+    </wb-module>
+</project-modules>

.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <fixed facet="wst.jsdt.web"/>
+  <installed facet="java" version="17"/>
+  <installed facet="jst.web" version="4.0"/>
+  <installed facet="wst.jsdt.web" version="1.0"/>
+</faceted-project>

.settings/org.eclipse.wst.jsdt.ui.superType.container

@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary

.settings/org.eclipse.wst.jsdt.ui.superType.name

@@ -0,0 +1 @@
+Window

.settings/org.eclipse.wst.validation.prefs

@@ -0,0 +1,2 @@
+disabled=06target
+eclipse.preferences.version=1

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/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/presentation/controller/SelectDepartmentController.java

@@ -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";
+    }
+}

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

@@ -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()
+        );
+    }
+}

src/main/resources/templates/selectDepartment.html

@@ -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>

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>