2段階_途中まで

.classpath

@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+	<classpathentry kind="src" output="target/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="optional" value="true"/>
@@ -14,20 +14,21 @@
 	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
+			<attribute name="test" value="true"/>
 			<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="maven.pomderived" 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="module" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>

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

@@ -3,18 +3,15 @@ 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.Employee;
-import com.example.rhizome.app.domain.model.LoginUser;
 import com.example.rhizome.app.domain.model.SearchConditionDepartment;
 
 public interface SearchDepartment {
+	//すべての部署を取得する
     List<Department> selectAll();
-
+    //部署ID・部署目の完全一致検索
     List<Department> searchBy(SearchConditionDepartment searchConditionDepartment);
-
+    //部署名の部分一致検索
     List<Department> searchByWithLike(SearchConditionDepartment searchConditionDepartment);
-    
+    //↑下から変更 SelectDepartmentControllerのsearchByWithLikeでエラーでたから
-    LoginUser searchLoginUser(String mailAddress);
+    //List<Department> searchByWithLike(SearchConditionDepartment searchConditionDepartment);
-
-    Employee searchEmployeeByIdEmployee(Integer idEmployee);
 }

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

@@ -1,7 +0,0 @@
-package com.example.rhizome.app.domain.service;
-
-import com.example.rhizome.app.domain.model.Department;
-
-public interface UpdateDepartment {
-	void updateDepartment(Department department);
-}

src/main/java/com/example/rhizome/app/domain/service/impl/DeleteDepartmentImpl.java

@@ -1,19 +1,11 @@
 package com.example.rhizome.app.domain.service.impl;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import com.example.rhizome.app.domain.service.DeleteDepartment;
 import com.example.rhizome.app.infra.repository.DepartmentRepository;
 
-/**
- * Department レコード削除関連の機能を持つサービス
- */
-@Service
-@Transactional
 public class DeleteDepartmentImpl implements DeleteDepartment {
-
 	 DepartmentRepository departmentRepository;
 
 	    @Autowired
@@ -21,12 +13,10 @@ public class DeleteDepartmentImpl implements DeleteDepartment {
 	        this.departmentRepository = departmentRepository;
 	    }
 
-	/**
-	 * idDepartment を元に department データを削除
-	 *
-	 * @param idDepartment 削除対象のidDepartmnet
-	 */
 	    public void deleteDepartment(Integer idDepartment) {
+	        // ★考える：Repository のどのメソッドで「IDを指定して削除」できる？
+	        //          （お手本の DeleteEmployeeImpl を見る）
 	    	departmentRepository.deleteById(idDepartment);
 	    }
+
 }

src/main/java/com/example/rhizome/app/domain/service/impl/DeleteEmployeeImpl.java

@@ -1,11 +1,13 @@
 package com.example.rhizome.app.domain.service.impl;
 
-import com.example.rhizome.app.domain.service.DeleteEmployee;
+
-import com.example.rhizome.app.infra.repository.EmployeeRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import com.example.rhizome.app.domain.service.DeleteEmployee;
+import com.example.rhizome.app.infra.repository.EmployeeRepository;
+
 /**
  * Employee レコード削除関連の機能を持つサービス
  */

src/main/java/com/example/rhizome/app/domain/service/impl/LoginImpl.java

@@ -1,13 +1,15 @@
 package com.example.rhizome.app.domain.service.impl;
 
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 import com.example.rhizome.app.domain.model.LoginInfo;
 import com.example.rhizome.app.domain.model.LoginUser;
 import com.example.rhizome.app.domain.service.Login;
 import com.example.rhizome.app.infra.entity.EmployeeEntity;
 import com.example.rhizome.app.infra.repository.EmployeeRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 /**
  * ログイン系の機能を集約させるサービスクラスです。

src/main/java/com/example/rhizome/app/domain/service/impl/RegisterDepartmentImpl.java

@@ -1,34 +0,0 @@
-package com.example.rhizome.app.domain.service.impl;
-
-import org.springframework.beans.factory.annotation.Autowired;
-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.service.RegisterDepartment;
-import com.example.rhizome.app.infra.entity.DepartmentEntity;
-import com.example.rhizome.app.infra.repository.DepartmentRepository;
-
-/**
- * Department テーブルの登録系の機能を集約させるサービスクラスです。
- */
-@Service
-@Transactional
-public class RegisterDepartmentImpl implements RegisterDepartment {
-
-	DepartmentRepository departmentRepository;
-
-	@Autowired
-	public RegisterDepartmentImpl(DepartmentRepository departmentRepository) {
-		this.departmentRepository = departmentRepository;
-	}
-
-	/**
-	 * employee インスタンスの内容を登録する
-	 *
-	 * @param employee 登録対象のデータ
-	 */
-	public void registerDepartment(Department department) {
-		departmentRepository.save(DepartmentEntity.convertFrom(department));
-	}
-}

src/main/java/com/example/rhizome/app/domain/service/impl/SearchDepartmentImpl.java

@@ -1,5 +1,6 @@
 package com.example.rhizome.app.domain.service.impl;
 
+
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -8,19 +9,21 @@ 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.Employee;
-import com.example.rhizome.app.domain.model.LoginUser;
 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;
 
 /**
- * Department テーブル検索系の機能を集約させるサービスクラスです。
+ * 部署情報検索系の機能を集約させるサービスクラスです。
  */
+//サービスクラスとして登録
 @Service
+//トランザクション管理
 @Transactional
 public class SearchDepartmentImpl implements SearchDepartment {
+
+	//Repositoryを保持するフィールド
     DepartmentRepository departmentRepository;
 
     /**
@@ -54,10 +57,10 @@ public class SearchDepartmentImpl implements SearchDepartment {
         return DepartmentEntity
                 .createDepartmentList(
                         departmentRepository.findAll(Specification
-								.where(DepartmentRepository
+                                .where(DepartmentRepository.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
-										.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
+                                .and(DepartmentRepository.nmDepartmentEqual(searchConditionDepartment.getNmDepartment()))
-								.and(DepartmentRepository
+                        )
-										.nmDepartmentEqual(searchConditionDepartment.getNmDepartment()))));
+                );
 
     }
 
@@ -68,29 +71,17 @@ public class SearchDepartmentImpl implements SearchDepartment {
      * @param searchConditionDepartment 検索条件
      * @return 検索結果のレコード
      */
+    @Override
     public List<Department> searchByWithLike(SearchConditionDepartment searchConditionDepartment) {
         // 動的に検索条件を絞り込む
         // Specification は Criteria API の Predicate をラップしたもの
         return DepartmentEntity
                 .createDepartmentList(
                         departmentRepository.findAll(Specification
-								.where(DepartmentRepository
+                                .where(DepartmentRepository.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
-										.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
+                                .and(DepartmentRepository.nmDepartmentLike(searchConditionDepartment.getNmDepartment()))
-								.and(DepartmentRepository
+                        )
-										.nmDepartmentLike(searchConditionDepartment.getNmDepartment()))));
+                );
 
     }
-
-	@Override
-	public LoginUser searchLoginUser(String mailAddress) {
-		// TODO 自動生成されたメソッド・スタブ
-		return null;
-	}
-
-	@Override
-	public Employee searchEmployeeByIdEmployee(Integer idEmployee) {
-		// TODO 自動生成されたメソッド・スタブ
-		return null;
-	}
-
 }

