diff --git a/pom.xml b/pom.xml
index 52cef4d..b2a6818 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
com.fjy
spring
- V2.9.9
+ V2.9.12
jar
spring
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 homeworks = workDetailService.findAllVWorkDetailAfterTime(f.format(tomorrow));
+ List homeworks = workDetailService.findAllVWorkDetailAfterTime(f.format(yesterday));
if (homeworks != null) {
return homeworks;
}
@@ -110,7 +110,17 @@ public class DataController {
@GetMapping("/home/findallvhomework")
public List findAllVHomework() {
- List 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 vHomeworks = homeworkService.findAllVHomeworkAfterTime(f.format(yesterday));
if (vHomeworks != null) {
return vHomeworks;
}