연차 로직 변경

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

@@ -180,4 +180,11 @@ public class ProjectController {
         return ApiResponse.ok(netprojctService.selectUserProjectPeriod(projctSeq));
     }
     
+    @ParameterCheck
+    @GetMapping("/people/{memberSeq}")
+	public ApiResponse<List<MapDto>> selectUserProjectPeriod2(@PathVariable int memberSeq) {
+	    	
+        return ApiResponse.ok(netprojctService.selectUserProjectPeriod2(memberSeq));
+    }
+    
 }

src/main/java/io/company/localhost/controller/common/WeatherController.java

@@ -1,5 +1,9 @@
 package io.company.localhost.controller.common;
 
+import java.time.Duration;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -65,62 +69,86 @@ public class WeatherController {
         JsonNode nodeData = objectMapper.readTree(jsonData);
         JsonNode forecastList = nodeData.get("list");
         
-        // 날짜별로 데이터 그룹화
+        // 현재 날짜 및 시간 계산
+        LocalDate today = LocalDate.now();
+        LocalDateTime nowTime = LocalDateTime.now();
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        
+        // 날짜별 데이터를 그룹화
         Map<String, List<String>> dailyWeathers = new HashMap<>();
         Map<String, List<String>> dailyDescriptions = new HashMap<>();
         Map<String, List<String>> dailyIcons = new HashMap<>();
         
+        // 오늘 예보 중 가장 가까운 예보 저장 변수
+        JsonNode closestForecastToday = null;
+        long minDiff = Long.MAX_VALUE;
+        
+        // forecastList를 순회하며 데이터를 그룹화하고, 오늘의 경우 가장 가까운 forecast 선택
         for (JsonNode forecast : forecastList) {
-            String date = forecast.get("dt_txt").asText().split(" ")[0];	//날짜 추출
+            String dtTxt = forecast.get("dt_txt").asText();
+            String date = dtTxt.split(" ")[0];  // 날짜 추출 (예: "2025-04-04")
             
-            JsonNode weather = forecast.get("weather").get(0);		
+            JsonNode weather = forecast.get("weather").get(0);
             String mainWeather = weather.get("main").asText();
             String description = weather.get("description").asText();
             String icon = weather.get("icon").asText();
             
-            if (!dailyWeathers.containsKey(date)) {
+            // 해당 날짜의 리스트에 추가 (map이 없으면 생성)
-                dailyWeathers.put(date, new ArrayList<>());
+            dailyWeathers.computeIfAbsent(date, k -> new ArrayList<>()).add(mainWeather);
-                dailyDescriptions.put(date, new ArrayList<>());
+            dailyDescriptions.computeIfAbsent(date, k -> new ArrayList<>()).add(description);
-                dailyIcons.put(date, new ArrayList<>());
+            dailyIcons.computeIfAbsent(date, k -> new ArrayList<>()).add(icon);
-            }
             
-            dailyWeathers.get(date).add(mainWeather);
+            // 오늘 날짜의 forecast라면 현재 시간과의 차이 계산
-            dailyDescriptions.get(date).add(description);
+            if (date.equals(today.toString())) {
-            dailyIcons.get(date).add(icon);
+                LocalDateTime forecastTime = LocalDateTime.parse(dtTxt, formatter);
-        }
+                long diff = Math.abs(Duration.between(forecastTime, nowTime).toMillis());
-        
+                if (diff < minDiff) {
-        // 각 날짜별 대표 날씨 결정 (가장 빈번한 날씨 상태)
+                    minDiff = diff;
-        List<WeatherVo> dailyWeatherList = new ArrayList<>();
+                    closestForecastToday = forecast;
-        
-        for (String date : dailyWeathers.keySet()) {
-            List<String> weathers = dailyWeathers.get(date);
-            List<String> descriptions = dailyDescriptions.get(date);
-            List<String> icons = dailyIcons.get(date);
-            
-            // 가장 빈번한 날씨 찾기(카운팅)
-            Map<String, Integer> weatherCounts = new HashMap<>();
-            for (String w : weathers) {
-                weatherCounts.put(w, weatherCounts.getOrDefault(w, 0) + 1);
-            }
-            
-            String mainWeather = "";
-            int maxCount = 0;
-            
-            for (Map.Entry<String, Integer> entry : weatherCounts.entrySet()) {
-                if (entry.getValue() > maxCount) {
-                    maxCount = entry.getValue();
-                    mainWeather = entry.getKey();
                 }
             }
-            
-            // 평균값 계산
-            int mainWeatherIndex = weathers.indexOf(mainWeather);
-            String description = descriptions.get(mainWeatherIndex);
-            String icon = icons.get(mainWeatherIndex);
-            
-            dailyWeatherList.add(new WeatherVo(date, mainWeather, description, icon));
         }
-
+        
+        // 최종적으로 각 날짜의 대표 날씨 결정
+        List<WeatherVo> dailyWeatherList = new ArrayList<>();
+        for (String date : dailyWeathers.keySet()) {
+            String repMainWeather;
+            String repDescription;
+            String repIcon;
+            
+            // 오늘인 경우, 가장 가까운 forecast의 아이콘과 설명 사용
+            if (date.equals(today.toString()) && closestForecastToday != null) {
+                JsonNode weather = closestForecastToday.get("weather").get(0);
+                repMainWeather = weather.get("main").asText();
+                repDescription = weather.get("description").asText();
+                repIcon = weather.get("icon").asText();
+            } else {
+                // 기타 날짜는 기존 방식대로 가장 빈번한 날씨 상태 선택
+                List<String> weathers = dailyWeathers.get(date);
+                List<String> descriptions = dailyDescriptions.get(date);
+                List<String> icons = dailyIcons.get(date);
+                
+                Map<String, Integer> weatherCounts = new HashMap<>();
+                for (String w : weathers) {
+                    weatherCounts.put(w, weatherCounts.getOrDefault(w, 0) + 1);
+                }
+                
+                repMainWeather = "";
+                int maxCount = 0;
+                for (Map.Entry<String, Integer> entry : weatherCounts.entrySet()) {
+                    if (entry.getValue() > maxCount) {
+                        maxCount = entry.getValue();
+                        repMainWeather = entry.getKey();
+                    }
+                }
+                int repIndex = weathers.indexOf(repMainWeather);
+                repDescription = descriptions.get(repIndex);
+                repIcon = icons.get(repIndex);
+            }
+            
+            dailyWeatherList.add(new WeatherVo(date, repMainWeather, repDescription, repIcon));
+        }
+        
         return dailyWeatherList;
     }
 

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

@@ -34,4 +34,7 @@ public interface NetprojctMapper {
 	int deleteProject(MapDto map);
 	
 	List<MapDto> selectUserProjectPeriod(int projectSeq);
+
+	List<MapDto> selectUserProjectPeriod2(int memberSeq);
 }
+

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

@@ -175,4 +175,8 @@ public class NetprojctService {
 		return netprojctMapper.selectUserProjectPeriod(projctSeq);
 	}
 	
+	public List<MapDto> selectUserProjectPeriod2(int memberSeq) {
+		return netprojctMapper.selectUserProjectPeriod2(memberSeq);
+	}
+	
 }

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

@@ -288,32 +288,29 @@ public class localvacaService {
             return emp;
         }).collect(Collectors.toList());
     }
