fjy8018/cms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修复首页不显示前一天截止的作业，后台设置为显示前4天的作业

Browse Source
This commit is contained in:
F嘉阳
2018-05-12 12:17:09 +08:00
parent 4e6adecc1f
commit 3e9aa93886
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/com/fjy/spring/controller/DataController.java
View File

@@ -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;
}