From a7ab96fe7def2f2caac95cd4e1266e771ea84f52 Mon Sep 17 00:00:00 2001
From: y-ogawa <26-y-ogawa-tmn@it-college.co.jp>
Date: Thu, 24 Sep 2026 14:38:36 +0900
Subject: [PATCH] =?UTF-8?q?3=E6=97=A5=E7=9B=AE=E6=AE=B5=E9=9A=8E6=E3=81=A7?=
 =?UTF-8?q?=E3=81=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 em-oop/src/DepartmentData.java | 39 +++++++++++++++++++++++++++++++
 em-oop/src/Main.java           | 42 ++++++++++++++++++++++++----------
 2 files changed, 69 insertions(+), 12 deletions(-)
 create mode 100644 em-oop/src/DepartmentData.java

diff --git a/em-oop/src/DepartmentData.java b/em-oop/src/DepartmentData.java
new file mode 100644
index 0000000..a3bf40a
--- /dev/null
+++ b/em-oop/src/DepartmentData.java
@@ -0,0 +1,39 @@
+
+public class DepartmentData extends BaseData {
+	private String idDepartment;
+	private String nmDepartment;
+
+	public DepartmentData(String idDepartment, String nmDepartment) {
+		setIdDepartment(idDepartment);
+		setNmDepartment(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() {
+		return getIdDepartment() + "\t" + getNmDepartment();
+	}
+
+	public String toCSV() {
+		return getIdDepartment() + "," + getNmDepartment();
+	}
+
+	public String getPrimaryKeyValue() {
+		return getIdDepartment();
+	}
+}
diff --git a/em-oop/src/Main.java b/em-oop/src/Main.java
index 97efc8a..39fa1b1 100644
--- a/em-oop/src/Main.java
+++ b/em-oop/src/Main.java
@@ -4,7 +4,7 @@ public class Main {
 
 	public static void main(String[] args) {
 		// TODO 自動生成されたメソッド・スタブ
-		
+
 		while (true) {
 
 			System.out.println("検索したい社員IDを入力してください（終了したい場合は0）");
@@ -12,7 +12,7 @@ public class Main {
 			String id = scanner.nextLine();
 			boolean bo = false;
 
-			BaseData[] employees = new BaseData[5];
+			BaseData[] allData = new BaseData[11];
 
 			BaseData employee = new EmployeeData("10000", "山田龍也", "ヤマダタツヤ", "yamada@hoge.jp", "aaa", "10");
 
@@ -24,21 +24,39 @@ public class Main {
 
 			BaseData employee4 = new EmployeeData("10004", "三宅武", "ミヤケタケシ", "miya@hoge.jp,eee", "eee", "13");
 
-			employees[0] = employee;
-			employees[1] = employee1;
-			employees[2] = employee2;
-			employees[3] = employee3;
-			employees[4] = employee4;
+			allData[0] = employee;
+			allData[1] = employee1;
+			allData[2] = employee2;
+			allData[3] = employee3;
+			allData[4] = employee4;
+
+			BaseData dept = new DepartmentData("10", "役員");
+			BaseData dept1 = new DepartmentData("11", "人事・総務部");
+			BaseData dept2 = new DepartmentData("12", "経理部");
+			BaseData dept3 = new DepartmentData("13", "システム開発事業部");
+			BaseData dept4 = new DepartmentData("14", "教育事業部");
+			BaseData dept5 = new DepartmentData("15", "営業企画部");
+
+			allData[5] = dept;
+			allData[6] = dept1;
+			allData[7] = dept2;
+			allData[8] = dept3;
+			allData[9] = dept4;
+			allData[10] = dept5;
 			
-			for (int i = 0; i < employees.length; i++) {
+			for (int i = 0; i < allData.length; i++) {
+				System.out.println(allData[i]);
+			}
+
+			for (int i = 0; i < allData.length; i++) {
 
 				//			System.out.println(employees[i]);
-				if (employees[i].getPrimaryKeyValue().equals(id)) {
+				if (allData[i].getPrimaryKeyValue().equals(id)) {
 					bo = true;
-					System.out.println(employees[i]);
+					System.out.println(allData[i]);
 
-//					System.out.println(employee.toCSV(F));
-//					System.out.println(employee.getPrimaryKeyValue());
+					//					System.out.println(employee.toCSV(F));
+					//					System.out.println(employee.getPrimaryKeyValue());
 				}
 
 				//			employees[i].isMatchId("10002");