From 3cfaa1442dab2bb9db1d4bc41dd8918921fcbbed Mon Sep 17 00:00:00 2001
From: m-endo <26-s-i-tm-nets@it-college.jp>
Date: Thu, 24 Sep 2026 15:32:17 +0900
Subject: [PATCH] =?UTF-8?q?Day3=E3=80=815=E6=AE=B5=E9=9A=8E=E7=9B=AE?=
 =?UTF-8?q?=E5=AE=8C=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 em-oop/src/EmployeeData.java |  8 ++++++--
 em-oop/src/Main.java         | 25 +++++++++++++------------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/em-oop/src/EmployeeData.java b/em-oop/src/EmployeeData.java
index f04ae29..71767c0 100644
--- a/em-oop/src/EmployeeData.java
+++ b/em-oop/src/EmployeeData.java
@@ -68,8 +68,12 @@ public class EmployeeData extends BaseData {
 	//上記メソッドの書き換え
 	@Override
 	public String toString() {
-		return idEmployee + " " + nmEmployee + " " + knEmployee + " " + mailAddress + " " + password + " "
-				+ idDepartment;
+		return getIdEmployee() + "\t"+
+				 getNmEmployee() + "\t"+
+				 getKnEmployee() + "\t"+
+				 getMailAddress() + "\t"+
+				 getPassword() + "\t"+
+				 getIdDepartment();
 
 	}
 
diff --git a/em-oop/src/Main.java b/em-oop/src/Main.java
index 7cfb36b..9e9682a 100644
--- a/em-oop/src/Main.java
+++ b/em-oop/src/Main.java
@@ -5,9 +5,9 @@ public class Main {
 	public static void main(String[] args) {
 		// TODO 自動生成されたメソッド・スタブ
 		//インスタンス宣言
-		EmployeeData employee = new EmployeeData();
+		BaseData employee = new EmployeeData();
 		//配列5件分
-		EmployeeData[] employees = new EmployeeData[5];
+		BaseData[] employees = new BaseData[5];
 		//５段階目書き換え
 		employees[0] = new EmployeeData("10000", "山田龍也", "ヤマダタツヤ", "yamada@hoge.jp", "aaa", "10");
 		employees[1] = new EmployeeData("10001", "高橋準", "タカハシジュン", "jtaka@hoge.jp", "bbb", "10");
@@ -32,23 +32,24 @@ public class Main {
 			boolean result = false;
 			//該当の場合
 			for (int i = 0; i < employees.length; i++) {
-				if (employees[i].isMatchID(id)) {
+				if (employees[i].getPrimaryKeyValue().equals(id)) {
 					result = true;
-					employees[i].showInfo();
+					System.out.println(employees[i]);
 					break;
 				}
 			}
 			if (result == false) {
-				System.out.println("該当する社員が見つかりませんでした");
+				System.out.println("該当する社員が見つかりませんでした(終了する場合は０を入力)");
 			}
 
 		}
+
+		//for文
+		//for (int i = 0; i < employees.length; i++) {
+			//System.out.println(employees[i]);
+			//System.out.println(employees[i].toCSV());
+			//System.out.println(employees[i].getPrimaryKeyValue());
+			//employees[i].showInfo();を上記に書き換え
+		}
 	}
 
-	//for文
-	//for (int i = 0; i < employees.length; i++) {
-	//System.out.println(employees[i]);
-	//System.out.println(employees[i].toCSV());
-	//System.out.println(employees[i].getPrimaryKeyValue());
-	//employees[i].showInfo();を上記に書き換え
-}