From 1e7b380777619542313525f864de369bf0e6cd40 Mon Sep 17 00:00:00 2001
From: yoon <nmjk0123@gmail.com>
Date: Thu, 27 Mar 2025 18:53:19 +0900
Subject: [PATCH] =?UTF-8?q?=EC=B6=9C=EA=B7=BC=20=ED=87=B4=EA=B7=BC=20?=
 =?UTF-8?q?=EA=B0=81=EA=B0=81=20=EC=83=89=EC=83=81=20=EB=B0=8F=20=ED=94=84?=
 =?UTF-8?q?=EC=A0=9D=EC=9D=B4=EB=A6=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/CommutersMapper.xml | 49 +++++++++++--------
 1 file changed, 29 insertions(+), 20 deletions(-)

diff --git a/src/main/resources/mapper/CommutersMapper.xml b/src/main/resources/mapper/CommutersMapper.xml
index a2ce960..5234d62 100644
--- a/src/main/resources/mapper/CommutersMapper.xml
+++ b/src/main/resources/mapper/CommutersMapper.xml
@@ -34,29 +34,38 @@
     
     <!-- 현재 달의 모든 출근 정보 조회 -->
     <select id="selectCommutersByMonth" parameterType="map" resultType="map">
-        SELECT 
-            c.COMMUTSEQ,
-            c.MEMBERSEQ,
-            c.PROJCTSEQ,
-            c.COMMUTCMT,
-            c.COMMUTLVE,
-            c.COMMUTDAY,
-            c.COMMUTARR,
-            m.MEMBERNAM as memberName,
-            m.MEMBERPRF as profile,
-            p.PROJCTNAM,
-            cc.CMNCODNAM AS projctcolor
-        FROM 
-            commuters c
-        JOIN 
-            netmember m ON c.MEMBERSEQ = m.MEMBERSEQ
-        JOIN 
-            netprojct p ON c.PROJCTSEQ = p.PROJCTSEQ
-        LEFT JOIN commoncod cc ON p.PROJCTCOL = cc.CMNCODVAL AND cc.CMNCODYNP = '1'
-        WHERE 
+         SELECT 
+		    c.COMMUTSEQ,
+		    c.MEMBERSEQ,
+		    c.PROJCTSEQ,
+		    c.PROJCTLVE,
+		    c.COMMUTCMT,
+		    c.COMMUTLVE,
+		    c.COMMUTDAY,
+		    c.COMMUTARR,
+		    m.MEMBERNAM AS memberName,
+		    m.MEMBERPRF AS profile,
+		    p.PROJCTNAM, 
+		    cc.CMNCODNAM AS projctcolor,
+		    p2.PROJCTNAM AS leaveProjectName, 
+		    cl.CMNCODNAM AS leaveProjectColor  
+		FROM 
+		    commuters c
+		JOIN 
+		    netmember m ON c.MEMBERSEQ = m.MEMBERSEQ
+		JOIN 
+		    netprojct p ON c.PROJCTSEQ = p.PROJCTSEQ  
+		LEFT JOIN 
+		    commoncod cc ON p.PROJCTCOL = cc.CMNCODVAL AND cc.CMNCODYNP = '1'  
+		LEFT JOIN 
+		    netprojct p2 ON c.PROJCTLVE = p2.PROJCTSEQ  
+		LEFT JOIN 
+		    commoncod cl ON p2.PROJCTCOL = cl.CMNCODVAL AND cl.CMNCODYNP = '1'  
+		WHERE 
             YEAR(c.COMMUTDAY) = #{year}
             AND MONTH(c.COMMUTDAY) = #{month}
     </select>
+
     
     <!-- 사용자 오늘 출근 정보 조회 -->
     <select id="selectTodayCommuterInfo" parameterType="Integer" resultType="map">