代码

无关风月

2024-06-15 94824893b36be287747af35902eea499c7acfa12

 ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java

@@ -141,8 +141,14 @@
                // 查询出error字段不为空的数据
                wrapper.isNotNull("error");
                List<TSubject> list1 = subjectService.list(wrapper);
                res.setRecords(list1);
                res.setTotal(list1.size());
                List<TSubject> tSubjects = new ArrayList<>();
                for (TSubject tSubject : list1) {
                    if (!tSubject.getError().isEmpty()){
                        tSubjects.add(tSubject);
                    }
                }
                res.setRecords(tSubjects);
                res.setTotal(tSubjects.size());
                return R.ok(res);
            case 3:
                List<TSubject> list2 = subjectService.list(wrapper);
@@ -1071,8 +1077,13 @@
        TStoryListen listen = storyListenService.lambdaQuery().eq(TStoryListen::getWeek, week).one();
        // 获取对应图片语音
        List<String> list = Arrays.asList(listen.getLookStory().split(","));
        return R.ok(new StudyStoryListenResultVO(listen,
                subjectService.lambdaQuery().in(TSubject::getId, list).eq(TSubject::getState, 1).list()));
        List<TSubject> subjectList;
        if (!list.isEmpty()) {
            subjectList = subjectService.lambdaQuery().in(TSubject::getId, list).eq(TSubject::getState, 1).list();
        } else {
            subjectList = new ArrayList<>();
        }
        return R.ok(new StudyStoryListenResultVO(listen, subjectList));
    }

    /**
@@ -1090,8 +1101,13 @@
        TStoryListen listen = storyListenService.lambdaQuery().eq(TStoryListen::getWeek, week).one();
        // 获取对应图片语音
        List<String> list = Arrays.asList(listen.getStory().split(","));
        return R.ok(new StudyStoryListenResultVO(listen,
                subjectService.lambdaQuery().in(TSubject::getId, list).eq(TSubject::getState, 1).list()));
        List<TSubject> subjectList;
        if (!list.isEmpty()) {
            subjectList = subjectService.lambdaQuery().in(TSubject::getId, list).eq(TSubject::getState, 1).list();
        } else {
            subjectList = new ArrayList<>();
        }
        return R.ok(new StudyStoryListenResultVO(listen,subjectList));
    }

    /**
@@ -1158,8 +1174,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 +1216,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));
    }

    /**