From 2bd7d2f2725cec8e31376b507727b48d98d84254 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 04 七月 2024 18:03:30 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java | 8 +++-----
1 files changed, 3 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 01dfeac..cae7d5b 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
@@ -874,8 +874,6 @@
} else {
result = null;
}
- subjectRecordService.lambdaUpdate().set(TSubjectRecord::getDisabled, 0)
- .eq(TSubjectRecord::getUserId, loginStudy.getUserid()).update();
return R.ok(result);
}
@@ -1718,7 +1716,7 @@
tGameRecord.setTime(simpleDateFormat.format(tGameRecord.getCreateTime()));
}
Integer totalStudy = studyRecord.getTotalStudy();
- studyRecord.setTotalStudy(Math.round((float) (totalStudy + sum) / 3600));
+ studyRecord.setTotalStudy(Math.round((float) (totalStudy) / 3600));
// 剩余周目
List<TStudy> studyList = studyService.lambdaQuery().eq(TStudy::getDisabled, 0)
.eq(TStudy::getType, Constants.ONE)
@@ -1762,7 +1760,7 @@
.eq(TGameRecord::getDisabled, 0).list();
int sum = gameRecordList.stream().map(TGameRecord::getUseTime).mapToInt(Integer::intValue).sum();
Integer totalStudy = studyRecord.getTotalStudy();
- studyRecord.setTotalStudy(Math.round((float) (totalStudy + sum) / 3600));
+ studyRecord.setTotalStudy(Math.round((float) (totalStudy) / 3600));
StudyRecordResultVO studyRecordResultVO = new StudyRecordResultVO(studyRecord, gameRecordList);
return R.ok(studyRecordResultVO);
}
@@ -1818,7 +1816,7 @@
return R.tokenError("登录失效");
}
IPage<TIntegralRecord> page = integralRecordService.integralDetail(new Page<>(pageNum, pageSize),
- tokenService.getLoginUserStudy().getUserid(), time);
+ tokenService.getLoginUser1().getUserid(), time);
for (TIntegralRecord record : page.getRecords()) {
if (!record.getIntegral().startsWith("-")) {
record.setIntegral("+" + record.getIntegral());
--
Gitblit v1.7.1