From 7ebf5dec7097320861ebf2d96f068bb74fbb3c8a Mon Sep 17 00:00:00 2001
From: m_ozawa <26-m-ozawa-swnet@it-college.co.jp>
Date: Fri, 18 Sep 2026 14:33:17 +0900
Subject: [PATCH] =?UTF-8?q?=EF=BC=93=E6=97=A5=E7=9B=AE=E3=80=80=E6=AE=B5?=
 =?UTF-8?q?=E9=9A=8E=EF=BC=94=E3=80=80=E5=B0=8F=E6=BE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 em-oop/src/BaseData.java     |  8 +++++
 em-oop/src/EmployeeData.java | 41 ++++++++++++--------------
 em-oop/src/Main.java         | 57 ++++++++++++++++++------------------
 3 files changed, 54 insertions(+), 52 deletions(-)
 create mode 100644 em-oop/src/BaseData.java

diff --git a/em-oop/src/BaseData.java b/em-oop/src/BaseData.java
new file mode 100644
index 0000000..48abb0e
--- /dev/null
+++ b/em-oop/src/BaseData.java
@@ -0,0 +1,8 @@
+
+public abstract class BaseData {
+	public abstract String toString();
+	public abstract String toCSV();
+	public abstract String getPrimaryKeyValue();
+
+}
+             
\ No newline at end of file
diff --git a/em-oop/src/EmployeeData.java b/em-oop/src/EmployeeData.java
index dbea8a8..47d9020 100644
--- a/em-oop/src/EmployeeData.java
+++ b/em-oop/src/EmployeeData.java
@@ -1,5 +1,5 @@
 
-public class EmployeeData extends BaceData {
+public class EmployeeData extends BaseData {
 	private String idEmployee;
 	private String nmEmployee;
 	private String knEmployee;
@@ -29,7 +29,7 @@ public class EmployeeData extends BaceData {
 
 	@Override
 	public String getPrimaryKeyValue() {
-		return getIdEmployee();
+		return idEmployee;
 
 	}
 
@@ -50,22 +50,6 @@ public class EmployeeData extends BaceData {
 
 	public EmployeeData(String idEmployee, String nmEmployee, String knEmployee, String mailAddress, String password,
 			String idDepartment) {
-
-		nmEmployee = nmEmployee.strip();
-		int nmNum = nmEmployee.length();
-
-		idEmployee = idEmployee.strip();
-		int idNum = idEmployee.length();
-
-		if (nmNum == 0) {
-			System.out.println("社員名が空のため設定できませんでした");
-
-		}
-		if (idNum == 0) {
-			System.out.println("社員IDが空のため設定できませんでした");
-		}
-		if (nmNum > 0 && idNum > 0) {
-
 			this.setIdEmployee(idEmployee);
 			this.setNmEmployee(nmEmployee);
 			this.setKnEmployee(knEmployee);
@@ -73,8 +57,6 @@ public class EmployeeData extends BaceData {
 			this.setPassword(password);
 			this.setIdDepartment(idDepartment);
 			empCount++;
-
-		}
 	}
 
 	public String getIdEmployee() {
@@ -82,16 +64,29 @@ public class EmployeeData extends BaceData {
 	}
 
 	public void setIdEmployee(String idEmployee) {
+		idEmployee = idEmployee.strip();
+		int idNum = idEmployee.length();
 
-		this.idEmployee = idEmployee;
+		if (idNum == 0) {
+			System.out.println("社員IDが空のため設定できませんでした");
+		} else {
+			this.idEmployee = idEmployee;
+		}
 	}
 
 	public String getNmEmployee() {
 		return nmEmployee;
 	}
 
-	public void setNmEmployee(String nmEMployee) {
-		this.nmEmployee = nmEMployee;
+	public void setNmEmployee(String nmEmployee) {
+		nmEmployee = nmEmployee.strip();
+		int nmNum = nmEmployee.length();
+		if (nmNum == 0) {
+			System.out.println("社員名が空のため設定できませんでした");
+
+		} else {
+			this.nmEmployee = nmEmployee;
+		}
 	}
 
 	public String getKnEmployee() {
diff --git a/em-oop/src/Main.java b/em-oop/src/Main.java
index f1c443d..3e8db56 100644
--- a/em-oop/src/Main.java
+++ b/em-oop/src/Main.java
@@ -1,5 +1,3 @@
-import java.util.Scanner;
-
 public class Main {
 	public static void main(String[] args) {
 		EmployeeData[] employees = new EmployeeData[5];
@@ -37,34 +35,34 @@ public class Main {
 		employees[4].setPassword("eee");
 		employees[4].setIdDepartment("13");
 
-		//		System.out.println(employees[1].toCSV());
-		//		System.out.println(employees[1].getPrimaryKeyValue());
+		System.out.println(employees[0].toCSV());
+		System.out.println(employees[0].getPrimaryKeyValue());
 
-		Scanner sc = new Scanner(System.in);
-		
-	
-		for (int i = 0; i < employees.length; i++) {
-			System.out.println("検索したい社員IDを入力してください(終了する場合は0)");
-			String id = sc.nextLine();
-			boolean result = false;
-			
-			if(id.equals("0")) {
-				System.out.println("システムを終了します");
-				break;
-			}
-			if (employees[i].isMatchId(id)) {
-				result = true;
-				employees[i].showInfo();
-				
-			}
-			
-
-		if(result==false) {
-			System.out.println("該当する社員が見つかりませんでした");
-		}
-		
-		}
-		}
+//		Scanner sc = new Scanner(System.in);
+//		
+//	
+//		for (int i = 0; i < employees.length; i++) {
+//			System.out.println("検索したい社員IDを入力してください(終了する場合は0)");
+//			String id = sc.nextLine();
+//			boolean result = false;
+//			
+//			if(id.equals("0")) {
+//				System.out.println("システムを終了します");
+//				break;
+//			}
+//			if (employees[i].isMatchId(id)) {
+//				result = true;
+//				employees[i].showInfo();
+//				
+//			}
+//			
+//
+//		if(result==false) {
+//			System.out.println("該当する社員が見つかりませんでした");
+//		}
+//		
+//		}
+//		}
 		
 
 //		System.out.println("99999を検索します");
@@ -101,5 +99,6 @@ public class Main {
 		//		System.out.println(employee.idDepartment);
 
 	}
+}