EmployeeEntity途中まで

This commit is contained in:
m-endo
2026-10-19 16:47:33 +09:00
parent 65e5ab418d
commit 2659bfae11

View File

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