From db8e199c9dddca463268e32dfc0887947c1971f4 Mon Sep 17 00:00:00 2001
From: s-sakiyama <26-m-s-stella-tecnica@it-college.jp>
Date: Wed, 16 Sep 2026 15:59:22 +0900
Subject: [PATCH] =?UTF-8?q?6=E6=AE=B5=E9=9A=8E=E7=9B=AE=EF=BC=88Department?=
 =?UTF-8?q?Data=E3=82=92=E4=BD=9C=E3=81=A3=E3=81=A6=E3=80=81=E3=83=9D?=
 =?UTF-8?q?=E3=83=AA=E3=83=A2=E3=83=BC=E3=83=95=E3=82=A3=E3=82=BA=E3=83=A0?=
 =?UTF-8?q?=E3=81=AE=E5=A8=81=E5=8A=9B=E3=82=92=E5=AE=9F=E6=84=9F=E3=81=97?=
 =?UTF-8?q?=E3=82=88=E3=81=86=EF=BC=89?=
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           | 37 +++++++++++++++++++++++++++++---
 2 files changed, 73 insertions(+), 3 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..0668409
--- /dev/null
+++ b/em-oop/src/DepartmentData.java
@@ -0,0 +1,39 @@
+
+public class DepartmentData extends BaseData {
+
+	private String idDepartment;
+	private String nmDepartment;
+
+	@Override
+	public String toString() {
+		return getIdDepartment() + "\t" + getNmDepartment();
+	}
+
+	@Override
+	public String toCSV() {
+		return getIdDepartment() + "," + getNmDepartment();
+	}
+
+	@Override
+	public String getPrimaryKeyValue() {
+		// TODO 自動生成されたメソッド・スタブ
+		return getIdDepartment();
+	}
+
+	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;
+	}
+
+}
diff --git a/em-oop/src/Main.java b/em-oop/src/Main.java
index c87587a..1d4d9d6 100644
--- a/em-oop/src/Main.java
+++ b/em-oop/src/Main.java
@@ -65,12 +65,45 @@ public class Main {
 
 		for (BaseData e : employees) {
 			System.out.println(e);
-			;
 		}
 		System.out.println("現在の社員のデータ件数：" + EmployeeData.getEmpCount() + "件");
 
 		System.out.println();
 
+		//社員データ+部署データ
+		BaseData[] allData = new BaseData[11];
+		for (int i = 0; i < employees.length; i++) {
+			allData[i] = employees[i];
+
+		}
+		DepartmentData[] dept = new DepartmentData[6];
+		for (int i = 0; i < dept.length; i++) {
+			dept[i] = new DepartmentData();
+		}
+		dept[0].setIdDepartment("10");
+		dept[0].setNmDepartment("役員");
+		allData[5] = dept[0];
+		dept[1].setIdDepartment("11");
+		dept[1].setNmDepartment("人事・総務部");
+		allData[6] = dept[1];
+		dept[2].setIdDepartment("12");
+		dept[2].setNmDepartment("経理部");
+		allData[7] = dept[2];
+		dept[3].setIdDepartment("13");
+		dept[3].setNmDepartment("システム開発事業部");
+		allData[8] = dept[3];
+		dept[4].setIdDepartment("14");
+		dept[4].setNmDepartment("教育事業部");
+		allData[9] = dept[4];
+		dept[5].setIdDepartment("15");
+		dept[5].setNmDepartment("営業企画部");
+		allData[10] = dept[5];
+
+		for (BaseData data : allData) {
+			System.out.println(data);
+		}
+		System.out.println();
+
 		//nullおよび前後の空白を取り除いた結果が空文字チェック
 		//		BaseData emp = new EmployeeData("10000", "デフォルト", "ヤマダタツヤ", "yamada@hoge.jp", "aaa", "10");
 		//		System.out.println(emp);
@@ -79,8 +112,6 @@ public class Main {
 		//		emp.setNmEmployee("  　　");
 		//		System.out.println(emp);
 
-		System.out.println();
-
 		BaseData emptyEmployee = new EmployeeData("", "", "", "", "", "");
 		System.out.println(emptyEmployee);