bug修改

无关风月

2024-06-19 336fddcc83f863cc8aee573906149a201e4114f3

 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));
    }