src/main/java/com/example/rhizome/app/domain/service/impl/UpdateDepartmentImpl.java

@@ -1,26 +0,0 @@
-package com.example.rhizome.app.domain.service.impl;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.example.rhizome.app.domain.model.Department;
-import com.example.rhizome.app.infra.entity.DepartmentEntity;
-import com.example.rhizome.app.infra.repository.DepartmentRepository;
-
-@Service
-@Transactional
-public class UpdateDepartmentImpl {
-	DepartmentRepository departmentRepository;
-
-	@Autowired
-	public UpdateDepartmentImpl(DepartmentRepository departmentRepository) {
-		this.departmentRepository = departmentRepository;
-	}
-
-	public void updateDepartment(Department department) {
-		// ★考える：Model を Entity に変換（DepartmentEntity.convertFrom）して、Repository の save に渡す
-		departmentRepository.save(DepartmentEntity.convertFrom(department));
-	}
-
-}

src/main/java/com/example/rhizome/app/infra/entity/EmployeeEntity.java

@@ -7,16 +7,23 @@
 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.Table;
+
 import com.example.rhizome.app.domain.model.Employee;
 import com.example.rhizome.app.domain.model.LoginUser;
 import com.example.rhizome.app.domain.model.SearchConditionEmployee;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.*;
-import java.util.List;
-
 /**
  * EmployeeテーブルのEntity
  *
@@ -37,6 +44,7 @@ public class EmployeeEntity {
     @Column(name = "id_employee", nullable = false)
     private Integer idEmployee;
     
+
     /**
      * 社員名
      */
