java/DolphinEnglish.git

			@@ -1071,8 +1071,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 +1095,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));
			}

			/**
			@@ -1200,17 +1210,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));
			}

			/**