[EDIT] application.propertiesの編集

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

@@ -15,15 +15,7 @@ public class SearchConditionDepartment {
     private final Integer idDepartment;
     /**
      * 部署名
-     * 
      */
     private final String nmDepartment;
 
-    
-    
-	public static SearchConditionDepartment convertTo(SearchConditionDepartment searchConditionDepartment) {
-		// TODO 自動生成されたメソッド・スタブ
-		return null;
-	}
-
 }

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

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

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

@@ -1,7 +0,0 @@
-package com.example.rhizome.app.domain.service;
-
-public interface SearchDepartmentInfo {
-//    List<DepartmentInfo> selectAll();
-//
-//    List<DepartmentInfo> searchBy(SearchConditionEmployee searchConditionEmployee);
-}

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

@@ -1,57 +0,0 @@
-//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 org.springframework.transaction.annotation.Transactional;
-//
-//import com.example.rhizome.app.domain.model.EmployeeInfo;
-//import com.example.rhizome.app.domain.model.SearchConditionEmployee;
-//import com.example.rhizome.app.infra.entity.EmployeeDepartmentEntity;
-//import com.example.rhizome.app.infra.repository.EmployeeInfoRepository;
-//
-//@Service
-//@Transactional
-//public class SearchDepartmentInfoImpl implements SearchDepartmentInfo{
-//
-//	DepartmentInfoRepository departmentInfoRepository;
-//
-//	    @Autowired
-//	    public SearchDepartmentInfoImpl(EmployeeInfoRepository employeeInfoRepository) {
-//	        this.departmentInfoRepository = departmentInfoRepository;
-//	    }
-//
-//
-//	    /**
-//	     * EmployeeInfo (employee join department) のレコードを全件取得
-//	     *
-//	     * @return 取得したレコード全件
-//	     */
-//	    public List<DepartmentInfo> selectAll() {
-//
-//	        return EmployeeDepartmentEntity.createEmployeeInfoList(departmentInfoRepository.findAll());
-//
-//	    }
-//
-//	    /**
-//	     * SearchConditionEmployee の情報を元に EmployeeInfo (employee join department) のレコードを取得
-//	     *
-//	     * @param searchConditionEmployee 検索条件
-//	     * @return 検索結果のレコードリスト
-//	     */
-//	    public List<DepartmentInfo> searchBy(SearchConditionEmployee searchConditionEmployee) {
-//	        // 動的に検索条件を絞り込む
-//	        // Specification は Criteria API の Predicate をラップしたもの
-//	        return EmployeeDepartmentEntity
-//	                .createEmployeeInfoList(
-//	                        employeeInfoRepository.findAll(Specification
-//	                                .where(EmployeeInfoRepository.idEmployeeEqual(searchConditionEmployee.getIdEmployee()))
-//	                                .and(EmployeeInfoRepository.nmEmployeeEqual(searchConditionEmployee.getNmEmployee()))
-//	                               
-//	                        )
-//	                );
-//
-//	    }
-//	}

src/main/java/com/example/rhizome/app/presentation/controller/InsertDepartmentInputController.java

@@ -1,85 +0,0 @@
-package com.example.rhizome.app.presentation.controller;
-
-import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.*;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.servlet.http.HttpSession;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-import com.example.rhizome.aop.aspect.PermissionCheck;
-import com.example.rhizome.aop.aspect.SessionCheck;
-import com.example.rhizome.app.domain.service.RegisterEmployee;
-import com.example.rhizome.app.domain.service.SearchDepartment;
-import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.InsertEmployeeForm;
-
-
-/**
- * 登録画面表示用コントローラ
- */
-@Controller
-public class InsertDepartmentInputController {
-
-
-	    // ログ出力用インスタンス
-	    private final static Logger LOGGER = Logger.getLogger(InsertEmployeeInputController.class.getName());
-
-	    // エラーメッセージ用の定数フィールド
-	    private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
-
-	    HttpSession httpSession;
-	    RegisterEmployee registerEmployee;
-	    SearchDepartment searchDepartment;
-
-	    @Autowired
-	    public InsertDepartmentInputController(HttpSession httpSession, RegisterEmployee registerEmployee, SearchDepartment searchDepartment) {
-	        this.httpSession = httpSession;
-	        this.registerEmployee = registerEmployee;
-	        this.searchDepartment = searchDepartment;
-	    }
-
-	    @ModelAttribute
-	    public InsertEmployeeForm insertEmployeeForm() {
-	        return new InsertEmployeeForm();
-	    }
-
-
-	    /**
-	     * 登録画面表示処理
-	     *
-	     * @param insertEmployeeForm 登録画面のフォーム
-	     * @param model              ビューにデータを渡すためのコンテナ
-	     * @return 遷移先の画面
-	     */
-	    @SessionCheck
-	    @PermissionCheck
-	    @RequestMapping(value = INSERT_DEPARTMENT_INPUT, method = RequestMethod.POST)
-	    public String insertInput() {
-
-	        try {
-	            
-	        	
-
-	            // 登録画面に遷移
-	            return TransitionTargetPageNameKeyword.INSERT_DEPARTMENT_INPUT_HTML;
-
-	        } catch (Exception e) {
-	            // ログイン情報の破棄
-	            httpSession.invalidate();
-
-	            e.printStackTrace();
-
-	            // エラーログ出力
-	            LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-	            // エラー画面遷移
-	            return TransitionTargetPageNameKeyword.ERROR_HTML;
-	        }
-	    }
-	}

