Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-back.git into main

src/main/java/io/company/localhost/common/config/mybatis/TransactionConfig.java

@@ -89,7 +89,7 @@ public class TransactionConfig {
 
 		// naming 설정
 		txAttributes.setProperty("select*", readOnlyAttribute.toString());
-		txAttributes.setProperty("*NewTx*", newTxAttribute.toString());
+		txAttributes.setProperty("insert*", newTxAttribute.toString());
 		txAttributes.setProperty("*NestedTx*", nestedTxAttribute.toString());
 		txAttributes.setProperty("*", writeTxAttribute.toString());
 

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

@@ -54,6 +54,7 @@ public class CommutersService {
     	
     	if(map.get("commutLve") != null) {
     		map.put("commutLve", null);
+    		map.put("commutOut", null);
     	} else {
     		map.put("commutLve", LocalTime.now());
     	}

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

@@ -228,7 +228,12 @@ public class localvacaService {
             dto.put("date", locdateStr); // 변환 불가능한 경우 원본 저장
         }
 
-        dto.put("name", item.get("dateName"));
+        String dateName = String.valueOf(item.get("dateName"));
+        if (dateName.contains("대체공휴일")) {
+            dto.put("name", "대체공휴일");
+        } else {
+            dto.put("name", dateName);
+        }
         return dto;
     }
     

src/main/resources/mapper/CommutersMapper.xml

@@ -11,7 +11,8 @@
             COMMUTCMT,
             COMMUTLVE,
             COMMUTDAY,
-            COMMUTARR
+            COMMUTARR,
+            COMMUTOUT
         ) VALUES (
             #{commutSeq},
             #{memberSeq},
@@ -19,7 +20,8 @@
             #{commutCme},
             #{commutLve},
             #{commutDay},
-            #{commutArr}
+            #{commutArr},
+            #{commutOut},
         )
     </insert>
     
@@ -27,7 +29,8 @@
     <update id="updateLeaveTime">
 	    UPDATE commuters
 	    SET COMMUTLVE = #{commutLve},
-	        PROJCTLVE = #{projctLve}
+	        PROJCTLVE = #{projctLve},
+	        COMMUTOUT = #{commutOut}
 	    WHERE MEMBERSEQ = #{memberSeq}
 	    AND COMMUTDAY = CURDATE()
 	</update>
@@ -46,8 +49,10 @@
 		    m.MEMBERNAM AS memberName,
 		    m.MEMBERPRF AS profile,
 		    p.PROJCTNAM, 
+		    p.PROJCTARR AS projectAddress,
 		    cc.CMNCODNAM AS projctcolor,
 		    p2.PROJCTNAM AS leaveProjectName, 
+		    p2.PROJCTARR AS leaveProjectAddress,
 		    cl.CMNCODNAM AS leaveProjectColor  
 		FROM 
 		    commuters c
@@ -62,8 +67,8 @@
 		LEFT JOIN 
 		    commoncod cl ON p2.PROJCTCOL = cl.CMNCODVAL AND cl.CMNCODYNP = '1'  
 		WHERE 
-            YEAR(c.COMMUTDAY) = #{year}
+		    YEAR(c.COMMUTDAY) = #{year}
-            AND MONTH(c.COMMUTDAY) = #{month}
+		    AND MONTH(c.COMMUTDAY) = #{month}
     </select>