From 41bf9831a8dac63c79756865a67da911e1a98e41 Mon Sep 17 00:00:00 2001
From: m-shimizu <26-m-e-stella-tecnica@it-college.jp>
Date: Fri, 18 Sep 2026 15:57:50 +0900
Subject: [PATCH] =?UTF-8?q?Day2=5F6=E6=AE=B5=E9=9A=8E=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 em-oop/src/EmployeeData.java | 43 +++++++++++++++++++++++++-----------
 em-oop/src/Main.java         | 17 +++++++-------
 2 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/em-oop/src/EmployeeData.java b/em-oop/src/EmployeeData.java
index 56e486f..f84ef12 100644
--- a/em-oop/src/EmployeeData.java
+++ b/em-oop/src/EmployeeData.java
@@ -1,16 +1,36 @@
 
 public class EmployeeData {
 
-	
 	private String idEmployee;
 	private String nmEmployee;
 	private String knEmployee;
 	private String mailAddress;
 	private String password;
 	private String idDepartment;
-	
-	
-	
+
+	//引数なしコンストラクタ
+	public EmployeeData() {
+
+	}
+
+	//6つの引数をもつコンストラクタ
+	public EmployeeData(
+			String idEmployee,
+			String nmEmployee,
+			String knEmployee,
+			String mailAddress,
+			String password,
+			String idDepartment) {
+
+		this.setIdEmployee(idEmployee);
+		this.setNmEmployee(nmEmployee);
+		this.setKnEmployee(knEmployee);
+		this.setMailAddress(mailAddress);
+		this.setPassword(password);
+		this.setIdDepartment(idDepartment);
+
+	}
+
 	public String getIdEmployee() {
 		return idEmployee;
 	}
@@ -58,24 +78,21 @@ public class EmployeeData {
 	public void setIdDepartment(String idDepartment) {
 		this.idDepartment = idDepartment;
 	}
-	
-	
 
-	void showInfo() {
+	@Override
+	public String toString() {
 		
-		System.out.println(
-				this.getIdEmployee() + "\t"
+		return	this.getIdEmployee() + "\t"
 				+ this.getNmEmployee() + "\t"
 				+ this.getKnEmployee() + "\t"
 				+ this.getMailAddress() + "\t"
 				+ this.getPassword() + "\t"
-				+ this.getIdDepartment()
-		);
+				+ this.getIdDepartment();
+		
 	}
-	
+
 	public boolean isMatchID(String id) {
 		return this.idEmployee.equals(id);
 	}
 
-
 }
diff --git a/em-oop/src/Main.java b/em-oop/src/Main.java
index ca80991..01fceed 100644
--- a/em-oop/src/Main.java
+++ b/em-oop/src/Main.java
@@ -51,12 +51,17 @@ public class Main {
 		Employees[4].setPassword("eee");
 		Employees[4].setIdDepartment("13");
 		
+		
+		for (int i = 0; i < Employees.length; i++) {
+		System.out.println(Employees[i]);
+		
+	}
 	
 		Scanner scanner = new Scanner(System.in);
 		
-	while(true) {
-		System.out.println("検索したい社員IDを入力してください(終了する場合は0)");
-		String id = scanner.nextLine();
+		while(true) {
+//			System.out.println("検索したい社員IDを入力してください(終了する場合は0)");
+			String id = scanner.nextLine();
 		
 		if(id.equals("0")) {
 			System.out.println("システムを終了します");
@@ -68,7 +73,7 @@ public class Main {
 		for (int i = 0; i < Employees.length; i++) {
 			
 			if(Employees[i].isMatchID(id)) {
-				Employees[i].showInfo();
+				System.out.println(Employees[i]);
 				found = true;
 			}
 				
@@ -87,10 +92,6 @@ public class Main {
 //		System.out.println(Employees.password);
 //		System.out.println(Employees.idDepartment);
 		
-//		for (int i = 0; i < Employees.length; i++) {
-//			Employees[i].showInfo();
-//			
-//		}
 	}
 
 }