src/main/java/com/example/rhizome/app/presentation/controller/SelectDepartmentController.java

@@ -1,132 +0,0 @@
-package com.example.rhizome.app.presentation.controller;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.servlet.http.HttpSession;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-import com.example.rhizome.aop.aspect.PermissionCheck;
-import com.example.rhizome.aop.aspect.SessionCheck;
-import com.example.rhizome.app.domain.model.SearchConditionDepartment;
-import com.example.rhizome.app.domain.service.SearchDepartment;
-import com.example.rhizome.app.domain.service.SearchEmployeeInfo;
-import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
-import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.DepartmentForm;
-import com.example.rhizome.app.presentation.form.SearchConditionDepartmentForm;
-
-
-@Controller
-public class SelectDepartmentController {
-
-	// ログ出力用インスタンス
-    private final static Logger LOGGER = Logger.getLogger(SelectEmployeeController.class.getName());
-    // エラーメッセージ用の定数フィールド
-    private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
-
-    HttpSession httpSession;
-    SearchDepartment searchDepartment;
-    SearchEmployeeInfo searchEmployeeInfo;
-
-    @Autowired
-    public SelectDepartmentController(HttpSession httpSession, SearchDepartment searchDepartment, SearchEmployeeInfo searchEmployeeInfo) {
-        this.httpSession = httpSession;
-        this.searchDepartment = searchDepartment;
-        this.searchEmployeeInfo = searchEmployeeInfo;
-    }
-
-    @ModelAttribute
-    public SearchConditionDepartmentForm searchConditionDepartmentForm() {
-        return new SearchConditionDepartmentForm();
-    }
-
-    
-    /**
-     * 部署検索画面表示処理コントローラ
-     *
-     * @param searchConditionEmployeeForm 検索画面のフォーム
-     * @param model                       ビューにデータを渡すためのコンテナ
-     * @return 遷移先の画面
-     */
-    
-    @PermissionCheck
-    @SessionCheck
-    @RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO, method = RequestMethod.POST)
-    public String select(SearchConditionDepartment searchConditionDepartment, Model model) {
-
-        try {
-
-            // 部署一覧を取得し、画面に返す用のクラスに詰め替える
-            // 作成した部署一覧をセット
-//            model.addAttribute(
-//                    PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-//                    DepartmentForm.convertFrom(searchDepartment.selectAll())
-//            );
-
-            // 検索条件を元に検索を実施
-            // 取得した EmployeeInfo（ employee + department ）の情報を画面に返す用の型に詰め替えてセット
-            model.addAttribute(
-            		PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-            		DepartmentForm.convertFrom(searchDepartment.searchByWithLike(searchConditionDepartment)));
-            // 検索ページに遷移
-            return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
-
-
-        } catch (Exception e) {
-            // ログイン情報の破棄
-            httpSession.invalidate();
-
-            e.printStackTrace();
-
-            // エラーログ出力
-            LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-            // エラー画面遷移
-            return TransitionTargetPageNameKeyword.ERROR_HTML;
-        }
-
-    }
-    
-    
-    
-    @PermissionCheck
-    @SessionCheck
-    @RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT, method = RequestMethod.POST)
-    public String select1(SearchConditionDepartment searchConditionDepartment, Model model) {
-
-        try {
-
-        	 model.addAttribute(
-                     PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-                     DepartmentForm.convertFrom(searchDepartment.selectAll())
-             );
-        	 
-            // 検索ページに遷移
-            return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
-
-
-        } catch (Exception e) {
-            // ログイン情報の破棄
-            httpSession.invalidate();
-
-            e.printStackTrace();
-
-            // エラーログ出力
-            LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-            // エラー画面遷移
-            return TransitionTargetPageNameKeyword.ERROR_HTML;
-        }
-        
-    }
-}
-    
- 
-
-   
-