@@ -64,6 +72,7 @@ public class EmployeeEntity {
     /**
      * 管理者権限
      */
+//    @Transient
     @Column(name = "admin_auth", nullable = false)
     private Integer adminAuth;
 

src/main/java/com/example/rhizome/app/infra/repository/DepartmentRepository.java

@@ -1,11 +1,13 @@
 package com.example.rhizome.app.infra.repository;
 
-import com.example.rhizome.app.infra.entity.DepartmentEntity;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;
 
+//DepartmentRntity: 部署の実体
+import com.example.rhizome.app.infra.entity.DepartmentEntity;
+
 
 /**
  * Specification:
@@ -19,11 +21,15 @@ import org.springframework.stereotype.Repository;
  * CriteriaBuilder:条件式（Where句以降の条件）の部分のクエリを作るためのビルダーです。
  * 戻り値はクエリを格納しているPredicateオブジェクトとなります。
  */
+
+//部署情報をデータベースから取得するRepository
+//                                           JpaRepositoryを継承する
 @Repository
 public interface DepartmentRepository extends JpaRepository<DepartmentEntity, Integer>, JpaSpecificationExecutor<DepartmentEntity> {
 
-
+//部署IDの完全一致検索条件を作成する
     static Specification<DepartmentEntity> idDepartmentEqual(Integer idDepartment) {
+        //部署IDがnullなら条件を設定しない
         return idDepartment == null ?
                 null :
                 // 戻り値の型 Specification<DepartmentEntity> にキャスト
@@ -33,7 +39,9 @@ public interface DepartmentRepository extends JpaRepository<DepartmentEntity, In
                         (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder.equal(root.get("idDepartment"), idDepartment);
     }
 
+    //部署名の完全一致条件を作成する
     static Specification<DepartmentEntity> nmDepartmentEqual(String nmDepartment) {
+    	//部署名が未入力なら条件を設定しない
         return (nmDepartment == null || nmDepartment.isEmpty()) ?
                 null :
                 (Specification<DepartmentEntity>)

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

@@ -12,24 +12,17 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import com.example.rhizome.app.domain.model.SearchConditionDepartment;
 import com.example.rhizome.app.domain.service.DeleteDepartment;
 import com.example.rhizome.app.domain.service.SearchDepartment;
 import com.example.rhizome.app.domain.service.SearchEmployee;
 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.MessageForm;
+import com.example.rhizome.app.presentation.form.SearchConditionDepartmentForm;
 
-/**
- * 削除処理のコントロータ
- */
 @Controller
 public class DeleteDepartmentController {
-	// ログ出力用インスタンス
+	 private final static Logger LOGGER = Logger.getLogger(DeleteDepartmentController.class.getName());
-	private final static Logger LOGGER = Logger.getLogger(DeleteEmployeeController.class.getName());
-
-	// エラーメッセージ用の定数フィールド
 	    private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
 
 	    HttpSession httpSession;
@@ -37,84 +30,43 @@ public class DeleteDepartmentController {
 	    SearchDepartment searchDepartment;
 	    SearchEmployee searchEmployee;   // 所属社員の確認に使う（既存）
 	    
+        //コンストラクタ
 	    @Autowired
-	public DeleteDepartmentController(DeleteDepartment deleteDepartment, SearchDepartment searchDepartment,
+	    public DeleteDepartmentController(HttpSession httpSession, DeleteDepartment deleteDepartment,
-			HttpSession httpSession, SearchEmployee searchEmployee) {
+	                                      SearchDepartment searchDepartment, SearchEmployee searchEmployee) {
 	        this.httpSession = httpSession;
 	        this.deleteDepartment = deleteDepartment;
 	        this.searchDepartment = searchDepartment;
 	        this.searchEmployee = searchEmployee;
 	    }
 
-	/**
-	 * 削除処理のコントローラ
-	 *
-	 * @param idDepartment 削除対象のdepartmentId
-	 * @param model      ビューにデータを渡すためのコンテナ
-	 * @return 遷移先の画面
-	 */
-
 	    @RequestMapping(value = TransitionTargetPageNameKeyword.DELETE_DEPARTMENT, method = RequestMethod.POST)
-	public String deleteDepartment(@RequestParam(value = "idDepartment", required = false) Integer idDepartment,
+	    public String deleteDepartment(@RequestParam(value = "idDepartment", required = false) Integer idDepartment, Model model) {
-			Model model) {
 
 	        final String UNKNOWN_ID = "削除対象のIDが不明です。";
-
+	        final String HAS_EMPLOYEE = "1名以上が所属している部署は削除出来ません。";
-		try {
-			// 部署一覧を取得し、画面に返す用のクラスに詰め替える
-			// 作成した部署一覧をセット
-			model.addAttribute(
-					PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-					DepartmentForm.convertFrom(searchDepartment.selectAll()));
-
-			if (idDepartment == null
-					|| searchDepartment.searchBy(new SearchConditionDepartment(idDepartment, null)) == null) {
-				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(UNKNOWN_ID));
-			}
-
-			// 削除処理実施
-			deleteExec(model, idDepartment);
-
-			// 検索画面に遷移
-			return "forward:" + TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_FORM_EMPTY;
-
-		} catch (Exception e) {
-			// ログイン情報の破棄
-			httpSession.invalidate();
-			e.printStackTrace();
-			// エラーログ出力
-			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-			// エラー画面遷移
-			return TransitionTargetPageNameKeyword.ERROR_HTML;
-		}
-	}
-
-	/**
-	 * 削除処理実施
-	 *
-	 * @param model      ビューにデータを渡すためのコンテナ
-	 * @param idEmployee 削除対象のDepartmentId
-	 */
-	private void deleteExec(Model model, Integer idDepartment) {
-
-		final String DELETE_DPARTMENT_TARGET_ID_CAN_NOT_DELETE = "1名以上が所属している部署は削除出来ません。";
 	        final String DELETE_COMPLETE = "削除しました。";
 
-		// 削除対象部署が1名以上所属しているかチェック
+	        try {
-		if (!searchEmployee.searchEmployeeByIdDepartment(idDepartment).isEmpty()) {
+	            // ★① idDepartment が null、または searchDepartment.searchBy(new SearchConditionDepartment(idDepartment, null)) が空
-			// 削除対象だった場合
+	            //     → MESSAGE_ERROR に UNKNOWN_ID を載せて一覧へ
-			// エラーメッセージをセット
-			model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
-					new MessageForm(DELETE_DPARTMENT_TARGET_ID_CAN_NOT_DELETE));
-			// 検索画面に遷移
-			return;
-		}
-
-		// 削除を実施
 	        	deleteDepartment.deleteDepartment(idDepartment);
+	            // ★② searchEmployee.searchEmployeeByIdDepartment(idDepartment) が空でない
+	            //     → MESSAGE_ERROR に HAS_EMPLOYEE を載せて一覧へ
+	        	model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,DepartmentForm.convertFrom(searchDepartment.selectAll()));
+	            // ★③ deleteDepartment.deleteDepartment(idDepartment) → MESSAGE_INFO に DELETE_COMPLETE を載せて一覧へ
+	        	model.addAttribute("searchConditinDepartmentForm", new SearchConditionDepartmentForm());
 
-		// 削除完了したメッセージをセット
+//	            return "一覧へ戻る（ステップ 2-5 で決める）";
-		model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(DELETE_COMPLETE));
+	        	return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
+	        } catch (Exception e) {
 	        	
+	            httpSession.invalidate();
+	            e.printStackTrace();
+	            LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
+	            model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,"部署を削除できませんでした");
+//	            return TransitionTargetPageNameKeyword.ERROR_HTML;
+	            return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
+	        }
 	    }
 }

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

@@ -1,21 +1,6 @@
 package com.example.rhizome.app.presentation.controller;
 
 
-import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.*;
-
-import java.util.Objects;
-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.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
 import com.example.rhizome.aop.aspect.PermissionCheck;
 import com.example.rhizome.aop.aspect.SessionCheck;
 import com.example.rhizome.app.domain.model.LoginUser;
@@ -27,9 +12,22 @@ import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTa
 import com.example.rhizome.app.presentation.form.DepartmentForm;
 import com.example.rhizome.app.presentation.form.LoginUserForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import javax.servlet.http.HttpSession;
+import java.util.Objects;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.DELETE_EMPLOYEE;
 
 /**
- * 削除処理のコントローラ
+ * 削除処理のコントロータ
  */
 @Controller
 public class DeleteEmployeeController {

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

@@ -1,125 +0,0 @@
-package com.example.rhizome.app.presentation.controller;
-
-import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.*;
-
-import java.util.ArrayList;
-import java.util.List;
-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.app.domain.service.RegisterDepartment;
-import com.example.rhizome.app.domain.service.SearchDepartment;
-import com.example.rhizome.app.domain.service.impl.RegisterDepartmentImpl;
-import com.example.rhizome.app.domain.service.impl.SearchDepartmentImpl;
-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.InsertDepartmentForm;
-import com.example.rhizome.app.presentation.form.MessageForm;
-
-@Controller
-public class InsertDepartmentController {
-
-	// ログ出力用インスタンス
-	private final static Logger LOGGER = Logger.getLogger(InsertEmployeeController.class.getName());
-
-	// エラーメッセージ用の定数フィールド
-	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
-
-	HttpSession httpSession;
-	RegisterDepartment registerDepartment;
-	SearchDepartment searchDepartment;
-
-	@Autowired
-	public InsertDepartmentController(HttpSession httpSession, RegisterDepartmentImpl registerDepartment,
-			SearchDepartmentImpl searchDepartment) {
-		this.httpSession = httpSession;
-		this.registerDepartment = registerDepartment;
-		this.searchDepartment = searchDepartment;
-	}
-
-	@ModelAttribute
-	public InsertDepartmentForm insertDepartmentForm() {
-		return new InsertDepartmentForm();
-	}
-
-	@RequestMapping(value = INSERT_DEPARTMENT_INPUT, method = RequestMethod.POST)
-	public String insertDepartment(InsertDepartmentForm insertDepartmentForm, Model model) {
-		try {
-			model.addAttribute(
-					PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-					DepartmentForm.convertFrom(
-							searchDepartment.selectAll()));
-			List<String> error2 = validateParameter2(
-					insertDepartmentForm.getIdDepartment(),
-					insertDepartmentForm.getNmDepartment());
-
-			// エラーが1件以上有る場合
-			if (!error2.isEmpty()) {
-				// エラー内容を画面に表示
-				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
-						new MessageForm(String.join(", ", error2) + "が不正です。"));
-				// 登録画面に遷移
-				return TransitionTargetPageNameKeyword.INSERT_DEPARTMENT_INPUT_HTML;
-			}
-
-			// 登録処理
-			registerDepartment.registerDepartment(InsertDepartmentForm.convertToo(insertDepartmentForm));
-			// 登録結果画面に遷移
-			return TransitionTargetPageNameKeyword.INSERT_DEPARTMENT_RESULT_HTML;
-
-		} catch (Exception e) {
-			// ログイン情報の破棄
-			httpSession.invalidate();
-
-			e.printStackTrace();
-
-			// エラーログ出力
-			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-			// エラー画面遷移
-			return TransitionTargetPageNameKeyword.ERROR_HTML;
-		}
-	}
-
-	private List<String> validateParameter2(
-
-			Integer departmentId,
-			String departmentNm) {
-
-		final String DEPARTMENT_ID_NULL_BLANK = "所属部署";
-		final String DEPARTMENT_NAME_NULL_BLANK = "部署名";
-
-		List<String> error2 = new ArrayList<>();
-
-		// null or 空文字判定
-		if (departmentId == null) {
-			// エラー内容を追加
-			error2.add(DEPARTMENT_ID_NULL_BLANK);
-		}
-
-		// null or 空文字判定
-		if (isNullOrBlank(departmentNm)) {
-			// エラー内容を追加
-			error2.add(DEPARTMENT_NAME_NULL_BLANK);
-		}
-		
-		return error2;
-	}
-
-	private static boolean isNullOrBlank(String str) {
-		if (null == str) {
-			return true;
-		}
-
-		return str.isBlank();
-	}
-}

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

@@ -1,6 +1,20 @@
 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.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.app.domain.model.LoginInfo;
 import com.example.rhizome.app.domain.model.LoginUser;
 import com.example.rhizome.app.domain.service.Login;
@@ -11,18 +25,6 @@ import com.example.rhizome.app.presentation.form.LoginInfoForm;
 import com.example.rhizome.app.presentation.form.LoginUserForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
 import com.example.rhizome.app.presentation.form.UpdatePersonalUserForm;
-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;
-
-import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.DO_LOGIN;
 
 /**
  * ログイン関連のコントローラ
@@ -106,7 +108,8 @@ public class LoginController {
                 // 編集対象のログイン者の情報を画面に渡す値にセット
                 model.addAttribute(PageReturnAttributeKeyword.UPDATE_PERSONAL_EMPLOYEE_USER_FORM, UpdatePersonalUserForm.convertFrom(loginUser));
                 // 個人の情報更新ページに遷移
-                return TransitionTargetPageNameKeyword.UPDATE_PERSONAL_EMPLOYEE_INPUT_HTML;
+                  return TransitionTargetPageNameKeyword.MENU_HTML;
+//                return TransitionTargetPageNameKeyword.UPDATE_PERSONAL_EMPLOYEE_INPUT_HTML;
             }
 
             // メニュー画面に遷移

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

@@ -2,6 +2,7 @@ package com.example.rhizome.app.presentation.controller;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
+//import java.util.List;
 
 import javax.servlet.http.HttpSession;
 
@@ -12,16 +13,18 @@ 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;
 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
+/**
+ * 部署検索画面用コントローラ　リスト全件表示、検索表示、更新、削除が可能
+ */
 
+//          検索Controller
+@Controller
 public class SelectDepartmentController {
 
 	// ログ出力用インスタンス
@@ -29,95 +32,96 @@ public class SelectDepartmentController {
 	// エラーメッセージ用の定数フィールド
 	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
 
+	//    public static final String SELECT_DEPARTMENT_FORM_EMPTY = "/selectDepartmentAll";
+
+	//    private static final String DEPARTMENT_HTML = "/department";
+
 	HttpSession httpSession;
 	SearchDepartment searchDepartment;
 
 	@Autowired
-	public SelectDepartmentController(HttpSession httpSession, SearchDepartment searchDepartment) {
+	public SelectDepartmentController(HttpSession httpSession, SearchDepartment serchDepartment) {
 		this.httpSession = httpSession;
-		this.searchDepartment = searchDepartment;
+		this.searchDepartment = serchDepartment;
 	}
 
+	//空の検索条件FormをこのControllerの画面用に用意する
 	@ModelAttribute
 	public SearchConditionDepartmentForm searchConditionDepartmentForm() {
 		return new SearchConditionDepartmentForm();
 	}
 
-	/**
+	@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT, method = RequestMethod.POST)
-	 * 部署検索画面表示処理コントローラ
+	public String select(SearchConditionDepartmentForm searchConditionDepartmentForm, Model model) {
+		try {
+			// ★考える：①検索サービスを呼ぶ（Form→Model変換 → 部分一致のメソッド）
+			//          ②結果(List<Department>)を DepartmentForm.convertFrom(...) で画面用に変換
+			//          ③ model に PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST という名前で載せる
+			model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm
+					.convertFrom(searchDepartment.searchByWithLike(SearchConditionDepartmentForm
+							.convertTo(searchConditionDepartmentForm))));
+
+			return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
+		} catch (Exception e) {
+			//httpSessionを破棄
+			httpSession.invalidate();
+
+			//エラー内容を出力
+			e.printStackTrace();
+
+			//ログにエラーを記録
+			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
+
+			//エラー画面へ遷移
+			return TransitionTargetPageNameKeyword.ERROR_HTML;
+		}
+	}
+
+	@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_FORM_EMPTY, method = RequestMethod.POST)
+	public String select(Model model) {
+		try {
+			// ★全件取得 → DepartmentForm に変換 → DEPARTMENT_FORM_LIST で model へ
+			return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
+		} catch (Exception e) {
+			httpSession.invalidate();
+			e.printStackTrace();
+			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
+			return TransitionTargetPageNameKeyword.ERROR_HTML;
+
+		}
+
+	}
+}
+
+/**
+ * 社員検索画面表示処理コントローラ
  *
  * @param searchConditionEmployeeForm 検索画面のフォーム
  * @param model                       ビューにデータを渡すためのコンテナ
  * @return 遷移先の画面
  */
-	@PermissionCheck
-	@SessionCheck
-	@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT, method = RequestMethod.POST)
-	public String select(SearchConditionDepartmentForm searchConditionDepartmentForm, Model model) {
 
-		try {
+//    @PermissionCheck
+//    @SessionCheck
+//    @RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT,
+//    method = RequestMethod.POST)
+//    public String showDepartment() {
+//    	
+//        return TransitionTargetPageNameKeyword.DEPARTMENT_HTML;
+//
+//    
+//    @RequestMapping(value =TransitionTargetPageNameKeyword.SELECT_DEPARTMENT, method = RequestMethod.POST)
+//    public String select(DepartmentForm departmentForm, Model model) {
+//    	try {
+//    		
+//    		model.addAttribute(
+//    				PageReturnAttributeKeyword.EMPLOYEE_INFO_FORM_LIST,EmployeeInfoForm.convertFrom(searchEmployeeInfo.searchBy(
+//                          SearchConditionEmployeeForm.convertTo(searchConditionEmployeeForm())
+//    				);		
 
-			// 部署一覧を取得し、画面に返す用のクラスに詰め替える
+//    /**
-			// 作成した部署一覧をセット
+//     * 社員検索画面表示処理コントローラ
-			model.addAttribute(
+//     * 検索条件無しの状態を作るため、空の検索条件で検索した結果を画面に返す
-					PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+//     *
-					DepartmentForm.convertFrom(searchDepartment.selectAll()));
+//     * @param model ビューにデータを渡すためのコンテナ
-			model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(
+//     * @return 遷移先の画面
-					searchDepartment.searchBy(SearchConditionDepartmentForm.convertTo(searchConditionDepartmentForm))));
-			//部分一致検索
-			model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-					DepartmentForm.convertFrom(
-							searchDepartment.searchByWithLike(
-									SearchConditionDepartmentForm.convertTo(searchConditionDepartmentForm))));
-
-			// 検索ページに遷移
-			return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
-
-		} catch (Exception e) {
-			// ログイン情報の破棄
-			httpSession.invalidate();
-
-			e.printStackTrace();
-
-			// エラーログ出力
-			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-			// エラー画面遷移
-			return TransitionTargetPageNameKeyword.ERROR_HTML;
-		}
-
-	}
-
-	/**
-	 * 部署検索画面表示処理コントローラ
-	 * 検索条件無しの状態を作るため、空の検索条件で検索した結果を画面に返す
-	 *
-	 * @param model ビューにデータを渡すためのコンテナ
-	 * @return 遷移先の画面
-	 */
-	@PermissionCheck
-	@SessionCheck
-	@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_FORM_EMPTY, method = RequestMethod.POST)
-	public String select(Model model) {
-
-		// 部署一覧を取得し、画面に返す用のクラスに詰め替える
-		// 作成した部署一覧をセット
-		model.addAttribute(
-				PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-				DepartmentForm.convertFrom(searchDepartment.selectAll()));
-
-		// 検索条件を元に検索を実施
-		//		model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-		//				DepartmentForm.convertFrom(
-		//						searchDepartment.searchBy(
-		//								SearchConditionDepartmentForm.convertTo(searchConditionDepartmentForm()))));
-
-		//部分一致検索
-		model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-				DepartmentForm.convertFrom(
-						searchDepartment.searchByWithLike(
-								SearchConditionDepartmentForm.convertTo(searchConditionDepartmentForm()))));
-		// 検索ページに遷移
-		return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
-	}
-
-}

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

