From 336fddcc83f863cc8aee573906149a201e4114f3 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 19 六月 2024 09:38:21 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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 fb9e2fb..f94ae07 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
@@ -224,6 +224,8 @@
} else {
TGame tGame = new TGame();
tGame.setWeek(dto.getWeek());
+ tGame.setAnswerRate(game.getAnswerRate());
+ tGame.setRate(game.getRate());
tGame.setStudyId(one.getId());
tGame.setCount(game.getCount());
tGame.setIntegral(game.getIntegral());
@@ -1498,17 +1500,18 @@
@GetMapping("/integralDetailParent")
@ApiOperation(value = "个人中心-积分明细", tags = {"家长端"})
@ApiImplicitParams({
- @ApiImplicitParam(value = "查询时间 格式yyyy-MM", name = "time", dataType = "Integer"),
- @ApiImplicitParam(value = "页码", name = "pageNum", dataType = "Integer", required = true),
- @ApiImplicitParam(value = "每页显示条数", name = "pageSize", dataType = "Integer", required = true)
+ @ApiImplicitParam(value = "查询时间 格式yyyy-MM", name = "time"),
+ @ApiImplicitParam(value = "页码", name = "pageNum", required = true),
+ @ApiImplicitParam(value = "每页显示条数", name = "pageSize", required = true)
})
public R<IPage<TIntegralRecord>> integralDetailParent(String time,
- Integer pageNum,
- Integer pageSize) {
+ @RequestParam("pageNum") Integer pageNum,
+ @RequestParam("pageSize") Integer pageSize) {
+ System.err.println("页码"+pageNum);
+ System.err.println("页数"+ pageSize);
if (tokenService.getLoginUser1() == null) {
return R.tokenError("登录失效");
}
-
return R.ok(integralRecordService.integralDetail(new Page<>(pageNum, pageSize), tokenService.getLoginUser1().getUserid(), time));
}
--
Gitblit v1.7.1