From 4ae59da349820b3deaf8514c21c3f981063a4a51 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 02 七月 2024 09:16:51 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/DolphinEnglish
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
index 6e46ab3..322fe1f 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
@@ -111,7 +111,7 @@
wrapper.isNotNull("error");
List<TStory> list1 = storyService.list(wrapper);
for (TStory tStory : list1) {
- if (tStory.getError()!=null && (!tStory.getError().isEmpty())){
+ if (tStory.getError() != null && (!tStory.getError().isEmpty())) {
tStories.add(tStory);
}
}
@@ -738,7 +738,7 @@
int sum = gameRecordList.stream().map(TGameRecord::getUseTime).mapToInt(Integer::intValue).sum();
Integer totalStudy = studyRecord.getTotalStudy();
studyRecord.setTotalStudy(Math.round((float) (totalStudy + sum) / 3600));
- studyRecord = studyService.studySchedule(studyRecord,week);
+ studyRecord = studyService.studySchedule(studyRecord, week);
}
return R.ok(studyRecord);
}
@@ -1656,8 +1656,11 @@
TUserStudy studyRecord = userStudyService.lambdaQuery().eq(TUserStudy::getUserId, userId)
.eq(TUserStudy::getDisabled, 0).one();
// 总时长还需计算上游戏测试成绩时长
- List<TGameRecord> gameRecordList = gameRecordService.lambdaQuery().eq(TGameRecord::getUserId, userId)
- .eq(TGameRecord::getDisabled, 0).list();
+ List<TGameRecord> gameRecordList = gameRecordService.lambdaQuery()
+ .eq(TGameRecord::getUserId, userId)
+ .eq(TGameRecord::getDisabled, 0)
+ .orderByDesc(TGameRecord::getCreateTime)
+ .list();
if (null != studyRecord) {
// 学习时长格式转换
Integer todayStudy = studyRecord.getTodayStudy();
@@ -1723,9 +1726,10 @@
studyRecord.setTotalStudy(Math.round((float) (totalStudy + sum) / 3600));
return R.ok(new StudyRecordResultVO(studyRecord, gameRecordList));
}
+
@PostMapping("/recordManagement/{id}")
@ApiOperation(value = "游戏测试成绩", tags = {"管理后台-查看用户详情"})
- public R<StudyRecordResultVO> recordManagement(@PathVariable("id")Integer id) {
+ public R<StudyRecordResultVO> recordManagement(@PathVariable("id") Integer id) {
// 学习记录
TUserStudy studyRecord = userStudyService.lambdaQuery().eq(TUserStudy::getUserId, id)
.eq(TUserStudy::getDisabled, 0).one();
--
Gitblit v1.7.1