段階３完了

.gitignore

@@ -1,2 +1 @@
 /target/
-/bin/

.project

@@ -16,12 +16,12 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>

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

@@ -7,5 +7,5 @@ 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.release=enabled
 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>

pom.xml

@@ -20,12 +20,6 @@
         <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/DeleteDepartment.java

@@ -1,6 +1,5 @@
 package com.example.rhizome.app.domain.service;
 
 public interface DeleteDepartment {
-	void delete(Integer idDepartment);
+	void deleteDepartment(Integer idDepartment);
-
 }

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

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

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

@@ -1,16 +1,14 @@
 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();
 
     List<Department> searchBy(SearchConditionDepartment searchConditionDepartment);
 
     List<Department> searchByWithLike(SearchConditionDepartment searchConditionDepartment);
-
-	Department searchById(Integer idDepartment);
 }

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

@@ -3,5 +3,6 @@ package com.example.rhizome.app.domain.service;
 import com.example.rhizome.app.domain.model.Department;
 
 public interface UpdateDepartment {
-    void update(Department department);
+	void updateDepartment(Department depart);
+
 	}

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

@@ -0,0 +1,34 @@
+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 DeleteDeparmentImpl implements DeleteDepartment{
+	DepartmentRepository departmentRepository;
+
+	@Autowired
+    public DeleteDeparmentImpl(DepartmentRepository departmentRepository) {
+		 this.departmentRepository = departmentRepository;
+
+	}
+
+
+	/**
+	 * idDepartment を元に department データを削除
+	 *
+	 * @param idDepartmetn 削除対象のidDepartment
+	 */
+	public void deleteDepartment(Integer idDepartment) {
+		departmentRepository.deleteById(idDepartment);
+	}
+
+}

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

@@ -1,20 +0,0 @@
-package com.example.rhizome.app.domain.service.impl;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.example.rhizome.app.domain.service.DeleteDepartment;
-import com.example.rhizome.app.infra.repository.DepartmentRepository;
-
-@Service
-public class DeleteDepartmentImpl implements DeleteDepartment {
-
-    @Autowired
-    private DepartmentRepository departmentRepository;
-
-    @Override
-    public void delete(Integer idDepartment) {
-        // JpaRepository တွင်ပါရှိသော deleteById ကို အသုံးပြု၍ ဖယ်ရှားရန်
-        departmentRepository.deleteById(idDepartment);
-    }
-}

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

@@ -1,29 +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.InsertDepartment;
-import com.example.rhizome.app.infra.entity.DepartmentEntity;
-import com.example.rhizome.app.infra.repository.DepartmentRepository;
-
-@Service
-@Transactional
-public class InsertDepartmentImpl implements InsertDepartment {
-
-	DepartmentRepository departmentRepository;
-
-	@Autowired
-	public InsertDepartmentImpl(DepartmentRepository departmentRepository) {
-		this.departmentRepository = departmentRepository;
-	}
-
-	@Override
-	public void insert(Department department) {
-		DepartmentEntity entity = new DepartmentEntity();
-		entity.setNmDepartment(department.getNmDepartment());
-		departmentRepository.save(entity);
-	}
-}

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

