From f91230d020e64388df48af1aee8b459296933827 Mon Sep 17 00:00:00 2001
From: o-matsuda <26-o-matsuda-stellatecnica@it-college.co.jp>
Date: Fri, 18 Sep 2026 12:45:19 +0900
Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E6=97=A5=E7=9B=AE=E6=AE=B5=E9=9A=8E?=
 =?UTF-8?q?=EF=BC=96=E5=AE=8C=E4=BA=86=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 em-oop/src/BaseDate.java       |  7 +++++
 em-oop/src/DepartmentDate.java | 41 ++++++++++++++++++++++++++++
 em-oop/src/Main.java           | 49 +++++++++++++++++++++++++++-------
 3 files changed, 88 insertions(+), 9 deletions(-)
 create mode 100644 em-oop/src/BaseDate.java
 create mode 100644 em-oop/src/DepartmentDate.java

diff --git a/em-oop/src/BaseDate.java b/em-oop/src/BaseDate.java
new file mode 100644
index 0000000..2f57495
--- /dev/null
+++ b/em-oop/src/BaseDate.java
@@ -0,0 +1,7 @@
+
+public abstract class BaseDate {
+	public abstract String toString();
+	public abstract String toCSV();
+	public abstract String getPrimaryKeyValue();
+	
+}
diff --git a/em-oop/src/DepartmentDate.java b/em-oop/src/DepartmentDate.java
new file mode 100644
index 0000000..27e3df4
--- /dev/null
+++ b/em-oop/src/DepartmentDate.java
@@ -0,0 +1,41 @@
+
+public class DepartmentDate extends BaseDate {
+	private String idDepartment;
+	private String nmDepartment;
+	
+
+	public String getIdDepartment() {
+		return idDepartment;
+	}
+
+	public void setIdDepartment(String idDepartment) {
+		this.idDepartment = idDepartment;
+	}
+
+	public String getNmDepartment() {
+		return nmDepartment;
+	}
+
+	public void setNmDepartment(String nmDepartment) {
+		this.nmDepartment = nmDepartment;
+	}
+
+	@Override
+	public String toString() {
+		String str1 = (getIdDepartment() + "\t" + getNmDepartment());
+		return str1;
+	}
+
+	@Override
+	public String toCSV() {
+		String str2 = (getIdDepartment() + "," + getNmDepartment());
+		return str2;
+	}
+
+	@Override
+	public String getPrimaryKeyValue() {
+		String str3 = (getIdDepartment());
+		return str3;
+	}
+
+}
diff --git a/em-oop/src/Main.java b/em-oop/src/Main.java
index a9d32b6..ac87f59 100644
--- a/em-oop/src/Main.java
+++ b/em-oop/src/Main.java
@@ -11,24 +11,55 @@ public class Main {
 		employee[3] = new EmployeeData("10003", "丸戸章介", "マルトショウスケ", "marusyo@hoge.jp", "ddd", "13");
 		employee[4] = new EmployeeData("10004", "三宅武", "ミヤケタケシ", "miya@hoge.jp", "eee", "14");
 
-				for (int i=0; i<=4; i++ ) {
-					System.out.println(employee[i]);
-				}
-//				int i=EmployeeData.getEmpCount();
-//				System.out.println("現在の社員データ件数;"+ i + "件");
+		DepartmentDate dept1 = new DepartmentDate();
+		dept1.setIdDepartment("10");
+		dept1.setNmDepartment("役員");
+		DepartmentDate dept2 = new DepartmentDate();
+		dept2.setIdDepartment("11");
+		dept2.setNmDepartment("人事・総務部");
+		DepartmentDate dept3 = new DepartmentDate();
+		dept3.setIdDepartment("12");
+		dept3.setNmDepartment("経理部");
+		DepartmentDate dept4 = new DepartmentDate();
+		dept4.setIdDepartment("13");
+		dept4.setNmDepartment("システム開発事業部");
+		DepartmentDate dept5 = new DepartmentDate();
+		dept5.setIdDepartment("14");
+		dept5.setNmDepartment("教育事業部");
+		DepartmentDate dept6 = new DepartmentDate();
+		dept6.setIdDepartment("15");
+		dept6.setNmDepartment("営業企画部");
+		BaseDate[] alldate = new BaseDate[11];
+		alldate[0] = employee[0];
+		alldate[1] = employee[1];
+		alldate[2] = employee[2];
+		alldate[3] = employee[3];
+		alldate[4] = employee[4];
+		alldate[5] = dept1;
+		alldate[6] = dept2;
+		alldate[7] = dept3;
+		alldate[8] = dept4;
+		alldate[9] = dept5;
+		alldate[10] = dept6;
 
-				System.out.println(employee[0].toCSV());
-			    System.out.println(employee[0].getPrimaryKeyValue());
+		for (int i = 0; i <= 10; i++) {
+			System.out.println(alldate[i]);
+		}
+		//				int i=EmployeeData.getEmpCount();
+		//				System.out.println("現在の社員データ件数;"+ i + "件");
+
+		System.out.println(employee[0].toCSV());
+		System.out.println(employee[0].getPrimaryKeyValue());
 		String str = "";
 		while (!str.equals("0")) {
 			System.out.println("検索したい社員IDを入力してください(終了する場合は0)");
 			Scanner sc = new Scanner(System.in);
 			str = sc.nextLine();
 			for (int i = 0; i <= 4; i++) {
-				if (employee[i].getPrimaryKeyValue().equals(str)){
+				if (employee[i].getPrimaryKeyValue().equals(str)) {
 					System.out.println(employee[i]);
 					break;
-				} else if(!employee[i].getPrimaryKeyValue().equals(str) && i==4 && !str.equals("0")) {
+				} else if (!employee[i].getPrimaryKeyValue().equals(str) && i == 4 && !str.equals("0")) {
 					System.out.println("該当する社員が見つかりませんでした");
 				}
 			}