[MOD] timezone 로직 수정

T2-Papillon · Apr 23, 2024 · 361ef76 · 361ef76
1 parent 27bf2bb
commit 361ef76
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/papplan/src/main/java/com/boogle/papplan/util/DashBoardDataUtil.java b/papplan/src/main/java/com/boogle/papplan/util/DashBoardDataUtil.java
@@ -30,7 +30,8 @@ public static HashMap<String, Object> getDashBoardPrjData(List<Project> projects
         for (Project project : projects) {
             date = LocalDate.parse(project.getProjEndDate().toString());
             prjToday        += today.equals(date) ? 1 : 0;
-            prjYesterday    += date.isAfter(today.minusDays(2)) && date.isBefore(today) ? 1 : 0;
+            //prjYesterday    += date.isAfter(today.minusDays(2)) && date.isBefore(today) ? 1 : 0;
+            prjYesterday    += date.isEqual(today.minusDays(1)) ? 1 : 0;
             prjWeek         += date.isAfter(lastWeekStart) && date.isBefore(lastWeekEnd) ? 1 : 0;
             if(project.getProjectStatus().getProjectStatusId().equals("DOING")) {
                 prjIsProgressing.add(project);
@@ -64,7 +65,8 @@ public static HashMap<String, Object> getDashBoardTaskData(List<Task> tasks) {
             if(task.getTaskFinishDate() != null) {
                 date = LocalDate.parse(task.getTaskFinishDate().toString());
                 taskToday       += today.equals(date) ? 1 : 0;
-                taskYesterday   += date.isAfter(today.minusDays(2)) && date.isBefore(today) ? 1 : 0;
+                //taskYesterday   += date.isAfter(today.minusDays(2)) && date.isBefore(today) ? 1 : 0;
+                taskYesterday   += date.isEqual(today.minusDays(1)) ? 1 : 0;
                 taskWeek        += date.isAfter(lastWeekStart) && date.isBefore(lastWeekEnd) ? 1 : 0;
             }
             if(task.getTaskStatus().getTaskStatusId().equals("DOING")) {