EmployeeEntity途中まで

team1/src/main/java/com/example/demo/entity/EmployeeEntity.java

@@ -1,7 +1,5 @@
 package com.example.demo.entity;
 
-import java.util.List;
-
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
@@ -9,13 +7,11 @@ import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
 
+import org.springframework.data.annotation.LastModifiedDate;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import main.java.com.example.rhizome.app.infra.entity.Employee;
-import main.java.com.example.rhizome.app.infra.entity.EmployeeEntity;
-import main.java.com.example.rhizome.app.infra.entity.LoginUser;
-import main.java.com.example.rhizome.app.infra.entity.SearchConditionEmployee;
 
 /**
  * EmployeeテーブルのEntity
@@ -28,92 +24,117 @@ import main.java.com.example.rhizome.app.infra.entity.SearchConditionEmployee;
 @AllArgsConstructor
 
 public class EmployeeEntity {
-	//社員ID
+	/**
+	 * 社員ID
+	 */
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	@Column(name = "id_employee", nullable = false)
 	private Integer idEmployee;
 
-	//社員名
+	/**
+	 * 社員名
+	 */
 	@Column(name = "nm_employee", nullable = false)
 	private String nmEmployee;
 
-	//社員よみ
+	/**
+	 * 社員よみ
+	 */
 	@Column(name = "kn_employee", nullable = false)
 	private String knEmployee;
 
-	//メールアドレス
+	/**
+	 * メールアドレス
+	 */
 	@Column(name = "mail_address", nullable = false)
 	private String MailAddress;
 
-	//パスワード
+	/**
+	 * パスワード
+	 */
 	@Column(name = "password", nullable = false)
 	private String Password;
 
-	//管理者フラグ
+	/**
+	 * 管理者フラグ
+	 */
 	@Column(name = "flg_admin", nullable = false)
 	private Character FlgAdmin;
 
-	//退職者フラグ
+	/**
+	 * 退職者フラグ
+	 */
 	@Column(name = "flg_retirement", nullable = false)
 	private Character FlgRetirement;
 
-	//更新者
+	/**
+	 * 更新者
+	 */
 	@Column(name = "id_update", nullable = false)
 	private Integer IdUpdate;
 
-	//更新日
+	/**
+	 * 更新日
+	 */
 	@Column(name = "date_update", nullable = false)
+	@LastModifiedDate
 	private Integer DateUpdate;
 
-	public static EmployeeEntity convertForm(Employee employee) {
-		return new EmployeeEntity(
-				employee.getIdEmployee(),
-				employee.getnmEmployee(),
-				employee.getknEmployee(),
-				employee.getMailAddress(),
-				employee.getPassword(),
-				employee.getFlgAdmin(),
-				employee.getFlgRetirement(),
-				employee.getIdUpdate(),
-				employee.getDateUpdate());
-
-	}
-
-	public static EmployeeEntity convertFrom(SearchConditionEmployee searchConditionEmployee) {
-		EmployeeEntity employeeEntity = new EmployeeEntity();
-
-		employeeEntity.setIdEmployee(searchConditionEmployee.getIdEmployee());
-		employeeEntity.setNmEmployee(searchConditionEmployee.getNmEmployee());
-		employeeEntity.setKnEmployee(searchConditionEmployee.getKnEmployee());
-		employeeEntity.setMailAddress(searchConditionEmployee.getMailAddress());
-
-		return employeeEntity;
-
-	}
-
-	public static Employee createEmployee(EmployeeEntity employeeEntity) {
-		return new Employee(
-				employeeEntity.getIdEmployee(),
-				employeeEntity.getNmEmployee(),
-				employeeEntity.getKnEmployee(),
-				employeeEntity.getMailAddress(),
-				employeeEntity.getPassword(),
-				employeeEntity.getAdminAuth(),
-				employeeEntity.getIdDepartment());
-	}
-
-	public static List<Employee> createEmployeeList(List<EmployeeEntity> employeeEntityList) {
-		return employeeEntityList.stream().map(EmployeeEntity::createEmployee).toList();
-	}
-
-	public LoginUser createLoginUser() {
-		getIdEmployee(),
-		getNmEmployee(),
-		getKnEmployee(),
-		getMailAddress(),
-		getPassword(),
-		getAdminAuth(),
-		getIdDepartment());
-}
 }
+
+//	public static EmployeeEntity convertForm(Employee employee) {
+//		return new EmployeeEntity(
+//				employee.getIdEmployee(),
+//				employee.getnmEmployee(),
+//				employee.getknEmployee(),
+//				employee.getMailAddress(),
+//				employee.getPassword(),
+//				employee.getFlgAdmin(),
+//				employee.getFlgRetirement(),
+//				employee.getIdUpdate(),
+//				employee.getDateUpdate());
+//
+//	}
+//
+//	public static EmployeeEntity convertFrom(SearchConditionEmployee searchConditionEmployee) {
+//		EmployeeEntity employeeEntity = new EmployeeEntity();
+//
+//		employeeEntity.setIdEmployee(searchConditionEmployee.getIdEmployee());
+//		employeeEntity.setNmEmployee(searchConditionEmployee.getNmEmployee());
+//		employeeEntity.setKnEmployee(searchConditionEmployee.getKnEmployee());
+//		employeeEntity.setMailAddress(searchConditionEmployee.getMailAddress());
+//
+//		return employeeEntity;
+//
+//	}
+//
+//	public static Employee createEmployee(EmployeeEntity employeeEntity) {
+//		return new Employee(
+//				employeeEntity.getIdEmployee(),
+//				employeeEntity.getNmEmployee(),
+//				employeeEntity.getKnEmployee(),
+//				employeeEntity.getMailAddress(),
+//				employeeEntity.getPassword(),
+//				employeeEntity.getFlgAdmin(),
+//				employeeEntity.getFlgRetirement(),
+//				employeeEntity.getIdUpdate(),
+//				employeeEntity.getDateUpdate());
+//	}
+//
+//	public static List<Employee> createEmployeeList(List<EmployeeEntity> employeeEntityList) {
+//		return employeeEntityList.stream().map(EmployeeEntity::createEmployee).toList();
+//	}
+//
+//	public LoginUser createLoginUser() {
+//		getIdEmployee(),
+//		getNmEmployee(),
+//		getKnEmployee(),
+//		getMailAddress(),
+//		getPassword(),
+//		getFlgAdmin(),
+//		getFlgRetirement(),
+//		getIdUpdate(),
+//		getDateUpdate());
+//}
+//}