From 2cb86299934a98d92349e0a7c9d990280893f4c8 Mon Sep 17 00:00:00 2001
From: m_ozawa <26-m-ozawa-swnet@it-college.co.jp>
Date: Fri, 18 Sep 2026 14:45:00 +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=95=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/Main.java | 105 +++++++++++++++----------------------------
 1 file changed, 35 insertions(+), 70 deletions(-)

diff --git a/em-oop/src/Main.java b/em-oop/src/Main.java
index 3e8db56..1cb90fa 100644
--- a/em-oop/src/Main.java
+++ b/em-oop/src/Main.java
@@ -1,82 +1,47 @@
+import java.util.Scanner;
+
 public class Main {
 	public static void main(String[] args) {
-		EmployeeData[] employees = new EmployeeData[5];
+		BaseData employee = new EmployeeData();
+		BaseData[] employees = new BaseData[5];
 		employees[0] = new EmployeeData("10000", "山田龍也", "ヤマダタツヤ", "yamada@hoge.jp", "aaa", "10");
-		employees[1] = new EmployeeData();
-		employees[2] = new EmployeeData();
-		employees[3] = new EmployeeData();
-		employees[4] = new EmployeeData();
-
-		employees[1].setIdEmployee("10001");
-		employees[1].setNmEmployee("高橋準");
-		employees[1].setKnEmployee("タカハシジュン");
-		employees[1].setMailAddress("jtaka@hoge.jp");
-		employees[1].setPassword("bbb");
-		employees[1].setIdDepartment("10");
-
-		employees[2].setIdEmployee("10002");
-		employees[2].setNmEmployee("麻枝史明");
-		employees[2].setKnEmployee("マエダフミアキ");
-		employees[2].setMailAddress("fmak@hoge.jp");
-		employees[2].setPassword("ccc");
-		employees[2].setIdDepartment("11");
-
-		employees[3].setIdEmployee("10003");
-		employees[3].setNmEmployee("丸戸章介");
-		employees[3].setKnEmployee("マルトショウスケ");
-		employees[3].setMailAddress("marusyo@hoge.jp");
-		employees[3].setPassword("ddd");
-		employees[3].setIdDepartment("12");
-
-		employees[4].setIdEmployee("10004");
-		employees[4].setNmEmployee("三宅武");
-		employees[4].setKnEmployee("ミヤケタケシ");
-		employees[4].setMailAddress("miya@hoge.jp");
-		employees[4].setPassword("eee");
-		employees[4].setIdDepartment("13");
+		employees[1] = new EmployeeData("10001","高橋準","タカハシジュン","jtaka@hoge.jp","bbb","10");
+		employees[2] = new EmployeeData("10002","麻枝史明","マエダフミアキ","fmak@hoge.jp","ccc","11");
+		employees[3] = new EmployeeData("10003","丸戸章介","マルトショウスケ","marusyo@hoge.jp","ddd","12");
+		employees[4] = new EmployeeData("10004","三宅武","ミヤケタケシ","miya@hoge.jp","eee","13");
 
 		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].getPrimaryKeyValue().equals(id)) {
+				result = true;
+				employees[i].toString();
+				
+			}
+			
+
+		if(result==false) {
+			System.out.println("該当する社員が見つかりませんでした");
+		}
+		
+		}
+		}
 		
 
-//		System.out.println("99999を検索します");
-//		result = false;
-//		for (int i = 0; i < employees.length; i++) {
-//			if (employees[i].isMatchId("99999")) {
-//				result = true;
-//				break;
-//			}
-//		}
-//		System.out.println(result);
 
-		//			
-		//		}
+
 
 		//		for(int i=0;i<5;i++) {
 		//			if(employee[i].getNmEmployee()==null) {
@@ -99,6 +64,6 @@ public class Main {
 		//		System.out.println(employee.idDepartment);
 
 	}
-}
+