출퇴근 드래그앤드랍 시 업데이트 x

src/main/java/io/company/localhost/controller/api/CommutersController.java

@@ -106,10 +106,11 @@ public class CommutersController {
 	 * @return 
 	 * 
 	 */
-	@PatchMapping("/update")
+	/*
-	public ApiResponse<Boolean> updateCommuterProject(@ReqMap MapDto map) {
+	 * @PatchMapping("/update") public ApiResponse<Boolean>
-		boolean isCommuter = commutersService.updateCommuterProject(map);
+	 * updateCommuterProject(@ReqMap MapDto map) { boolean isCommuter =
-		return ApiResponse.ok(isCommuter);
+	 * commutersService.updateCommuterProject(map); return
-	}
+	 * ApiResponse.ok(isCommuter); }
+	 */
 	
 }

src/main/java/io/company/localhost/mapper/CommutersMapper.java

@@ -33,7 +33,7 @@ public interface CommutersMapper {
     
     List<MapDto> selectTodayCommuter();
     
-    int updateCommuterProject(MapDto map);
+//    int updateCommuterProject(MapDto map);
     
     int deleteCommuters(MapDto map);
 	

src/main/java/io/company/localhost/service/CommutersService.java

@@ -100,8 +100,9 @@ public class CommutersService {
 	 * @param map
 	 * @return
 	 */
-    public boolean updateCommuterProject(MapDto map) {
+	/*
-        return commutersMapper.updateCommuterProject(map) > 0;
+	 * public boolean updateCommuterProject(MapDto map) { return
-    }
+	 * commutersMapper.updateCommuterProject(map) > 0; }
+	 */
 	
 }

src/main/resources/mapper/CommutersMapper.xml

@@ -26,7 +26,8 @@
      <!-- 퇴근 시간 업데이트 -->
     <update id="updateLeaveTime">
 	    UPDATE commuters
-        SET COMMUTLVE = #{commutLve}
+	    SET COMMUTLVE = #{commutLve},
+	        PROJCTLVE = #{projctLve}
 	    WHERE MEMBERSEQ = #{memberSeq}
 	    AND COMMUTDAY = CURDATE()
 	</update>
@@ -67,7 +68,7 @@
     
     <!-- 오늘 출근 모든 사용자 조회 -->
     <select id="selectTodayCommuter">
-	    SELECT c.COMMUTCMT, m.MEMBERSEQ, m.MEMBERPRF as profile, p.PROJCTNAM
+	    SELECT c.COMMUTCMT, c.PROJCTLVE, c.COMMUTLVE, m.MEMBERSEQ, m.MEMBERPRF as profile, p.PROJCTNAM
 	    FROM commuters c 
 	    JOIN netmember m ON c.MEMBERSEQ = m.MEMBERSEQ
 	    JOIN netprojct p ON c.PROJCTSEQ = p.PROJCTSEQ
@@ -75,12 +76,12 @@
 	</select>
 	
 	 <!-- 출근 프로젝트 업데이트 -->
-    <update id="updateCommuterProject">
+    <!-- <update id="updateCommuterProject">
         UPDATE commuters
         SET PROJCTSEQ = #{projctSeq}
         WHERE MEMBERSEQ = #{memberSeq}
         AND COMMUTDAY = CURDATE()
-    </update>
+    </update> -->
 	
 	<delete id="deleteCommuters" parameterType="int">
 	    DELETE FROM commuters WHERE PROJCTSEQ = #{projctSeq}

src/main/resources/mapper/NetprojctMapper.xml

@@ -85,11 +85,10 @@
         WHERE PROJCTSEQ = #{projctSeq}
     </update>
 
-    <!-- 프로젝트 로그 조회 -->
+    <!-- 프로젝트 등록·수정자 조회 -->
 	<select id="selectProjectLog" parameterType="int" resultType="map">
 	    SELECT logDate, logMessage
 	    FROM (
-	        -- 프로젝트 등록 로그
 	        SELECT 
 	            DATE_FORMAT(p.PROJCTCDT, '%Y-%m-%d %H:%i') AS logDate,
 	            CONCAT('[', m.MEMBERNAM, '] 프로젝트 등록') AS logMessage
@@ -99,7 +98,6 @@
 	        
 	        UNION ALL
 	        
-	        -- 프로젝트 수정 로그
 	        SELECT 
 	            DATE_FORMAT(p.PROJCTUDT, '%Y-%m-%d %H:%i') AS logDate,
 	            CONCAT('[', m.MEMBERNAM, '] 프로젝트 수정') AS logMessage

src/main/resources/mapper/PromemberMapper.xml

@@ -77,19 +77,28 @@
     
     <!-- 사용자가 속한 프로젝트 조회 -->
     <select id="selectMemberProjects" resultType="io.company.localhost.common.dto.MapDto">
-	    SELECT p.PROJCTSEQ, p.PROJCTNAM, c.CMNCODNAM AS projctcolor,
+    SELECT 
+        p.PROJCTSEQ, 
+        p.PROJCTNAM, 
+        c.CMNCODNAM AS projctcolor,
+        MAX(cm.PROJCTLVE) AS last_worked_project, 
+        MAX(cm.COMMUTLVE) AS last_check_out_time,
         MAX(cm.COMMUTCMT) AS last_check_in_time   
     FROM promember pm
     JOIN netprojct p ON pm.PROJCTSEQ = p.PROJCTSEQ
     LEFT JOIN commoncod c ON p.PROJCTCOL = c.CMNCODVAL AND c.CMNCODYNP = '1'
-	    LEFT JOIN commuters cm ON pm.PROJCTSEQ = cm.PROJCTSEQ AND cm.MEMBERSEQ = pm.MEMBERSEQ
+    LEFT JOIN commuters cm 
+        ON pm.MEMBERSEQ = cm.MEMBERSEQ 
+        AND (pm.PROJCTSEQ = cm.PROJCTSEQ OR pm.PROJCTSEQ = cm.PROJCTLVE) 
     WHERE pm.MEMBERSEQ = #{memberSeq}
     AND pm.PROJCTYON = '1'
     AND (p.PROJCTEND IS NULL OR p.PROJCTEND >= CURDATE())
     GROUP BY p.PROJCTSEQ, p.PROJCTNAM, c.CMNCODNAM
-	    ORDER BY last_check_in_time DESC, p.PROJCTSTR DESC
+    ORDER BY 
-	</select>
+        MAX(cm.COMMUTLVE) DESC,                       
-	
+        MAX(cm.COMMUTCMT) DESC,                        
+        p.PROJCTSTR DESC                               
+</select>
 	<delete id="deletePromember" parameterType="int">
 	    DELETE FROM promember WHERE PROJCTSEQ = #{projctSeq}
 	</delete>