@@ -1,18 +1,17 @@
 package com.example.rhizome.app.domain.service.impl;
 
 
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.example.rhizome.app.domain.model.Department;
 import com.example.rhizome.app.domain.model.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;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
 
 /**
  * 部署情報検索系の機能を集約させるサービスクラスです。
@@ -79,22 +78,5 @@ public class SearchDepartmentImpl implements SearchDepartment {
                         )
                 );
 
-    }
-
-	@Override
-	public Department searchById(Integer idDepartment) {
-		// TODO 自動生成されたメソッド・スタブ
-		if (idDepartment == null) {
-            return null;
-        }
-        
-        return departmentRepository.findById(idDepartment)
-                .map(entity -> {
-                    List<Department> list = DepartmentEntity.createDepartmentList(List.of(entity));
-                    return list.isEmpty() ? null : list.get(0);
-                })
-                .orElse(null);
-    
-		
     }
 }

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

@@ -2,6 +2,7 @@ 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.UpdateDepartment;
@@ -9,18 +10,20 @@ import com.example.rhizome.app.infra.entity.DepartmentEntity;
 import com.example.rhizome.app.infra.repository.DepartmentRepository;
 
 @Service
+@Transactional
 public class UpdateDepartmentImpl implements UpdateDepartment {
 
-    @Autowired
+	DepartmentRepository departmentRepository;
-    private DepartmentRepository departmentRepository;
 
-    @Override
+	@Autowired
-    public void update(Department department) {
+	public UpdateDepartmentImpl(DepartmentRepository departmentRepository) {
-        // Model မှ Entity သို့ ပြောင်းလဲခြင်း သို့မဟုတ် သက်ဆိုင်ရာ update ကို save ဖြင့် လုပ်ဆောင်ရန်
+		this.departmentRepository = departmentRepository;
+	}
+
+	public void updateDepartment(Department department) {
 		DepartmentEntity entity = new DepartmentEntity();
 		entity.setIdDepartment(department.getIdDepartment());
 		entity.setNmDepartment(department.getNmDepartment());
-        
 		departmentRepository.save(entity);
 	}
 }

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

@@ -0,0 +1,17 @@
+package com.example.rhizome.app.domain.service;
+
+import java.util.List;
+
+import com.example.rhizome.app.domain.model.EmployeeInfo;
+import com.example.rhizome.app.domain.model.SearchConditionDepartment;
+
+public interface searchDepartmentinfo {
+	List<EmployeeInfo> selectAll();
+
+    static List<EmployeeInfo> searchBy(SearchConditionDepartment searchConditionDepartment) {
+		// TODO 自動生成されたメソッド・スタブ
+		return null;
+	}
+}
+
+

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

@@ -1,47 +1,135 @@
 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.PostMapping;
+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;
 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.SessionKeyword;
 import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
+import com.example.rhizome.app.presentation.form.DepartmentInfoForm;
+import com.example.rhizome.app.presentation.form.LoginUserForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
 
+/**
+ * 削除処理のコントロータ
+ */
 @Controller
 public class DeleteDepartmentController {
 
-    HttpSession httpSession;
+	// ログ出力用インスタンス
-    DeleteDepartment deleteDepartment;
+	private final static Logger LOGGER = Logger.getLogger(DeleteDepartmentController.class.getName());
 
-    @Autowired
+	// エラーメッセージ用の定数フィールド
-    public DeleteDepartmentController(HttpSession httpSession, DeleteDepartment deleteDepartment) {
+	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
-        this.httpSession = httpSession;
+	final String UNKNOWN_ID = "削除対象のIDが不明です。";
-        this.deleteDepartment = deleteDepartment;
+	final String DELETE_TARGET_ID_CAN_NOT_DELETE = "1名以上が所属している部署は削除できません。";
-    }
-
-    @SessionCheck
-    @PostMapping("/deleteDepartmentInput")
-    public String deleteDepartment(@RequestParam("idDepartment") Integer idDepartment, Model model) {
 	final String DELETE_COMPLETE = "削除しました。";
 
+	HttpSession httpSession;
+	DeleteDepartment deleteDepartment;
+	SearchDepartment searchDepartment;
+	SearchEmployee searchEmployee;
+
+	@Autowired
+	public DeleteDepartmentController(DeleteDepartment deleteDepartment, SearchDepartment searchDepartment,
+			HttpSession httpSession, SearchEmployee searchEmployee) {
+		this.httpSession = httpSession;
+		this.deleteDepartment = deleteDepartment;
+		this.searchDepartment = searchDepartment;
+		this.searchEmployee = searchEmployee;
+	}
+
+	/**
+	 * 削除処理のコントローラ
+	 *
+	 * @param idDepartment 削除対象のdepartmentId
+	 * @param model      ビューにデータを渡すためのコンテナ
+	 * @return 遷移先の画面
+	 */
+	@PermissionCheck
+	@SessionCheck
+	@RequestMapping(value = DELETE_DEPARTMENT, method = RequestMethod.POST)
+	public String deleteDepartment(@RequestParam("idDepartment") Integer idDepartment, Model model) {
+
 		try {
-            // ဌာန ဖယ်ရှားခြင်း လုပ်ဆောင်ချက်
+			if (idDepartment == null) {
-            deleteDepartment.delete(idDepartment);
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, UNKNOWN_ID);
+				model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+						DepartmentInfoForm.convertFrom(searchDepartment.selectAll()));
+				return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
+			} else {
 
-            model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(DELETE_COMPLETE));
+				// 部署一覧を取得し、画面に返す用のクラスに詰め替える
-            return "forward:/selectDepartment";
+				// 作成した部署一覧をセット
+				model.addAttribute(
+						PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+						DepartmentInfoForm.convertFrom(searchDepartment.selectAll()));
 
+				// 削除処理実施
+				deleteExec(
+						model,
+						idDepartment,
+						LoginUserForm.convertTo((LoginUserForm) httpSession.getAttribute(SessionKeyword.LOGIN_USER)));
+
+				// 検索画面に遷移
+				return "forward:" + TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO_FORM_EMPTY;
+			}
 		} catch (Exception e) {
+			// ログイン情報の破棄
 			httpSession.invalidate();
+
 			e.printStackTrace();
+			// エラーログ出力
+			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
+			// エラー画面遷移
 			return TransitionTargetPageNameKeyword.ERROR_HTML;
 		}
 	}
+
+	/**
+	 * 削除処理実施
+	 *
+	 * @param model      ビューにデータを渡すためのコンテナ
+	 * @param idDepartment 削除対象のdepartmentId
+	 * @param loginUser  ログインユーザー情報
+	 */
+
+	private void deleteExec(Model model, Integer idDepartment, LoginUser loginUser) {
+
+		// 1名以上が所属している場合
+		if (loginUser != null && Objects.equals(loginUser.getIdDepartment(), idDepartment)) {
+			// 削除対象だった場合
+			// エラーメッセージをセット
+			model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
+					new MessageForm(DELETE_TARGET_ID_CAN_NOT_DELETE));
+			// 検索画面に遷移
+			return;
+		}
+
+		// 削除を実施
+		deleteDepartment.deleteDepartment(idDepartment);
+		;
+
+		// 削除完了したメッセージをセット
+		model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(DELETE_COMPLETE));
+
+	}
 }

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

@@ -9,7 +9,7 @@ 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.SessionKeyword;
 import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.DepartmentForm;
