From b679205246bbe94e1e83db6f8e26d04668afd402 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期四, 06 六月 2024 11:29:01 +0800
Subject: [PATCH] 短信 obs 支付宝支付
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 97d187b..e90d549 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
@@ -1158,8 +1158,10 @@
.eq("type", 1)).size();
studyRecord.setSurplus(size-studyRecord.getWeek());
}else{
- studyRecord.setSurplus(studyService.list(new QueryWrapper<TStudy>()
+ TUserStudy tUserStudy = new TUserStudy();
+ tUserStudy.setSurplus(studyService.list(new QueryWrapper<TStudy>()
.eq("type", 1)).size());
+ studyRecord = tUserStudy;
}
// 游戏测试成绩
List<TGameRecord> gameRecordList = gameRecordService.lambdaQuery().eq(TGameRecord::getUserId, userId)
@@ -1198,17 +1200,17 @@
@ApiOperation(value = "个人中心-积分明细", tags = {"家长端"})
@ApiImplicitParams({
@ApiImplicitParam(value = "查询时间 格式yyyy-MM", name = "time", dataType = "Integer"),
- @ApiImplicitParam(value = "页码", name = "pageNum", dataType = "Integer", required = true),
+ @ApiImplicitParam(value = "页码", name = "pageNumber", dataType = "Integer", required = true),
@ApiImplicitParam(value = "每页显示条数", name = "pageSize", dataType = "Integer", required = true)
})
public R<IPage<TIntegralRecord>> integralDetailParent(String time,
- @RequestParam("pageNum") Integer pageNum,
+ @RequestParam("pageNumber") Integer pageNumber,
@RequestParam("pageSize") Integer pageSize) {
if(tokenService.getLoginUser1() == null){
return R.tokenError("登录失效");
}
- return R.ok(integralRecordService.integralDetail(new Page<>(pageNum, pageSize), tokenService.getLoginUser1().getUserid(), time));
+ return R.ok(integralRecordService.integralDetail(new Page<>(pageNumber, pageSize), tokenService.getLoginUser1().getUserid(), time));
}
/**
--
Gitblit v1.7.1