From 931182d19f6487509c2052d46bb11153605f02d5 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 31 十月 2024 19:14:20 +0800
Subject: [PATCH] 开始考试按钮禁用
---
src/main/java/com/ycl/jxkg/service/impl/HomeServiceImpl.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/service/impl/HomeServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/HomeServiceImpl.java
index b61702f..fe423ef 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/HomeServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/HomeServiceImpl.java
@@ -61,11 +61,13 @@
//瀛︿範璁板綍
StudyRecord studyRecord = studyRecordMapper.getByStudentId(userId);
if (studyRecord != null) {
+ Long studyTime = studyRecord.getStudyTime();
+ BigDecimal studyTimeVo = new BigDecimal(studyTime).divide(new BigDecimal(3600), 1, RoundingMode.HALF_UP);
vo.setLastTime(studyRecord.getLastTime());
- vo.setStudyTime(studyRecord.getStudyTime());
+ vo.setStudyTime(studyTimeVo);
vo.setMeetCount(studyRecord.getMeetCount());
}else {
- vo.setStudyTime(0L);
+ vo.setStudyTime(BigDecimal.ZERO);
vo.setMeetCount(0);
}
//骞冲潎鍒�
@@ -85,14 +87,16 @@
List<ExamVO> examList = new ArrayList<>();
if (!CollectionUtils.isEmpty(classes)) {
LocalDate nowDate = LocalDate.now();
- // 璁＄畻涓冨ぉ鍚庣殑鏃ユ湡
+ // 璁＄畻鍓嶅悗涓冨ぉ鐨勬棩鏈�
LocalDate sevenDayLaterDate = nowDate.plusDays(7);
LocalDateTime now = LocalDateTime.of(nowDate, LocalTime.MIN);
LocalDateTime sevenDayLater = LocalDateTime.of(sevenDayLaterDate, LocalTime.MIN);
+ LocalDate sevenDayBeforeDate = nowDate.minusDays(7);
+ LocalDateTime sevenDayBefore = LocalDateTime.of(sevenDayBeforeDate, LocalTime.MIN);
//鎴戠殑璇剧▼
QueryWrapper<Meet> meetQueryWrapper = new QueryWrapper<>();
meetQueryWrapper.in("classes_id",classes);
- meetQueryWrapper.between("start_time", now,sevenDayLater);
+ meetQueryWrapper.between("start_time", sevenDayBefore,sevenDayLater);
List<Meet> meets = meetMapper.selectList(meetQueryWrapper);
for (Meet meet : meets) {
MeetVO meetVO = new MeetVO();
@@ -102,7 +106,7 @@
//鎴戠殑鑰冭瘯
QueryWrapper<Exam> examQueryWrapper = new QueryWrapper<>();
examQueryWrapper.in("classes_id",classes);
- examQueryWrapper.between("start_time", now,sevenDayLater);
+ examQueryWrapper.between("start_time", sevenDayBefore,sevenDayLater);
List<Exam> exams = examMapper.selectList(examQueryWrapper);
for (Exam exam : exams) {
ExamVO examVO = new ExamVO();
--
Gitblit v1.8.0