+import com.example.rhizome.app.presentation.form.DepartmentInfoForm;
 import com.example.rhizome.app.presentation.form.LoginUserForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -66,7 +66,7 @@ public class DeleteEmployeeController {
             // 作成した部署一覧をセット
             model.addAttribute(
                     PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-                    DepartmentForm.convertFrom(searchDepartment.selectAll())
+                    DepartmentInfoForm.convertFrom(searchDepartment.selectAll())
             );
 
             // 削除処理実施

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

@@ -1,78 +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.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-import com.example.rhizome.aop.aspect.SessionCheck;
-import com.example.rhizome.app.domain.model.Department;
-import com.example.rhizome.app.domain.service.InsertDepartment;
-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;
-
-@Controller
-public class InsertDepartmentController {
-
-    private final static Logger LOGGER = Logger.getLogger(InsertDepartmentController.class.getName());
-    private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
-
-    HttpSession httpSession;
-    InsertDepartment insertDepartment;
-
-    @Autowired
-    public InsertDepartmentController(HttpSession httpSession, InsertDepartment insertDepartment) {
-        this.httpSession = httpSession;
-        this.insertDepartment = insertDepartment;
-    }
-
-    /**
-     * 部署登録入力画面を表示する
-     */
-    @SessionCheck
-    @RequestMapping(value = "/insertDepartmentInput", method = {RequestMethod.GET, RequestMethod.POST})
-    public String showInsertDepartment(Model model) {
-        try {
-            model.addAttribute("departmentForm", new DepartmentForm());
-            return "insertDepartmentInput";
-        } catch (Exception e) {
-            httpSession.invalidate();
-            e.printStackTrace();
-            LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-            return TransitionTargetPageNameKeyword.ERROR_HTML;
-        }
-    }
-
-    /**
-     * 部署情報の登録を実行する
-     */
-    @SessionCheck
-    @PostMapping("/insertDepartmentResult")
-    public String insertDepartmentResult(@ModelAttribute("departmentForm") DepartmentForm departmentForm, Model model) {
-        final String INSERT_COMPLETE = "登録しました。";
-
-        try {
-            Department department = new Department(null, departmentForm.getNmDepartment());
-            insertDepartment.insert(department);
-
-            model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(INSERT_COMPLETE));
-            return "forward:/selectDepartment";
-
-        } 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/InsertEmployeeConfirmController.java

@@ -9,7 +9,7 @@ import com.example.rhizome.app.domain.service.impl.SearchDepartmentImpl;
 import com.example.rhizome.app.domain.service.impl.SearchEmployeeImpl;
 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.DepartmentInfoForm;
 import com.example.rhizome.app.presentation.form.InsertEmployeeForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -75,7 +75,7 @@ public class InsertEmployeeConfirmController {
             // 作成した部署一覧をセット
             model.addAttribute(
                     PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-                    DepartmentForm.convertFrom(
+                    DepartmentInfoForm.convertFrom(
                             searchDepartment.selectAll()
                     ));
 

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

@@ -8,7 +8,7 @@ import com.example.rhizome.app.domain.service.impl.RegisterEmployeeImpl;
 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.DepartmentInfoForm;
 import com.example.rhizome.app.presentation.form.InsertEmployeeForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,7 +71,7 @@ public class InsertEmployeeController {
             // 作成した部署一覧をセット
             model.addAttribute(
                     PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-                    DepartmentForm.convertFrom(
+                    DepartmentInfoForm.convertFrom(
                             searchDepartment.selectAll()
                     ));
 

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

@@ -6,7 +6,7 @@ import com.example.rhizome.app.domain.service.RegisterEmployee;
 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.DepartmentInfoForm;
 import com.example.rhizome.app.presentation.form.InsertEmployeeForm;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -64,7 +64,7 @@ public class InsertEmployeeInputController {
 
         try {
             // 部署コードリストを作成し、画面に返す値としてセット
-            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(searchDepartment.selectAll()));
+            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentInfoForm.convertFrom(searchDepartment.selectAll()));
 
             // パラメータをセット
             model.addAttribute(PageReturnAttributeKeyword.INSERT_EMPLOYEE_FORM, insertEmployeeForm);

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

@@ -1,41 +1,114 @@
 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.GetMapping;
 import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PostMapping;
+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.Department;
 import com.example.rhizome.app.domain.service.SearchDepartment;
-import com.example.rhizome.app.presentation.form.DepartmentForm;
+import com.example.rhizome.app.domain.service.SearchEmployeeInfo;
-import com.example.rhizome.app.presentation.form.SearchConditionDepartmentForm;
+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.DepartmentInfoForm;
+import com.example.rhizome.app.presentation.form.SearchConditionDepartment;
 
 @Controller
 public class SelectDepartmentController {
+	// ログ出力用インスタンス
+	private final static Logger LOGGER = Logger.getLogger(SelectDepartmentController.class.getName());
+	// エラーメッセージ用の定数フィールド
+	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
+
+	HttpSession httpSession;
+	SearchDepartment searchDepartment;
+	SearchEmployeeInfo searchEmployeeInfo;
 
 	@Autowired
-    private SearchDepartment searchDepartment;
+	public SelectDepartmentController(HttpSession httpSession, SearchDepartment searchDepartment,
+			SearchEmployeeInfo searchEmployeeInfo) {
+		this.httpSession = httpSession;
+		this.searchDepartment = searchDepartment;
+		this.searchEmployeeInfo = searchEmployeeInfo;
+	}
 
-    /** 部署検索画面の初期表示 */
+	@ModelAttribute
+	public SearchConditionDepartment searchConditionDepartment() {
+		return new SearchConditionDepartment();
+	}
+
+	/**
+	 * 社員検索画面表示処理コントローラ
+	 *
+	 * @param searchConditionDepartment 検索画面のフォーム
+	 * @param model                       ビューにデータを渡すためのコンテナ
+	 * @return 遷移先の画面
+	 */
+	@PermissionCheck
 	@SessionCheck
-    @GetMapping("/showSelectDepartment")
+	@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO, method = RequestMethod.POST)
-    public String showSelectDepartment(@ModelAttribute SearchConditionDepartmentForm searchConditionDepartmentForm) {
+	public String select(SearchConditionDepartment searchConditionDepartment, Model model) {
-        return "selectDepartment";
+
+		try {
+
+			// 部署一覧を取得し、画面に返す用のクラスに詰め替える
+			// 作成した部署一覧をセット
+			model.addAttribute(
+					PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+					DepartmentInfoForm.convertFrom(searchDepartment.selectAll()));
+
+			// 検索条件を元に検索を実施
+			// 取得した EmployeeInfo（ employee + department ）の情報を画面に返す用の型に詰め替えてセット
+			model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentInfoForm.convertFrom(
+					searchDepartment.searchBy(SearchConditionDepartment.convertTo(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;
+		}
 	}
 
-    /** 部署検索処理 */
+	/**
-    @PostMapping("/selectDepartment")
+	 * 部署検索画面表示処理コントローラ
-    public String selectDepartment(@ModelAttribute SearchConditionDepartmentForm searchConditionDepartmentForm, Model model) {
+	 * 検索条件無しの状態を作るため、空の検索条件で検索した結果を画面に返す
-        List<Department> departmentList = searchDepartment.searchByWithLike(
+	 *
-                SearchConditionDepartmentForm.convertTo(searchConditionDepartmentForm)
+	 * @param model ビューにデータを渡すためのコンテナ
-        );
+	 * @return 遷移先の画面
+	 */
+	@PermissionCheck
+	@SessionCheck
+	@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO_FORM_EMPTY, method = RequestMethod.POST)
+	public String select(Model model) {
 
-        model.addAttribute("departmentFormList", DepartmentForm.convertFrom(departmentList));
+		// 部署一覧を取得し、画面に返す用のクラスに詰め替える
-        return "selectDepartment";
+		// 作成した部署一覧をセット
+		model.addAttribute(
+				PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+				DepartmentInfoForm.convertFrom(searchDepartment.selectAll()));
+
+		// 検索条件を元に検索を実施
+		model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+				DepartmentInfoForm.convertFrom(
+						searchDepartment.searchBy(SearchConditionDepartment.convertTo(searchConditionDepartment()))));
+
+		// 検索ページに遷移
+		return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
 	}
 }

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

@@ -1,14 +1,10 @@
 package com.example.rhizome.app.presentation.controller;
 
-import com.example.rhizome.aop.aspect.PermissionCheck;
+import java.util.logging.Level;
-import com.example.rhizome.aop.aspect.SessionCheck;
+import java.util.logging.Logger;
-import com.example.rhizome.app.domain.service.SearchDepartment;
+
-import com.example.rhizome.app.domain.service.SearchEmployeeInfo;
+import javax.servlet.http.HttpSession;
-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.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;
@@ -16,9 +12,15 @@ 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 com.example.rhizome.aop.aspect.PermissionCheck;
-import java.util.logging.Level;
+import com.example.rhizome.aop.aspect.SessionCheck;
-import java.util.logging.Logger;
+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.DepartmentInfoForm;
+import com.example.rhizome.app.presentation.form.EmployeeInfoForm;
+import com.example.rhizome.app.presentation.form.SearchConditionEmployeeForm;
 
 /**
  * 社員検索画面用コントローラ　リスト全件表示、検索表示、更新、削除が可能
@@ -65,11 +67,10 @@ public class SelectEmployeeController {
             // 作成した部署一覧をセット
             model.addAttribute(
                     PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-                    DepartmentForm.convertFrom(searchDepartment.selectAll())
+                    DepartmentInfoForm.convertFrom(searchDepartment.selectAll())
             );
 
             // 検索条件を元に検索を実施
-            // 取得した EmployeeInfo（ employee + department ）の情報を画面に返す用の型に詰め替えてセット
             model.addAttribute(PageReturnAttributeKeyword.EMPLOYEE_INFO_FORM_LIST, EmployeeInfoForm.convertFrom(searchEmployeeInfo.searchBy(SearchConditionEmployeeForm.convertTo(searchConditionEmployeeForm))));
             // 検索ページに遷移
             return TransitionTargetPageNameKeyword.SELECT_EMPLOYEE_HTML;
@@ -105,7 +106,7 @@ public class SelectEmployeeController {
         // 作成した部署一覧をセット
         model.addAttribute(
                 PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-                DepartmentForm.convertFrom(searchDepartment.selectAll())
+                DepartmentInfoForm.convertFrom(searchDepartment.selectAll())
         );
 
         // 検索条件を元に検索を実施

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

@@ -1,5 +1,6 @@
 package com.example.rhizome.app.presentation.controller;
 
+import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -9,80 +10,128 @@ 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.PostMapping;
 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.Department;
 import com.example.rhizome.app.domain.service.SearchDepartment;
+import com.example.rhizome.app.domain.service.SearchEmployee;
 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.SearchConditionDepartment;
+import com.example.rhizome.app.presentation.form.UpdateDepartmentForm;
 
 @Controller
 public class UpdateDepartmentController {
+	// ログ出力用インスタンス
+	private final static Logger LOGGER = Logger.getLogger(DeleteDepartmentController.class.getName());
 
-    private final static Logger LOGGER = Logger.getLogger(UpdateDepartmentController.class.getName());
+	private static final String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
-    private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
 
 	HttpSession httpSession;
+	UpdateDepartment updateDepartment;
 	SearchDepartment searchDepartment;
-    UpdateDepartment updateDepartment; // 追加
+	SearchEmployee searchEmployee;
 
 	@Autowired
-    public UpdateDepartmentController(HttpSession httpSession, SearchDepartment searchDepartment, UpdateDepartment updateDepartment) {
+	public UpdateDepartmentController(UpdateDepartment updateDepartment, SearchDepartment searchDepartment,
+			HttpSession httpSession, SearchEmployee searchEmployee) {
 		this.httpSession = httpSession;
+		this.updateDepartment = updateDepartment;
 		this.searchDepartment = searchDepartment;
-        this.updateDepartment = updateDepartment; // 追加
+		this.searchEmployee = searchEmployee;
 	}
 
+	@ModelAttribute
+	public SearchConditionDepartment searchConditionDepartment() {
+		return new SearchConditionDepartment();
+	}
+
+	@PermissionCheck
 	@SessionCheck
-    @PostMapping("/updateDepartmentInput")
+	@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 {
-            Department department = searchDepartment.searchById(idDepartment);
+			List<Department> departmentList = searchDepartment
-
+					.searchBy(new com.example.rhizome.app.domain.model.SearchConditionDepartment(idDepartment, null));
-            if (department == null) {
+			if (departmentList.isEmpty()) {
-                model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(UPDATE_TARGET_ID_NOT_FOUND));
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
-                return "forward:/selectDepartment";
+						new MessageForm(UPDATE_TARGET_ID_NOT_FOUND));
+				return "forward:" + TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO;
 			}
+			// 更新画面に遷移
+			model.addAttribute(PageReturnAttributeKeyword.UPDATE_DEPARTMENT_INFO_FORM,
+					UpdateDepartmentForm.convertFrom(departmentList.get(0)));
 
-            model.addAttribute("departmentForm", DepartmentForm.convertFrom(department));
+			// Update画面に遷移
-            return "updateDepartmentInput";
+			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;
 		}
+
 	}
 
-    /**
+	@RequestMapping(value = TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_RESULT, method = RequestMethod.POST)
-     * 部署情報の更新を実行する
+	public String departmentUpdateResult(@ModelAttribute UpdateDepartmentForm updateDepartmentForm, Model model) {
-     */
-    @SessionCheck
-    @RequestMapping(value = "/updateDepartmentResult", method = RequestMethod.POST)
-    public String updateDepartmentResult(@ModelAttribute("departmentForm") DepartmentForm departmentForm, Model model) {
-        final String UPDATE_COMPLETE = "更新しました。";
 
+		final String NOTHING = "項目が空欄です。";
+		final String DUPLICATION = "既に同名の部署が存在するか、値が変更されていません。";
+		final String NO_TARGET = "更新対象のデータが見つかりません。";
+		final String UPDATE_COMPLETE = "更新が完了しました。";
 		try {
-            Department department = new Department(departmentForm.getIdDepartment(), departmentForm.getNmDepartment());
-            updateDepartment.update(department);
-
-            model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(UPDATE_COMPLETE));
-            return "forward:/selectDepartment";
 
+			boolean bo = updateDepartmentForm.hasRequiredValue();
+			if (bo == false) {
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
+						new MessageForm(NOTHING));
+				return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
+			}
+			List<Department> departmentList = searchDepartment
+					.searchBy(new com.example.rhizome.app.domain.model.SearchConditionDepartment(null,
+							updateDepartmentForm.getNmDepartment()));
+			if (departmentList == null && departmentList.isEmpty()){
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
+						new MessageForm(DUPLICATION));
+				return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
+			}
+			List<Department> departmentList2 = searchDepartment
+					.searchBy(new com.example.rhizome.app.domain.model.SearchConditionDepartment(
+							updateDepartmentForm.getIdDepartment(), null));
+			if (departmentList2 == null || departmentList2.isEmpty()) {
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
+						new MessageForm(NO_TARGET));
+				return PageReturnAttributeKeyword.UPDATE_DEPARTMENT_INFO_FORM;
+			}
+			Department department = new Department(updateDepartmentForm.getIdDepartment(),
+					updateDepartmentForm.getNmDepartment());
+			updateDepartment.updateDepartment(department);
+			model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO,
+					new MessageForm(UPDATE_COMPLETE));
+			return PageReturnAttributeKeyword.UPDATE_DEPARTMENT_INFO_FORM;
 		} 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/UpdateEmployeeController.java

@@ -8,7 +8,7 @@ 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.DepartmentInfoForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
 import com.example.rhizome.app.presentation.form.SearchConditionEmployeeForm;
 import com.example.rhizome.app.presentation.form.UpdateEmployeeInfoForm;
@@ -67,7 +67,7 @@ public class UpdateEmployeeController {
 
         try {
             // 部署一覧を取得し画面に返す値としてセット
-            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(searchDepartment.selectAll()));
+            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentInfoForm.convertFrom(searchDepartment.selectAll()));
 
             // id を条件に更新対象のレコードを検索、取得する
             List<EmployeeInfo> employeeInfoList = searchEmployeeInfo.searchBy(

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

@@ -11,7 +11,7 @@ import com.example.rhizome.app.domain.service.UpdateEmployee;
 import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
 import com.example.rhizome.app.presentation.controller.pageproperty.SessionKeyword;
 import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.DepartmentForm;
+import com.example.rhizome.app.presentation.form.DepartmentInfoForm;
 import com.example.rhizome.app.presentation.form.LoginUserForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
 import com.example.rhizome.app.presentation.form.UpdateEmployeeInfoForm;
@@ -91,7 +91,7 @@ public class UpdateEmployeeResultController {
         try {
 
             // 部署一覧取得
-            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(searchDepartment.selectAll()));
+            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentInfoForm.convertFrom(searchDepartment.selectAll()));
 
             // パスワードが仕様を満たしているか確認
             String error = UpdateEmployeeInfoForm.validatePassword(

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

@@ -14,5 +14,6 @@ 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 UPDATE_DEPARTMENT_INFO_FORM = "updateDepartmentForm";
 
 }

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

@@ -21,9 +21,9 @@ 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 SELECT_DEPARTMENT_HTML = "/selectDepartment";
 	public static final String ERROR_HTML = "error";
-
+	public static final String UPDATE_DEPARTMENT_INPUT_HTML = "updateDepartmentInput";
 	// 共通(Controller)
 	public static final String INDEX_BLANK = "";
 	public static final String INDEX_SLASH = "/";
@@ -44,10 +44,11 @@ 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 SELECT_DEPARTMENT_INFO = "/selectDepartmentInfo";
-    // Department
+	public static final String SELECT_DEPARTMENT_INFO_FORM_EMPTY = "/departmentAll";
-    // HTML
+	public static final String DELETE_DEPARTMENT = "/deleteDepartment";
-    // Controller
+	public static final String SHOW_UPDATE_DEPARTMENT = "/showUpdateDepartment";
+	public static final String UPDATE_DEPARTMENT_RESULT = "/updateDepartmentResult";
 
 	/**
 	 * 管理者向けのページリストを返す
@@ -62,7 +63,6 @@ public class TransitionTargetPageNameKeyword {
 				INDEX_LOGIN,
 				LOGOUT,
 				DO_LOGIN,
-                DELETE_EMPLOYEE,
 				INSERT_EMPLOYEE_INPUT,
 				INSERT_EMPLOYEE_CONFIRM,
 				INSERT_EMPLOYEE,
@@ -70,8 +70,12 @@ public class TransitionTargetPageNameKeyword {
 				SELECT_EMPLOYEE_INFO,
 				SELECT_EMPLOYEE_INFO_FORM_EMPTY,
 				SHOW_UPDATE_EMPLOYEE,
-                UPDATE_EMPLOYEE_RESULT
+				UPDATE_EMPLOYEE_RESULT,
-        );
+				SELECT_DEPARTMENT_INFO,
+				SELECT_DEPARTMENT_INFO_FORM_EMPTY,
+				DELETE_DEPARTMENT,
+				SHOW_UPDATE_DEPARTMENT,
+				UPDATE_DEPARTMENT_RESULT);
 	}
 
 	/**
@@ -86,8 +90,7 @@ public class TransitionTargetPageNameKeyword {
 				INDEX_LOGIN,
 				LOGOUT,
 				DO_LOGIN,
-                PERSONAL_UPDATE_RESULT
+				PERSONAL_UPDATE_RESULT);
-        );
 	}
 
 }

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

@@ -13,7 +13,7 @@ import java.util.List;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class DepartmentForm {
+public class DepartmentInfoForm {
     /**
      * 部署ID
      */
@@ -30,8 +30,8 @@ public class DepartmentForm {
      * @param department business 層の Department インスタンス
      * @return 画面用（presentation 層）の DepartmentForm インスタンス
      */
-    public static DepartmentForm convertFrom(Department department) {
+    public static DepartmentInfoForm convertFrom(Department department) {
-        return new DepartmentForm(department.getIdDepartment(), department.getNmDepartment());
+        return new DepartmentInfoForm(department.getIdDepartment(), department.getNmDepartment());
     }
 
     /**
@@ -41,7 +41,7 @@ public class DepartmentForm {
      * @param departmentList business 層の Department インスタンスのリスト
      * @return 画面用（presentation 層）の DepartmentForm インスタンスのリスト
      */
-    public static List<DepartmentForm> convertFrom(List<Department> departmentList) {
+    public static List<DepartmentInfoForm> convertFrom(List<Department> departmentList) {
-        return departmentList.stream().map(DepartmentForm::convertFrom).toList();
+        return departmentList.stream().map(DepartmentInfoForm::convertFrom).toList();
     }
 }

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

@@ -0,0 +1,50 @@
+package com.example.rhizome.app.presentation.form;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 画面から渡ってきた検索条件をまとめ、再度画面に表示する為のクラス
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class SearchConditionDepartment {
+	/**
+	 * 部署ID
+	 */
+	private Integer idDepartment;
+	/**
+	 * 部署名
+	 */
+	private String nmDepartment;
+
+	/**
+	 * business 層の SearchConditionDepartment クラスから画面用（presentation 層）の SearchConditionDepartement に
+	 * 変換します。
+	 *
+	 * @param searchConditionDepartement business 層の SearchConditionDepartment インスタンス
+	 * @return 画面用（presentation 層）の SearchConditionDepartment インスタンス
+	 */
+	public static SearchConditionDepartment convertFrom(
+			com.example.rhizome.app.domain.model.SearchConditionDepartment searchConditionDepartment) {
+		return new SearchConditionDepartment(
+				searchConditionDepartment.getIdDepartment(),
+				searchConditionDepartment.getNmDepartment());
+	}
+
+	/**
+	 * 画面用（presentation 層）の SearchConditionDepartement クラスから business 層の SearchConditionDepartement クラスに
+	 * 変換します。
+	 *
+	 * @param searchConditionDepartement 画面用（presentation 層）の SearchConditionDepartement インスタンス
+	 * @return business 層の SearchConditionDepartement インスタンス
+	 */
+	public static com.example.rhizome.app.domain.model.SearchConditionDepartment convertTo(
+			SearchConditionDepartment searchConditionDepartment) {
+		return new com.example.rhizome.app.domain.model.SearchConditionDepartment(
+				searchConditionDepartment.getIdDepartment(),
+				searchConditionDepartment.getNmDepartment());
+	}
+}

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

@@ -1,36 +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;
-
-/**
- * 部署検索条件用の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/java/com/example/rhizome/app/presentation/form/UpdateDepartmentForm.java

@@ -0,0 +1,48 @@
+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 {
+
+	//部署ID
+	private Integer idDepartment;
+	//部署名
+	private String nmDepartment;
+
+	/**
+	 * business 層の Department クラスから画面用（presentation 層）の UpdateDepartmentForm に
+	 * 変換します。
+	 *
+	 * @param departmentInfo business 層の DepartmentInfo インスタンス
+	 * @return 画面用（presentation 層）の UpdateDepartmentForm インスタンス
+	 */
+	public static UpdateDepartmentForm convertFrom(Department department) {
+		return new UpdateDepartmentForm(department.getIdDepartment(), department.getNmDepartment());
+	}
+
+	/**
+	 * 画面用（presentation 層）の UpdateDepartmentForm クラスから business 層の Department クラスに
+	 * 変換します。
+	 *
+	 * @param updateDepartmentForm 画面用（presentation 層）の UpdateDepartmentForm インスタンス
+	 * @return business 層の Department インスタンス
+	 */
+	public static Department convertTo(UpdateDepartmentForm form) {
+		return new Department(form.getIdDepartment(), form.getNmDepartment());
+	}
+
+	public boolean hasRequiredValue() {
+		if (idDepartment == null && (nmDepartment == null || nmDepartment.isBlank())) {
+			return false;
+		} else {
+			return true;
+		}
+	}
+}

src/main/resources/templates/insertDepartmentInput.html

@@ -1,76 +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="/insertDepartmentResult" method="post" onsubmit="return confirm('本当によろしいですか？');"
-		th:object="${departmentForm}">
-		<div class="msgBox error" th:if="${messageError != null}">
-			<span class="error" th:each="message : ${messageError.message}" th:text="${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="javascript:selectSubmit()">一覧に戻る</a>
-</body>
-
-<script>
-	function selectSubmit() {
-		const form = document.createElement('form');
-		form.setAttribute('method', 'post');
-		form.setAttribute('action', 'selectDepartment');
-
-		// 動的送信用のHidden
-		const inputField = document.createElement("input");
-		inputField.setAttribute("type", "hidden");
-		inputField.setAttribute("value", "selectDepartment");
-
-		form.appendChild(inputField);
-
-		// フォームをDOMに追加
-		document.body.appendChild(form);
-
-		form.submit();
-	}
-</script>
-
-</html>

src/main/resources/templates/menu.html

@@ -28,21 +28,17 @@
 			<td class="description">登録済みのユーザ一覧表示と</br>更新、削除を行います。</td>
 			<td><a class="menuClass" href="javascript:selectDepartmentSubmit()"><i class="fas fa-search"></i>部署検索</a>
 			</td>
-			<td class="description">登録済みの部署一覧表示と</br>更新、削除を行います。
+			<td class="description">登録済みの部署一覧表示と</br>更新、削除を行います。</td>
-			</td>
 		</tr>
-		<!-- ဒီနေရာမှာ ဌာနရှာဖွေခြင်း (部署検索) ကို ထည့်ပါ -->
+
 		<tr>
-			<td><a class="menuClass" href="javascript:insertEmployeeSubmit()"><i class="fas fa-plus"></i> 社員登録 </a>
+			<td><a class="menuClass" href="javascript:insertEmployeeSubmit()"><i class="fas fa-plus"></i> 社員登録 </a></td>
-			</td>
+			<td class="description">新規でユーザ追加を行います。</td>
-			<td class="description">新規でユーザ追加を行います。
-			</td>
-			<!-- ဒီနေရာမှာ ဌာနအသစ်ထည့်သွင်းခြင်း (部署登録) ကို ထည့်ပါ -->
 			<td><a class="menuClass" href="javascript:insertDepartmentSubmit()"><i class="fas fa-plus"></i> 部署登録 </a>
 			</td>
-			<td class="description">新規で部署追加を行います。
+			<td class="description">新規で部署追加を行います。</td>
-			</td>
+
-		</tr>
+
 	</table>
 </body>
 
@@ -69,7 +65,7 @@
 	function selectDepartmentSubmit() {
 		const form = document.createElement('form');
 		form.setAttribute('method', 'post');
-		form.setAttribute('action', 'selectDepartment');
+		form.setAttribute('action', 'selectDepartmentInfo');
 
 		// 動的送信用のHidden
 		// 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない

src/main/resources/templates/selectDepartment.html

@@ -3,32 +3,41 @@
 
 <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">
+	<link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
-	<title>部署検索</title>
+	<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>
 
-	<form action="selectDepartment" method="post" th:object="${searchConditionDepartmentForm}">
+	<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 id="idDepartment" placeholder="部署ID" th:field="*{idDepartment}" type="number" />
+					<input placeholder="部署ID" th:field="*{idDepartment}" type="number" />
 				</td>
 			</tr>
 			<tr>
 				<th class="header">部署名</th>
 				<td>
-					<input id="nmDepartment" placeholder="部署名" th:field="*{nmDepartment}" type="text" />
+					<input placeholder="部署名" th:field="*{nmDepartment}" type="text" />
 				</td>
 			</tr>
 			<tr>
@@ -36,7 +45,7 @@
 					<input type="submit" value="検索" />
 				</td>
 				<td class="btnArea" colspan="2">
-					<button type="button" onclick="clearInput()">クリア</button>
+					<button onclick="clearInput()">クリア</button>
 				</td>
 			</tr>
 		</table>
@@ -47,73 +56,57 @@
 	<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: 100px;">部署ID</th>
+					<th style="width: 60px;">部署ID</th>
-					<th style="width: 200px;">部署名</th>
+					<th style="width: 100px;">部署名</th>
-					<th style="width: 200px;">操作</th>
+					<th style="width: 60px;">操作</th>
 				</tr>
+</body>
 </thead>
 <tbody>
 	<tr th:each="departmentForm : ${departmentFormList}">
 		<td th:text="${departmentForm.idDepartment}"></td>
 		<td th:text="${departmentForm.nmDepartment}"></td>
 		<td>
-						<button type="button"
+			<!-- 更新フォーム -->
-							th:onclick="'updateDepartment(' + ${departmentForm.idDepartment} + ')'">更新</button>
+			<form action="showUpdateDepartment" method="post" style="display: inline;">
-						<button type="button"
+				<input name="idDepartment" th:value="${departmentForm.idDepartment}" type="hidden">
-							th:onclick="'deleteDepartment(' + ${departmentForm.idDepartment} + ')'">削除</button>
+				<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>
 </th:block>
-
 <th:block th:if="${departmentFormList == null or departmentFormList.size() == 0}">
+	<!-- 検索結果が0件の場合 -->
 	検索結果はありません。
 </th:block>
 
+</body>
 <script type="text/javascript">
+
 	function clearInput() {
 		document.getElementById('idDepartment').value = '';
 		document.getElementById('nmDepartment').value = '';
 	}
-		// 部署更新用のJavaScript
-		function updateDepartment(idDepartment) {
-			const form = document.createElement('form');
-			form.setAttribute('method', 'post');
-			form.setAttribute('action', 'updateDepartmentInput'); // Update Controller ၏ URL သို့မဟုတ် Path
-
-			const inputField = document.createElement("input");
-			inputField.setAttribute("type", "hidden");
-			inputField.setAttribute("name", "idDepartment");
-			inputField.setAttribute("value", idDepartment);
-
-			form.appendChild(inputField);
-			document.body.appendChild(form);
-			form.submit();
-		}
-		
-
-		// 部署削除用のJavaScript
-		function deleteDepartment(idDepartment) {
-			const form = document.createElement('form');
-			form.setAttribute('method', 'post');
-			form.setAttribute('action', 'deleteDepartmentInput'); // Delete Controller ၏ URL သို့မဟုတ် Path
-
-			const inputField = document.createElement("input");
-			inputField.setAttribute("type", "hidden");
-			inputField.setAttribute("name", "idDepartment");
-			inputField.setAttribute("value", idDepartment);
-
-			form.appendChild(inputField);
-			document.body.appendChild(form);
-			form.submit();
-		}
 </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>

src/main/resources/templates/updateDepartmentForm.html

@@ -0,0 +1,71 @@
+<!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:selectSubmit()">一覧に戻る</a>
+</body>
+	<script>
+		function selectSubmit() {
+				const form = document.createElement('form');
+				form.setAttribute('method', 'post');
+				form.setAttribute('action', 'departmentAll');
+
+				// 動的送信用のHidden
+				// 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
+				const inputField = document.createElement("input");
+				inputField.setAttribute("type", "hidden");
+				inputField.setAttribute("value", "departmentAll");
+
+				form.appendChild(inputField);
+
+				// フォームをDOMに追加
+				document.body.appendChild(form);
+
+				form.submit();
+		}
+	</script>
+
+</html>

src/main/resources/templates/updateDepartmentInput.html

@@ -2,66 +2,62 @@
 <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">
+	<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="${departmentForm}">
+		th:object="${updateDepartmentForm}">
+
 		<div class="msgBox error" th:if="${messageError != null}">
-			<span class="error" th:each="message : ${messageError.message}" th:text="${message}"></span>
+			<span class="error" th:text="${messageError.message}"></span>
 		</div>
 		<table>
 			<tr>
 				<th class="header">部署ID</th>
 				<td>
-					<label>
 					<input class="readOnly" readonly="readonly" th:field="*{idDepartment}" type="text" />
-					</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">
+				<td class="btnArea" colspan="2"><input type="submit" value="更新" /></td>
-					<input type="submit" value="更新" />
-				</td>
 			</tr>
 		</table>
 	</form>
 	<a href="javascript:selectSubmit()">一覧に戻る</a>
 </body>
-
 	<script>
 		function selectSubmit() {
 				const form = document.createElement('form');
 				form.setAttribute('method', 'post');
-		form.setAttribute('action', 'selectDepartment');
+				form.setAttribute('action', 'departmentAll');
 
 				// 動的送信用のHidden
+				// 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
 				const inputField = document.createElement("input");
 				inputField.setAttribute("type", "hidden");
-		inputField.setAttribute("value", "selectDepartment");
+				inputField.setAttribute("value", "departmentAll");
 
 				form.appendChild(inputField);
 

src/main/resources/templates/updateEmployeeInput.html

@@ -20,11 +20,8 @@
 			<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
 		</div>
 	</h1>
-<form action="/updateEmployeeResult"
+	<form action="/updateEmployeeResult" method="post" onsubmit="return confirm('本当によろしいですか？');"
-      method="post"
+		th:object="${updateEmployeeInfoForm}">
-      onsubmit="return confirm('本当によろしいですか？');"
-      th:object="${updateEmployeeInfoForm}"
->
 		<div class="msgBox error" th:if="${messageError != null}">
 			<span class="error" th:each="message : ${messageError.message}" th:text="${message}"></span>
 		</div>
@@ -33,11 +30,7 @@
 				<th class="header">社員ID</th>
 				<td>
 					<label>
-                    <input class="readOnly"
+						<input class="readOnly" readonly="readonly" th:field="*{idEmployee}" type="text" />
-                           readonly="readonly"
-                           th:field="*{idEmployee}"
-                           type="text"
-                    />
 					</label>
 				</td>
 			</tr>
@@ -45,12 +38,8 @@
 				<th class="header">社員名</th>
 				<td>
 					<label>
-                    <input maxlength="50"
+						<input maxlength="50" placeholder="社員名" required="required" th:field="*{nmEmployee}"
-                           placeholder="社員名"
+							type="text" />
-                           required="required"
-                           th:field="*{nmEmployee}"
-                           type="text"
-                    />
 					</label>
 				</td>
 			</tr>
@@ -58,13 +47,8 @@
 				<th class="header">社員名フリガナ</th>
 				<td>
 					<label>
-                    <input maxlength="50"
+						<input maxlength="50" oninput="convertToKatakana(this)" placeholder="フリガナ" required="required"
-                           oninput="convertToKatakana(this)"
+							th:field="*{knEmployee}" type="text" />
-                           placeholder="フリガナ"
-                           required="required"
-                           th:field="*{knEmployee}"
-                           type="text"
-                    />
 					</label>
 				</td>
 			</tr>
@@ -72,12 +56,8 @@
 				<th class="header">メールアドレス</th>
 				<td>
 					<label>
-                    <input maxlength="100"
+						<input maxlength="100" placeholder="メールアドレス" required="required" th:field="*{mailAddress}"
-                           placeholder="メールアドレス"
+							type="email" />
-                           required="required"
-                           th:field="*{mailAddress}"
-                           type="email"
-                    />
 					</label>
 				</td>
 			</tr>
@@ -85,11 +65,8 @@
 				<th class="header">パスワード</th>
 				<td>
 					<label>
-                    <input pattern="^(?=.*?[a-zA-Z])(?=.*?\d)[a-zA-Z\d]{3,10}$"
+						<input pattern="^(?=.*?[a-zA-Z])(?=.*?\d)[a-zA-Z\d]{3,10}$" placeholder="パスワード"
-                           placeholder="パスワード"
+							th:field="*{password}" type="password" />
-                           th:field="*{password}"
-                           type="password"
-                    />
 					</label>
 				</td>
 			</tr>
@@ -108,11 +85,8 @@
 				<th class="header">パスワード確認用</th>
 				<td>
 					<label>
-                    <input pattern="^(?=.*?[a-zA-Z])(?=.*?\d)[a-zA-Z\d]{3,10}$"
+						<input pattern="^(?=.*?[a-zA-Z])(?=.*?\d)[a-zA-Z\d]{3,10}$" placeholder="パスワード確認用"
-                           placeholder="パスワード確認用"
+							th:field="*{passwordConfirm}" type="password" />
-                           th:field="*{passwordConfirm}"
-                           type="password"
-                    />
 					</label>
 				</td>
 			</tr>
@@ -121,14 +95,12 @@
 				<td>
 					<label>
 						<input id="adminAuth1" name="adminAuth" th:checked="${updateEmployeeInfoForm.adminAuth == 1}"
-                           type="radio"
+							type="radio" value="1"> 管理者権限
-                           value="1"> 管理者権限
 					</label>
 					<label>
 						<input id="adminAuth0" name="adminAuth"
 							th:checked="${updateEmployeeInfoForm.adminAuth == null or updateEmployeeInfoForm.adminAuth == 0}"
-                           type="radio"
+							type="radio" value="0">
-                           value="0">
 						一般権限
 					</label>
 				</td>
@@ -140,8 +112,7 @@
 						<select required="required" th:field="*{idDepartment}">
 							<option th:each="department : ${departmentFormList}"
 								th:selected="${updateEmployeeInfoForm.idDepartment != null && department.idDepartment == updateEmployeeInfoForm.idDepartment}"
-                                th:text="${department.nmDepartment}"
+								th:text="${department.nmDepartment}" th:value="${department.idDepartment}">
-                                th:value="${department.idDepartment}">
 							</option>
 						</select>
 					</label>
@@ -178,4 +149,5 @@
 	}
 
 </script>
+
 </html>