@@ -1,5 +1,17 @@
 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;
@@ -9,16 +21,6 @@ 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;
 
 /**
  * 社員検索画面用コントローラ　リスト全件表示、検索表示、更新、削除が可能
@@ -31,6 +33,8 @@ public class SelectEmployeeController {
     // エラーメッセージ用の定数フィールド
     private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
     
+    public static final String SELECT_DEPARTMENT_FORM_EMPTY = "/selectDepartmentAll";
+
     HttpSession httpSession;
     SearchDepartment searchDepartment;
     SearchEmployeeInfo searchEmployeeInfo;
@@ -61,6 +65,7 @@ public class SelectEmployeeController {
 
         try {
         	
+
             // 部署一覧を取得し、画面に返す用のクラスに詰め替える
             // 作成した部署一覧をセット
             model.addAttribute(
@@ -75,6 +80,7 @@ public class SelectEmployeeController {
             return TransitionTargetPageNameKeyword.SELECT_EMPLOYEE_HTML;
 
 
+            
         } catch (Exception e) {
             // ログイン情報の破棄
             httpSession.invalidate();

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

@@ -1,85 +0,0 @@
-package com.example.rhizome.app.presentation.controller;
-
-import java.util.List;
-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.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import com.example.rhizome.app.domain.model.Department;
-import com.example.rhizome.app.domain.model.SearchConditionDepartment;
-import com.example.rhizome.app.domain.service.RegisterDepartment;
-import com.example.rhizome.app.domain.service.SearchDepartment;
-import com.example.rhizome.app.domain.service.impl.RegisterDepartmentImpl;
-import com.example.rhizome.app.domain.service.impl.SearchDepartmentImpl;
-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.MessageForm;
-import com.example.rhizome.app.presentation.form.UpdateDepartmentForm;
-
-@Controller
-public class UpdateDepartmentController {
-
-	// ログ出力用インスタンス
-	private final static Logger LOGGER = Logger.getLogger(UpdateEmployeeController.class.getName());
-	// エラーメッセージ用の定数フィールド
-	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
-
-	HttpSession httpSession;
-	RegisterDepartment registerDepartment;
-	SearchDepartment searchDepartment;
-
-	@Autowired
-	public UpdateDepartmentController(HttpSession httpSession, RegisterDepartmentImpl registerDepartment,
-			SearchDepartmentImpl searchDepartment) {
-		this.httpSession = httpSession;
-		this.registerDepartment = registerDepartment;
-		this.searchDepartment = searchDepartment;
-	}
-
-	@RequestMapping(value = TransitionTargetPageNameKeyword.SHOW_UPDATE_DEPARTMENT, method = RequestMethod.POST)
-	public String showUpdateDepartment(@RequestParam("idDepartment") Integer idDepartment, Model model) {
-		final String UPDATE_TARGET_ID_NOT_FOUND = "更新対象のデータが見つかりません。";
-		try {
-			// ★① searchDepartment.searchBy(new SearchConditionDepartment(idDepartment, null)) で対象を検索
-			// ★② 結果が空なら MESSAGE_ERROR を載せて "forward:" + SELECT_DEPARTMENT_FORM_EMPTY
-			// ★③ あれば UpdateDepartmentForm.convertFrom(結果の先頭) を
-			//     UPDATE_DEPARTMENT_FORM という名前で model に載せ、UPDATE_DEPARTMENT_INPUT_HTML を返す
-			List<Department> DepartmentList = searchDepartment.searchBy(
-					new SearchConditionDepartment(idDepartment, null));
-
-			// DBに更新対象のデータがあるか
-			if (DepartmentList.isEmpty()) {
-				// ない場合はエラーメッセージをセットして検索画面に戻る
-				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
-						new MessageForm(UPDATE_TARGET_ID_NOT_FOUND));
-				return "forward:" + TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_FORM_EMPTY;
-			}
-			// 更新画面に遷移
-			model.addAttribute(PageReturnAttributeKeyword.UPDATE_DEPARTMENT_FORM,
-					UpdateDepartmentForm.convertFrom(DepartmentList.get(0)));
-
-			// Update画面に遷移
-			return TransitionTargetPageNameKeyword.UPDATE_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/UpdateDepartmentResultController.java

@@ -1,97 +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.app.domain.service.SearchDepartment;
-import com.example.rhizome.app.domain.service.UpdateDepartment;
-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.MessageForm;
-import com.example.rhizome.app.presentation.form.UpdateDepartmentForm;
-
-@Controller
-public class UpdateDepartmentResultController {
-
-	// ログ出力用インスタンス
-	private final static Logger LOGGER = Logger.getLogger(UpdateEmployeeController.class.getName());
-	// エラーメッセージ用の定数フィールド
-	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
-
-	HttpSession httpSession;
-	SearchDepartment searchDepartment;
-	UpdateDepartment updateDepartment;
-
-	@Autowired
-	public UpdateDepartmentResultController(HttpSession httpSession, SearchDepartment searchDepartment,
-			UpdateDepartment updateDepartment) {
-		this.httpSession = httpSession;
-		this.searchDepartment = searchDepartment;
-		this.updateDepartment = updateDepartment;
-	}
-
-	@RequestMapping(value = TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_RESULT, method = RequestMethod.POST)
-	public String departmentUpdateResult(@ModelAttribute UpdateDepartmentForm updateDepartmentForm, Model model) {
-
-		final String NOTHING = "項目が空欄です。";
-		final String DUPLICATION = "既に同名の部署が存在するか、値が変更されていません。";
-		final String NO_TARGET = "更新対象のデータが見つかりません。";
-		final String UPDATE_COMPLETE = "更新が完了しました。";
-
-		try {
-			
-			// 部署一覧取得
-            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(searchDepartment.selectAll()));
-			
-            
-           updateDepartmentForm.hasRequiredValue();
-           
-			if(updateDepartmentForm.hasRequiredValue() == false) {
-				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(NOTHING));
-				model.addAttribute(PageReturnAttributeKeyword.UPDATE_DEPARTMENT_FORM, updateDepartmentForm);
-				return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
-			}
-			
-			if(searchDepartment.searchBy(null) != null){
-				// 存在する場合はエラーメッセージを設定して更新入力画面に遷移
-				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(DUPLICATION));
-				model.addAttribute(PageReturnAttributeKeyword.UPDATE_DEPARTMENT_FORM, updateDepartmentForm);
-				return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
-			}
-			
-			
-			if(searchDepartment.searchBy(null) != null) {
-				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(NO_TARGET));
-				model.addAttribute(PageReturnAttributeKeyword.UPDATE_DEPARTMENT_FORM, updateDepartmentForm);
-				return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
-			}
-
-			 // 更新結果のメッセージを画面にセットし一覧画面に遷移
-            model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(UPDATE_COMPLETE));
-
-            // forward 先で不用意な動作をしないために UpdateEmployeeInfoForm をクリア
-            return "forward:" + TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_FORM_EMPTY;
-
-		} 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/pageproperty/PageReturnAttributeKeyword.java

@@ -9,7 +9,6 @@ public class PageReturnAttributeKeyword {
     public static final String MESSAGE_INFO = "messageInfo";
 
     public static final String DEPARTMENT_FORM_LIST = "departmentFormList";
-    public static final String UPDATE_DEPARTMENT_FORM = "updateDepartmentForm";
     public static final String UPDATE_EMPLOYEE_INFO_FORM = "updateEmployeeInfoForm";
     public static final String INSERT_EMPLOYEE_FORM = "insertEmployeeForm";
     public static final String LOGIN_INFO_FORM = "loginInfoForm";

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

@@ -21,6 +21,7 @@ public class TransitionTargetPageNameKeyword {
     public static final String INSERT_EMPLOYEE_CONFIRM_HTML = "insertEmployeeConfirm";
     public static final String INSERT_EMPLOYEE_RESULT_HTML = "insertEmployeeResult";
     public static final String UPDATE_EMPLOYEE_INPUT_HTML = "updateEmployeeInput";
+    public static final String DEPARTMENT_HTML = "department";
 
     public static final String ERROR_HTML = "error";
 
@@ -30,6 +31,7 @@ public class TransitionTargetPageNameKeyword {
     public static final String INDEX_LOGIN = "/login";
     public static final String LOGOUT = "/logout";
     public static final String DO_LOGIN = "/doLogin";
+//    public static final String DEPARTMENT_HTML = "/department";
 
     // 一般向け(Controller)
     public static final String PERSONAL_UPDATE_RESULT = "/updatePersonalEmployeeResult";
@@ -44,23 +46,25 @@ public class TransitionTargetPageNameKeyword {
     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";
+    public static final String SHOW_DEPARTMENT = "/department";
+//    public static final String SELECT_DEPARTMENT = "/selectDepartment";
+    
+
+
+    
 
     // Department
-	// HTML
+    // HTML             実装手順書ステップ1-2通りの定数追加
     public static final String SELECT_DEPARTMENT_HTML = "selectDepartment";
-	public static final String UPDATE_DEPARTMENT_INPUT_HTML = "updateDepartmentInput";
-	public static final String INSERT_DEPARTMENT_INPUT_HTML = "insertDepartmentInput";
-	public static final String INSERT_DEPARTMENT_CONFIRM_HTML = "insertDepartmentConfirm";
-	public static final String INSERT_DEPARTMENT_RESULT_HTML = "insertDepartmentResult";
     
-	// Controller
+    // Controller       実装手順書ステップ1-2通りの定数追加 -> 管理者向けと重複、エラーでたため一旦コメアウト
     public static final String SELECT_DEPARTMENT = "/selectDepartment";
-	public static final String SELECT_DEPARTMENT_FORM_EMPTY = "/selectAll2";
+    
-	public static final String SHOW_UPDATE_DEPARTMENT = "/showUpdateDepartment";
+ // ステップ2-3*TransitionTargetPageNameKeyword の Department(Controller) の枠に追記
-	public static final String UPDATE_DEPARTMENT_RESULT = "/updateDepartmentResult";
-	public static final String INSERT_DEPARTMENT_INPUT = "/insertDepartmentInput";
     public static final String DELETE_DEPARTMENT = "/deleteDepartment";
     
+    public static final String SELECT_DEPARTMENT_FORM_EMPTY = "/selectDepartmentAll";
+
     /**
      * 管理者向けのページリストを返す
      *
@@ -83,12 +87,9 @@ public class TransitionTargetPageNameKeyword {
                 SELECT_EMPLOYEE_INFO_FORM_EMPTY,
                 SHOW_UPDATE_EMPLOYEE,
                 UPDATE_EMPLOYEE_RESULT,
-				SELECT_DEPARTMENT,
+                SELECT_DEPARTMENT              
-				SELECT_DEPARTMENT_FORM_EMPTY,
-				INSERT_DEPARTMENT_INPUT,
-				SHOW_UPDATE_DEPARTMENT,
-				SHOW_UPDATE_DEPARTMENT);
             
+        );
     }
 
     /**
@@ -103,7 +104,9 @@ public class TransitionTargetPageNameKeyword {
                 INDEX_LOGIN,
                 LOGOUT,
                 DO_LOGIN,
-				PERSONAL_UPDATE_RESULT);
+                PERSONAL_UPDATE_RESULT,
+                SHOW_DEPARTMENT
+        );
     }
 
 }

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

@@ -1,15 +1,17 @@
 package com.example.rhizome.app.presentation.form;
 
+import java.util.List;
+
 import com.example.rhizome.app.domain.model.Department;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.List;
-
 /**
  * 画面の表示に使う部署コード管理用のクラス
  */
