From 361ef765e8e8666176f3552ae8422f83f4e26248 Mon Sep 17 00:00:00 2001 From: choi3179 Date: Tue, 23 Apr 2024 15:38:11 +0900 Subject: [PATCH] =?UTF-8?q?[MOD]=20timezone=20=EB=A1=9C=EC=A7=81=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/boogle/papplan/util/DashBoardDataUtil.java | 6 ++++-- 1 file changed, 4 insertions(+), 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 index 67ea019..3909256 100644 --- 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 getDashBoardPrjData(List 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 getDashBoardTaskData(List 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")) {