src/main/java/com/example/rhizome/app/presentation/controller/SelectEmployeeController.java

@@ -1,17 +1,5 @@
 package com.example.rhizome.app.presentation.controller;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.servlet.http.HttpSession;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
 import com.example.rhizome.aop.aspect.PermissionCheck;
 import com.example.rhizome.aop.aspect.SessionCheck;
 import com.example.rhizome.app.domain.service.SearchDepartment;
@@ -21,6 +9,16 @@ import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTa
 import com.example.rhizome.app.presentation.form.DepartmentForm;
 import com.example.rhizome.app.presentation.form.EmployeeInfoForm;
 import com.example.rhizome.app.presentation.form.SearchConditionEmployeeForm;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import javax.servlet.http.HttpSession;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * 社員検索画面用コントローラ　リスト全件表示、検索表示、更新、削除が可能
@@ -72,9 +70,7 @@ public class SelectEmployeeController {
 
             // 検索条件を元に検索を実施
             // 取得した EmployeeInfo（ employee + department ）の情報を画面に返す用の型に詰め替えてセット
-            model.addAttribute(
-            		PageReturnAttributeKeyword.EMPLOYEE_INFO_FORM_LIST,
-            		EmployeeInfoForm.convertFrom(searchEmployeeInfo.searchBy(SearchConditionEmployeeForm.convertTo(searchConditionEmployeeForm))));
+            model.addAttribute(PageReturnAttributeKeyword.EMPLOYEE_INFO_FORM_LIST, EmployeeInfoForm.convertFrom(searchEmployeeInfo.searchBy(SearchConditionEmployeeForm.convertTo(searchConditionEmployeeForm))));
             // 検索ページに遷移
             return TransitionTargetPageNameKeyword.SELECT_EMPLOYEE_HTML;
 

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 = "departmentInfoFormList";
 
 }

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

