From 3e9aa93886c64a52e04608dde16118631fb7e871 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=E5=98=89=E9=98=B3?= <fjy8018@qq.com>
Date: Sat, 12 May 2018 12:17:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A6=96=E9=A1=B5=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=89=8D=E4=B8=80=E5=A4=A9=E6=88=AA=E6=AD=A2?=
 =?UTF-8?q?=E7=9A=84=E4=BD=9C=E4=B8=9A=EF=BC=8C=E5=90=8E=E5=8F=B0=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E4=B8=BA=E6=98=BE=E7=A4=BA=E5=89=8D4=E5=A4=A9?=
 =?UTF-8?q?=E7=9A=84=E4=BD=9C=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  2 +-
 .../fjy/spring/controller/DataController.java | 20 ++++++++++++++-----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 52cef4d..b2a6818 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.fjy</groupId>
 	<artifactId>spring</artifactId>
-	<version>V2.9.9</version>
+	<version>V2.9.12</version>
 	<packaging>jar</packaging>
 
 	<name>spring</name>
diff --git a/src/main/java/com/fjy/spring/controller/DataController.java b/src/main/java/com/fjy/spring/controller/DataController.java
index 468bedb..3dfd593 100644
--- a/src/main/java/com/fjy/spring/controller/DataController.java
+++ b/src/main/java/com/fjy/spring/controller/DataController.java
@@ -60,12 +60,12 @@ public class DataController {
 
         Calendar c = Calendar.getInstance();
         c.setTime(today);
-        // 今天-1天
-        c.add(Calendar.DAY_OF_MONTH, -1);
+        // 今天-2天，因为数据库比较是">"号，即不包含当天
+        c.add(Calendar.DAY_OF_MONTH, -2);
 
-        Date tomorrow = c.getTime();
+        Date yesterday = c.getTime();
 
-        List<VWorkDetail> homeworks = workDetailService.findAllVWorkDetailAfterTime(f.format(tomorrow));
+        List<VWorkDetail> homeworks = workDetailService.findAllVWorkDetailAfterTime(f.format(yesterday));
         if (homeworks != null) {
             return homeworks;
         }
@@ -110,7 +110,17 @@ public class DataController {
 
     @GetMapping("/home/findallvhomework")
     public List<VHomework> findAllVHomework() {
-        List<VHomework> vHomeworks = homeworkService.findAllVHomework();
+        Format f = new SimpleDateFormat("yyyy-MM-dd");
+        Date today = new Date();
+
+        Calendar c = Calendar.getInstance();
+        c.setTime(today);
+        // 今天-2天，因为数据库比较是">"号，即不包含当天
+        c.add(Calendar.DAY_OF_MONTH, -5);
+
+        Date yesterday = c.getTime();
+
+        List<VHomework> vHomeworks = homeworkService.findAllVHomeworkAfterTime(f.format(yesterday));
         if (vHomeworks != null) {
             return vHomeworks;
         }