+//            部署のフォーム
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

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

@@ -1,24 +0,0 @@
-package com.example.rhizome.app.presentation.form;
-
-import com.example.rhizome.app.domain.model.Department;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class InsertDepartmentForm {
-	private String nmEmployee;
-
-	private Integer idDepartment;
-
-	private String nmDepartment;
-
-	public static Department convertToo(InsertDepartmentForm insertDepartmentForm) {
-		return new Department(
-				insertDepartmentForm.getIdDepartment(),
-				insertDepartmentForm.getNmDepartment());
-	}
-}

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

@@ -6,38 +6,21 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+//          部署の検索条件
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 public class SearchConditionDepartmentForm {
-	/**
+	//部署ID
-	 * 部署ID
-	 */
 	private Integer idDepartment;
-
+	//部署名
-	/**
-	 * 部署名
-	 */
 	private String nmDepartment;
 	
-	public static SearchConditionDepartmentForm convertFrom(SearchConditionDepartment searchConditionDepartment) {
+	public static SearchConditionDepartment convertTo(SearchConditionDepartmentForm form) {
-	        return new SearchConditionDepartmentForm(
+		//SearchConditonDepartment();の中身：Formの2つの値を返す
-	                searchConditionDepartment.getIdDepartment(),
-	                searchConditionDepartment.getNmDepartment()
-	        );
-	    }
-
-	/**
-	     * 画面用（presentation 層）の SearchConditionEmployeeForm クラスから business 層の SearchConditionEmployee クラスに
-	     * 変換します。
-	     *
-	     * @param searchConditionEmployeeForm 画面用（presentation 層）の SearchConditionEmployeeForm インスタンス
-	     * @return business 層の SearchConditionEmployee インスタンス
-	     */
-	    public static SearchConditionDepartment convertTo(SearchConditionDepartmentForm searchConditionDepartmentForm) {
 		return new SearchConditionDepartment(
-	        		 searchConditionDepartmentForm.getIdDepartment(),
+				form.getIdDepartment(),
-		             searchConditionDepartmentForm.getNmDepartment()
+				form.getNmDepartment()
 				);
 	}
 }

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

@@ -1,32 +0,0 @@
-package com.example.rhizome.app.presentation.form;
-
-import com.example.rhizome.app.domain.model.Department;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class UpdateDepartmentForm {
-	private Integer idDepartment;
-	private String nmDepartment;
-
-	/** Model(Department) → Form */
-	public static UpdateDepartmentForm convertFrom(Department department) {
-		return new UpdateDepartmentForm(department.getIdDepartment(), department.getNmDepartment());
-	}
-
-	/** Form → Model(Department) */
-	public static Department convertTo(UpdateDepartmentForm form) {
-		return new Department(form.getIdDepartment(), form.getNmDepartment());
-	}
-
-	/** 必須チェック。true：OK／false：部署ID か部署名が空 */
-	public boolean hasRequiredValue() {
-		// ★考える：idDepartment が null でなく、nmDepartment が null でも空白だけでもない
-		if(idDepartment != null && nmDepartment.isBlank() && nmDepartment.isEmpty());
-		return false;
-	}
-}

src/main/resources/application.properties

@@ -1,3 +1,3 @@
 spring.datasource.url=jdbc:mysql://localhost:3306/rezodb
-spring.datasource.username=rezouser
+spring.datasource.username=rezouser1
-spring.datasource.password=Rezo_0000
+spring.datasource.password=Rezo_0001

src/main/resources/templates/insertDepartmentConfirm.html

@@ -1,18 +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>
-
-</body>
-
-</html>

src/main/resources/templates/insertDepartmentInput.html

@@ -1,56 +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="insertDepatmentConfirm" method="post" th:object="${insertDepartmentForm}">
-
-		<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>
-					<label>
-						<input class="readOnly" readonly="readonly" type="text" value="自動で設定されます" />
-					</label>
-				</td>
-			</tr>
-			<tr>
-				<th class="header">部署名</th>
-				<td>
-					<label>
-						<input maxlength="50" placeholder="部署名" required="required" th:field="*{nmDepartment}"
-							type="text" />
-					</label>
-				</td>
-			</tr>
-			<tr>
-				<td class="btnArea" colspan="2">
-					<input type="submit" value="登録確認" />
-				</td>
-			</tr>
-		</table>
-	</form>
-	<a href="showMenu">メニューに戻る</a>
-</body>
-
-</html>

src/main/resources/templates/insertDepartmentResult.html

@@ -1,18 +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>
-
-</body>
-
-</html>

src/main/resources/templates/menu.html

@@ -10,22 +10,33 @@
     <link rel="stylesheet" th:href="@{/css/all.css}">
     <link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
     <title>メニュー</title>
+	    <style>
+			.container{
+				width: 100%;
+				overflow: hidden;
+			}
+			.column{
+				width: 48%;
+				float: left;
+				margin: 1%;
+			}
+		</style>
 
 </head>
 
 <body>
-	<h1>
+<h1>
     メインメニュー　　　
     <div class="rightSection">
         <span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
         <button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
     </div>
-	</h1>
+</h1>
-	<table class="menuClass">
+<table class="menuClass">
     <tr>
         <td><a class="menuClass" href="javascript:selectEmployeeSubmit()"><i class="fas fa-search"></i> 社員検索 </a>
         </td>
-			<td class="description">登録済みのユーザ一覧表示と</br>更新、削除を行います。</td>
+        <td class="description">登録済みのユーザ一覧表示と更新、削除を行います。</td>
     </tr>
 
     <tr>
@@ -36,15 +47,15 @@
 	<tr>
 	    <td><a class="menuClass" href="javascript:selectDepartmentSubmit()"><i class="fas fa-search"></i> 部署検索 </a>
 	    </td>
-			<td class="description">登録済みの部署一覧表示と</br>更新、削除を行います。</td>
+	    <td class="description">登録済みの部署一覧表示と更新、削除を行います。</td>
 	</tr>
 	
 	<tr>
-			<td><a class="menuClass" href="javascript:insertDepartmentSubmit()"><i class="fas fa-plus"></i> 部署登録 </a></td>
+	    <td><a class="menuClass" href="javascript:insertEmployeeSubmit()"><i class="fas fa-plus"></i> 部署登録 </a></td>
 	    <td class="description">新規で部署追加を行います。</td>
 	</tr>
 
-	</table>
+</table>
 </body>
 
 <script type="text/javascript">

src/main/resources/templates/selectDepartment.html

@@ -1,109 +1,84 @@
 <!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
+<!--<html>   HTML文書の開始タグ-->
+<!--<head>   ページの設定情報を含む部分-->
+<!--<title>  ページのタイトルを指定するタグ-->
+<!--<body>   実際に表示される内容を記述する部分-->
+<!--<h1>     見出し最大サイズ・<p>段落の基本タグ-->
+<!--<div>    汎用のブロック要素　複数の要素をまとめてレイアウトするためのコンテナ-->
+<!--<table>	 表全体を囲む-->
+<!--<tr>     行全体を囲む-->
+<!--<th>     行見出しセルを囲む-->
+<!--<td>     行データセルを囲む-->
+<!--<a href ="URL"> 飛び先のURLを指定"> -->
 	
+	
+<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>
-		検索条件入力　　　
+    部署検索条件入力　　　
     <div class="rightSection">
         <span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
         <button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
     </div>
-	</h1>
+</h1>
-	<form action="selectDepartment" method="post" th:object="${searchConditionDepartmentForm}">
 
+<form action="selectDepartment" method="post" th:object="${searchConditionDepartmentForm}">
     <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>
+            <td><input placeholder="部署ID" th:field="*{idDepartment}" type="number"/></td>
-					<input placeholder="部署ID" th:field="*{idDepartment}" type="number" />
-				</td>
         </tr>
         <tr>
             <th class="header">部署名</th>
-				<td>
+            <td><input type="text" th:field="*{nmDepartment}"></td>
-					<input placeholder="部署名" th:field="*{nmDepartment}" type="text" />
-				</td>
         </tr>
         <tr>
-				<td class="btnArea" colspan="2">
+            <td class="btnArea" colspan="2"><input type="submit" value="検索"/></td>
-					<input type="submit" value="検索" />
+            <td class="btnArea" colspan="2"><button onclick="clearInput()">クリア</button></td>
-				</td>
-				<td class="btnArea" colspan="2">
-					<button onclick="clearInput()">クリア</button>
-				</td>
         </tr>
     </table>
-	</form>
+</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>
+<a href="showMenu">メニューに戻る</a>
-	<th:block th:if="${departmentFormList != null and departmentFormList.size() > 0}">
+<h1><span>検索結果</span></h1>
-		<!-- 検索結果が1件以上ある場合 -->
+
-		<table class="table-grid table-striped table-hover">
+<!-- ★検索結果が1件以上：表(部署ID・部署名)を th:each で繰り返す。変数は departmentFormList -->
-			<thead>
+
-				<tr>
+<!--<table th:if="${departmentFormList != null and !departmentFromList.isEmpty()}">-->
-					<th style="width: 150px;">部署ID</th>
+
-					<th style="width: 280px;">部署名</th>
+	<table th:each="departmentForm : ${departmentFormList}">
-					<th style="width: 500px;">操作</th>
+
-				</tr>
+<tr>
-			</thead>
+	<th>部署ID</th>
-			<tbody>
+	<th>部署名</th>
-				<tr th:each="departmentForm : ${departmentFormList}">
+</tr>
+<!--    <tr th:each="department:${departmentFormList}">-->
 	    <td th:text="${departmentForm.idDepartment}"></td>
 	    <td th:text="${departmentForm.nmDepartment}"></td>
-					<td>
-						<!-- 更新フォーム -->
-						<form action="showUpdateDepartment" method="post" style="display: inline;">
-							<input name="idDepartment" th:value="${departmentForm.idDepartment}" type="hidden">
-							<input type="submit" value="更新">
-						</form>
-						<!-- 削除フォーム -->
-						<form action="deleteDepartment" method="post" onsubmit="return confirm('本当に削除しますか？');"
-							style="display: inline;">
-							<input name="idDepartment" th:value="${departmentForm.idDepartment}" type="hidden">
-							<input type="submit" value="削除">
-						</form>
-					</td>
     </tr>
-			</tbody>
+</table>
-		</table>
+
-	</th:block>
+<p th:if="${departmentFormList != null and departmentFormList.isEmpty()}">
-	<th:block th:if="${departmentFormList == null or departmentFormList.size() == 0}">
-		<!-- 検索結果が0件の場合 -->
 	検索結果はありません。
-	</th:block>
+</p>
+
 
 </body>
 <script type="text/javascript">
-
     function clearInput() {
-		document.getElementById('idDepartment').selectedIndex = 0;
+        document.getElementById('idDepartment').value = '';
-		document.getElementById('nmDepartment').value = '';
+        // ★部署名の入力欄も空にする（id は th:field が自動で作る）
+		
     }
-
-
 </script>
-
 </html>

src/main/resources/templates/updateDepartmentInput.html

@@ -1,59 +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="updateDepartmentResult" method="post" onsubmit="return confirm('本当によろしいですか？');"
-		th:object="${updateDepartmentForm}">
-
-		<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 class="readOnly" readonly="readonly" th:field="*{idDepartment}" type="text" />
-				</td>
-			</tr>
-			<tr>
-				<th class="header">部署名</th>
-				<td>
-					<input maxlength="50" placeholder="部署名" required="required" th:field="*{nmDepartment}"
-						type="text" />
-				</td>
-			</tr>
-			<tr>
-				<td class="btnArea" colspan="2"><input type="submit" value="更新" /></td>
-			</tr>
-		</table>
-	</form>
-	<a href="javascript:selectDepartmentSubmit()">一覧に戻る</a>
-	<script type="text/javascript">
-		function selectDepartmentSubmit() {
-			const form = document.createElement('form');
-			form.setAttribute('method', 'post');
-			form.setAttribute('action', 'selectDepartment');
-			document.body.appendChild(form);
-			form.submit();
-		}
-	</script>
-</body>
-
-</html>