From 450270610fbdb4149c4ca12b99e9d4d8b452c9fd Mon Sep 17 00:00:00 2001
From: s-sakiyama <26-m-s-stella-tecnica@it-college.jp>
Date: Wed, 30 Sep 2026 09:25:59 +0900
Subject: [PATCH] =?UTF-8?q?2=E6=AE=B5=E9=9A=8E=E7=9B=AE=EF=BC=88=E5=90=8D?=
 =?UTF-8?q?=E5=89=8D=E6=A4=9C=E7=B4=A2=E3=81=8B=E3=82=89=E5=85=A8=E3=83=87?=
 =?UTF-8?q?=E3=83=BC=E3=82=BF=E6=A4=9C=E7=B4=A2=E3=81=AB=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/rhizome/example/dao/EmployeeDAO.java | 10 +++++++---
 src/com/rhizome/example/main/Main.java       |  7 ++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/com/rhizome/example/dao/EmployeeDAO.java b/src/com/rhizome/example/dao/EmployeeDAO.java
index ef63c49..9e001f5 100644
--- a/src/com/rhizome/example/dao/EmployeeDAO.java
+++ b/src/com/rhizome/example/dao/EmployeeDAO.java
@@ -13,6 +13,7 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.rhizome.example.dto.EmployeeDTO;
 import com.rhizome.example.util.DbUtil;
 
 public class EmployeeDAO {
@@ -48,8 +49,8 @@ public class EmployeeDAO {
 	 * @throws SQLException
 	 * @throws ClassNotFoundException
 	 */
-	public List<String> selectAll() throws SQLException, ClassNotFoundException {
-		List<String> rtnList = new ArrayList<>();
+	public List<EmployeeDTO> selectAll() throws SQLException, ClassNotFoundException {
+		List<EmployeeDTO> rtnList = new ArrayList<>();
 		StringBuilder sql = new StringBuilder();
 		sql.append(" SELECT ");
 		sql.append("    " + "*");
@@ -60,7 +61,10 @@ public class EmployeeDAO {
 			this.stmt = con.prepareStatement(sql.toString());
 			rs = stmt.executeQuery();
 			while (rs.next()) {
-				rtnList.add(rs.getString(NM_EMPLOYEE));
+				EmployeeDTO dto = new EmployeeDTO(rs.getInt(ID_EMPLOYEE), rs.getString(NM_EMPLOYEE),
+						rs.getString(KN_EMPLOYEE), rs.getString(MAIL_ADDRESS), rs.getString(PASSWORD),
+						rs.getInt(ID_DEPARTMENT));
+				rtnList.add(dto);
 			}
 		} finally {
 			DbUtil.closeStatement(this.stmt);
diff --git a/src/com/rhizome/example/main/Main.java b/src/com/rhizome/example/main/Main.java
index 14fb220..1babd54 100644
--- a/src/com/rhizome/example/main/Main.java
+++ b/src/com/rhizome/example/main/Main.java
@@ -7,6 +7,7 @@ import java.util.List;
 import java.util.Scanner;
 
 import com.rhizome.example.dao.EmployeeDAO;
+import com.rhizome.example.dto.EmployeeDTO;
 import com.rhizome.example.util.DbUtil;
 
 /**
@@ -76,7 +77,7 @@ public class Main {
 	 * @throws SQLException
 	 */
 	public static void empSelect() throws ClassNotFoundException, SQLException {
-		List<String> empList = new ArrayList<>();
+		List<EmployeeDTO> empList = new ArrayList<>();
 		Connection con = DbUtil.getConnection();
 		EmployeeDAO empDao = new EmployeeDAO(con);
 		System.out.println("1:全検索 2:条件検索 それ以外:戻る");
@@ -89,8 +90,8 @@ public class Main {
 			default:
 				return;
 			}
-			for (String emp : empList) {
-				System.out.println(emp);
+			for (EmployeeDTO emp : empList) {
+				emp.showInfo();
 			}
 		} finally {
 			DbUtil.closeConnection(empDao.con);