@@ -17,11 +17,9 @@ public class TransitionTargetPageNameKeyword {
     // 管理者向け
     public static final String MENU_HTML = "menu";
     public static final String SELECT_EMPLOYEE_HTML = "selectEmployee";
-    public static final String SELECT_DEPARTMENT_HTML = "selectDepartment";
     public static final String INSERT_EMPLOYEE_INPUT_HTML = "insertEmployeeInput";
     public static final String INSERT_EMPLOYEE_CONFIRM_HTML = "insertEmployeeConfirm";
     public static final String INSERT_EMPLOYEE_RESULT_HTML = "insertEmployeeResult";
-    public static final String INSERT_DEPARTMENT_INPUT_HTML = "/insertDepartmentInput";
     public static final String UPDATE_EMPLOYEE_INPUT_HTML = "updateEmployeeInput";
 
     public static final String ERROR_HTML = "error";
@@ -41,11 +39,8 @@ public class TransitionTargetPageNameKeyword {
     public static final String INSERT_EMPLOYEE_INPUT = "/insertEmployeeInput";
     public static final String INSERT_EMPLOYEE_CONFIRM = "/insertEmployeeConfirm";
     public static final String INSERT_EMPLOYEE = "/insertEmployee";
-    public static final String INSERT_DEPARTMENT_INPUT = "/insertDepartmentInput";
     public static final String SHOW_MENU = "/showMenu";
     public static final String SELECT_EMPLOYEE_INFO = "/selectEmployeeInfo";
-    public static final String SELECT_DEPARTMENT = "/selectDepartment";
-    public static final String SELECT_DEPARTMENT_INFO = "/selectDepartmentInfo";
     public static final String SELECT_EMPLOYEE_INFO_FORM_EMPTY = "/selectAll";
     public static final String SHOW_UPDATE_EMPLOYEE = "/showUpdateEmployee";
     public static final String UPDATE_EMPLOYEE_RESULT = "/updateEmployeeResult";
@@ -71,11 +66,8 @@ public class TransitionTargetPageNameKeyword {
                 INSERT_EMPLOYEE_INPUT,
                 INSERT_EMPLOYEE_CONFIRM,
                 INSERT_EMPLOYEE,
-                INSERT_DEPARTMENT_INPUT,
                 SHOW_MENU,
                 SELECT_EMPLOYEE_INFO,
-                SELECT_DEPARTMENT,
-                SELECT_DEPARTMENT_INFO,
                 SELECT_EMPLOYEE_INFO_FORM_EMPTY,
                 SHOW_UPDATE_EMPLOYEE,
                 UPDATE_EMPLOYEE_RESULT

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

@@ -1,35 +0,0 @@
-package com.example.rhizome.app.presentation.form;
-
-import com.example.rhizome.app.domain.model.SearchConditionDepartment;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class SearchConditionDepartmentForm {
-
-	private Integer idDepartment;
-	
-	private String nmDepartment;
-	
-	
-	
-	public static SearchConditionDepartmentForm convertFrom(SearchConditionDepartment searchConditionDepartment) {
-        return new SearchConditionDepartmentForm(
-        		searchConditionDepartment.getIdDepartment(),
-        		searchConditionDepartment.getNmDepartment()
-               
-        );
-    }
-	
-	 public static SearchConditionDepartment convertTo(SearchConditionDepartmentForm searchConditionDepartmentForm) {
-	        return new SearchConditionDepartment(
-	        		searchConditionDepartmentForm.getIdDepartment(),
-	        		searchConditionDepartmentForm.getNmDepartment()
-	        );      
-	        		
-	    }
-}

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

@@ -1,7 +1,6 @@
 package com.example.rhizome.app.presentation.form;
 
 import com.example.rhizome.app.domain.model.SearchConditionEmployee;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/resources/application.properties

@@ -1,3 +1,10 @@
-spring.datasource.url=jdbc:mysql://localhost:3306/rezospring
+spring.datasource.url=jdbc:mysql://localhost:3306/springdb
 spring.datasource.username=rezouser
 spring.datasource.password=Rezo_0000
+
+spring.jpa.hibernate.ddl-auto=update
+
+spring.jpa.properties.hibernate.format_sql=true
+spring.jpa.show-sql=true
+
+logging.level.org.hibernate.type.descriptor.sql=trace

src/main/resources/templates/insertDepartmentInput.html

@@ -1,24 +0,0 @@
-<!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>
-    <!-- CSSの読み込み -->
-    <link rel="stylesheet" th:href="@{/css/all.css}">
-    <link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
-    <title>検索</title>
-
-</head>
-<body>
-<h1>
-    新規登録　　　
-    
-</h1>
-
-
-
-</body>
-</html>

src/main/resources/templates/menu.html

@@ -34,22 +34,6 @@
     </tr>
 
 </table>
-
-<table class="menuClass">
-    <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>
 
 <script type="text/javascript">
@@ -58,7 +42,6 @@
         form.setAttribute('method', 'post');
         form.setAttribute('action', 'selectEmployeeInfo');
 
-		
         // 動的送信用のHidden
         // 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
         const inputField = document.createElement("input");

src/main/resources/templates/selectDepartment.html

@@ -1,115 +0,0 @@
-<!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>
-    <!-- CSSの読み込み -->
-    <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="selectDepartmentInfo"
-	      method="post"                
-	      th:object="${searchConditionDepartment}">
-
-	    <div class="msgBox error" th:if="${messageError} != null">
-	        <span class="error" th:text="${messageError.message}"></span>
-	    </div>
-	    <table>
-	        <tr>
-	            <th class="header">部署ID</th>
-	            <td>
-	                <input placeholder="部署ID"
-	                       th:field="*{idDepartment}"
-	                       type="number"/>
-	            </td>
-	        </tr>
-	        <tr>
-	            <th class="header">部署名</th>
-	            <td>
-	                <input 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 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="${messageInfo != null}">
-	    <script th:inline="javascript">
-	        alert([[${messageInfo.message}]]);
-	    </script>
-	</th:block>
-	<div class="header-spacing"></div>
-	<th:block th:if="${departmentFormList != null and departmentFormList.size() > 0}">
-		<!-- 検索結果が1件以上ある場合 -->
-			    <table class="table-grid table-striped table-hover">
-			        <thead>
-			        <tr>
-			            <th style="width: 60px;">社員ID</th>
-			            <th style="width: 150px;">所属部署</th>
-			            <th style="width: 150px;">操作</th>
-			        </tr>
-			        </thead>
-			        <tbody>
-			        <tr th:each="departmentForm : ${departmentFormList}">
-			            <td th:text="${departmentForm.idDepartment}"></td>
-			            <td th:text="${departmentForm.nmDepartment}"></td>
-			            <td>
-			                <!-- 更新フォーム -->
-			                <form action="showUpdateEmployee" method="post" style="display: inline;">
-			                    <input name="idEmployee" th:value="${departmentForm.idDepartment}" type="hidden">
-			                    <input type="submit" value="更新">
-			                </form>
-			                <!-- 削除フォーム -->
-			                <form action="deleteEmployee" method="post" onsubmit="return confirm('本当に削除しますか？');"
-			                      style="display: inline;">
-			                    <input name="idEmployee" th:value="${departmentForm.idDepartment}" type="hidden">
-			                    <input type="submit" value="削除">
-			                </form>
-			            </td>
-			        </tr>
-			        </tbody>
-			    </table>
-
-	</th:block>
-	<th:block th:if="${departmentFormList == null or departmentFormList.size() == 0}">
-	    <!-- 検索結果が0件の場合 -->
-	    検索結果はありません。
-	</th:block>
-</body>
-	<script type="text/javascript">
-
-	    function clearInput() {
-	        document.getElementById('nmDepartment').value = '';
-	        document.getElementById('idDepartment').value = '';
-	    }
-
-
-	</script>
-	</html>

src/main/webapp/selectDepartment.html

@@ -1,115 +0,0 @@
-<!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>
-    <!-- CSSの読み込み -->
-    <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="${searchConditionDepartment}">
-
-    <div class="msgBox error" th:if="${messageError} != null">
-        <span class="error" th:text="${messageError.message}"></span>
-    </div>
-    <table>
-        <tr>
-            <th class="header">部署ID</th>
-            <td>
-                <input placeholder="部署ID"
-                       th:field="*{idDepartment}"
-                       type="number"/>
-            </td>
-        </tr>
-        <tr>
-            <th class="header">部署名</th>
-            <td>
-                <input 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 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="${messageInfo != null}">
-    <script th:inline="javascript">
-        alert([[${messageInfo.message}]]);
-    </script>
-</th:block>
-<div class="header-spacing"></div>
-<th:block th:if="${departmentFormList != null and employeeInfoFormList.size() > 0}">
-    <!-- 検索結果が1件以上ある場合 -->
-    <table class="table-grid table-striped table-hover">
-        <thead>
-        <tr>
-            <th style="width: 60px;">社員ID</th>
-            <th style="width: 150px;">所属部署</th>
-            <th style="width: 150px;">操作</th>
-        </tr>
-        </thead>
-        <tbody>
-        <tr th:each="departmentForm : ${departmentFormList}">
-            <td th:text="${departmentForm.idEmployee}"></td>
-            <td th:text="${departmentForm.nmDepartment}"></td>
-            <td>
-                <!-- 更新フォーム -->
-                <form action="showUpdateEmployee" method="post" style="display: inline;">
-                    <input name="idEmployee" th:value="${employeeInfoForm.idEmployee}" type="hidden">
-                    <input type="submit" value="更新">
-                </form>
-                <!-- 削除フォーム -->
-                <form action="deleteEmployee" method="post" onsubmit="return confirm('本当に削除しますか？');"
-                      style="display: inline;">
-                    <input name="idEmployee" th:value="${employeeInfoForm.idEmployee}" type="hidden">
-                    <input type="submit" value="削除">
-                </form>
-            </td>
-        </tr>
-        </tbody>
-    </table>
-</th:block>
-<th:block th:if="${employeeInfoFormList == null or employeeInfoFormList.size() == 0}">
-    <!-- 検索結果が0件の場合 -->
-    検索結果はありません。
-</th:block>
-
-</body>
-<script type="text/javascript">
-
-    function clearInput() {
-        document.getElementById('idEmployee').value = '';
-        document.getElementById('idDepartment').selectedIndex = 0;
-    }
-
-
-</script>
-</html>