-        /**
+    
-         * 총 연차 계산 로직
+    /**
-         */
+     * 총 연차 계산 로직
+     */
     public int procCalculateTotalVacation(LocalDate hireDate) {
         LocalDate today = LocalDate.now();
-        int currentYear = today.getYear();
         int hireYear = hireDate.getYear();
-        int hireMonth = hireDate.getMonthValue();
+        int currentYear = today.getYear();
 
-        // 올해 입사자 → 1년 미만: 입사월 이후로 계산
+        // 입사년도와 현재년도가 같으면 : (12 - 입사월)
         if (hireYear == currentYear) {
-            return 12 - hireMonth;
+            return 12 - hireDate.getMonthValue();
         }
 
+        // 기본 연차 15
         int totalVacation = 15;
 
-        // 2년 경과 이후부터, 입사월이 도래했을 때 1개씩 추가
+        // 입사년도 기준 3년차 1월부터, 매 2년마다 1개씩 증가
-        LocalDate baseDate = hireDate.plusYears(2).withDayOfMonth(1);
+        LocalDate accrualDate = LocalDate.of(hireYear + 3, 1, 1);
 
-        while (!baseDate.isAfter(today)) {
+        while (!accrualDate.isAfter(today)) {
-            // 입사월이 현재 달과 같거나 지났을 때만 연차 추가
+            totalVacation++;
-            if (baseDate.getYear() == today.getYear() && baseDate.getMonthValue() > today.getMonthValue()) {
+            accrualDate = accrualDate.plusYears(2);
-                break; // 아직 입사월이 도달하지 않았으면 종료
-            }
-            totalVacation += 1;
-            baseDate = baseDate.plusYears(2);
         }
 
         return totalVacation;

src/main/resources/application.yml

@@ -95,6 +95,8 @@ logging:
       connection: off
     io.company: DEBUG
     io.company.localhost.mapper: off
+  file:
+    path: logs
 
 
 filePath:

src/main/resources/mapper/NetprojctMapper.xml

@@ -116,35 +116,65 @@
 	
 	<!-- 프로젝트 모든 사용자 참여기간 조회 -->
 	<select id="selectUserProjectPeriod" resultType="io.company.localhost.common.dto.MapDto">
-        SELECT 
+    SELECT 
-            m.MEMBERSEQ,
+        m.MEMBERSEQ,
-            m.MEMBERNAM,
+        m.MEMBERNAM,
-            p.PROJCTSEQ,
+        p.PROJCTSEQ,
-            p.PROJCTNAM,
+        p.PROJCTNAM,
-            p.PROJCTSTR as projectStartDate,
+        p.PROJCTSTR AS projectStartDate,
-            p.PROJCTEND as projectEndDate,
+        p.PROJCTEND AS projectEndDate,
-            (
+        COALESCE((
-                SELECT MIN(c2.COMMUTDAY) 
+            SELECT MIN(c2.COMMUTDAY) 
-                FROM commuters c2 
+            FROM commuters c2 
-                WHERE c2.PROJCTSEQ = p.PROJCTSEQ 
+            WHERE c2.PROJCTSEQ = p.PROJCTSEQ 
-                  AND c2.MEMBERSEQ = m.MEMBERSEQ
+              AND c2.MEMBERSEQ = m.MEMBERSEQ
-            ) as userStartDate,
+        ), p.PROJCTSTR) AS userStartDate,
-            (
+        COALESCE((
-                SELECT MAX(c2.COMMUTDAY) 
+            SELECT MAX(c2.COMMUTDAY) 
-                FROM commuters c2 
+            FROM commuters c2 
-                WHERE c2.PROJCTSEQ = p.PROJCTSEQ 
+            WHERE c2.PROJCTSEQ = p.PROJCTSEQ 
-                  AND c2.MEMBERSEQ = m.MEMBERSEQ
+              AND c2.MEMBERSEQ = m.MEMBERSEQ
-            ) as userEndDate
+        ), p.PROJCTEND) AS userEndDate
-        FROM 
+    FROM 
-            netprojct p
+        netprojct p
-        INNER JOIN 
+    LEFT JOIN 
-            commuters c ON p.PROJCTSEQ = c.PROJCTSEQ
+        commuters c ON p.PROJCTSEQ = c.PROJCTSEQ
-        INNER JOIN 
+    LEFT JOIN 
-            netmember m ON c.MEMBERSEQ = m.MEMBERSEQ
+        netmember m ON c.MEMBERSEQ = m.MEMBERSEQ
-        WHERE 
+    WHERE 
-            p.PROJCTSEQ = #{projectSeq}
+        p.PROJCTSEQ = #{projectSeq}
-        GROUP BY 
+    GROUP BY 
-            m.MEMBERSEQ, p.PROJCTSEQ
+        m.MEMBERSEQ, m.MEMBERNAM, p.PROJCTSEQ, p.PROJCTNAM, p.PROJCTSTR, p.PROJCTEND
-    </select>
+</select>
+
+<select id="selectUserProjectPeriod2" resultType="io.company.localhost.common.dto.MapDto">
+    SELECT 
+        pm.MEMBERSEQ,
+        p.PROJCTSEQ,
+        p.PROJCTNAM,
+        p.PROJCTSTR AS projectStartDate,
+        p.PROJCTEND AS projectEndDate,
+        (
+            SELECT MIN(c2.COMMUTDAY)
+            FROM commuters c2
+            WHERE c2.PROJCTSEQ = p.PROJCTSEQ
+              AND c2.MEMBERSEQ = pm.MEMBERSEQ
+        ) AS userStartDate,
+        CASE 
+            WHEN p.PROJCTEND IS NOT NULL THEN (
+                SELECT MAX(c2.COMMUTDAY)
+                FROM commuters c2
+                WHERE c2.PROJCTSEQ = p.PROJCTSEQ
+                  AND c2.MEMBERSEQ = pm.MEMBERSEQ
+            )
+            ELSE NULL
+        END AS userEndDate
+    FROM promember pm
+    INNER JOIN netprojct p ON pm.PROJCTSEQ = p.PROJCTSEQ
+    WHERE pm.MEMBERSEQ = #{memberSeq}
+      AND pm.PROJCTYON = 1
+</select>
+
+
 	
 </mapper>