From c69f37529f76f07b79cf6880165f296714b208c3 Mon Sep 17 00:00:00 2001 From: xiaoCJ <406612557@qq.com> Date: Fri, 22 Dec 2023 16:48:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=80=81=E5=B8=88=E7=AB=AF?= =?UTF-8?q?=E4=BA=92=E5=8A=A8=E7=AD=94=E7=96=91=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/tea/TeaTopicManageController.java | 4 ++-- .../service/serviceImpl/tea/TeaTopicManageServiceImpl.java | 6 +++--- .../fund_investment/service/tea/TeaTopicManageService.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/sztzjy/fund_investment/controller/tea/TeaTopicManageController.java b/src/main/java/com/sztzjy/fund_investment/controller/tea/TeaTopicManageController.java index 57fb0d0..3f7cd6a 100644 --- a/src/main/java/com/sztzjy/fund_investment/controller/tea/TeaTopicManageController.java +++ b/src/main/java/com/sztzjy/fund_investment/controller/tea/TeaTopicManageController.java @@ -87,9 +87,9 @@ public class TeaTopicManageController { public ResultEntity> getQuestionAnswer(@RequestParam Integer index, @RequestParam Integer size, @RequestParam String schoolId, - @ApiParam("班级下拉框") @RequestParam(required = false) String className, + @ApiParam("班级下拉框") @RequestParam(required = false) String classId, @ApiParam("姓名/学号") @RequestParam(required = false) String keyWord) { - return new ResultEntity<>(teaTopicManageService.getQuestionAnswer(index, size, schoolId, className, keyWord)); + return new ResultEntity<>(teaTopicManageService.getQuestionAnswer(index, size, schoolId, classId, keyWord)); } @AnonymousAccess diff --git a/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/tea/TeaTopicManageServiceImpl.java b/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/tea/TeaTopicManageServiceImpl.java index ccae9f1..b9b12dc 100644 --- a/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/tea/TeaTopicManageServiceImpl.java +++ b/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/tea/TeaTopicManageServiceImpl.java @@ -98,7 +98,7 @@ public class TeaTopicManageServiceImpl implements TeaTopicManageService { * @Date 2023/12/1 */ @Override - public PageInfo getQuestionAnswer(Integer index, Integer size, String schoolId, String className, String keyWord) { + public PageInfo getQuestionAnswer(Integer index, Integer size, String schoolId, String classId, String keyWord) { QuestionAnswerExample questionAnswerExample = new QuestionAnswerExample(); questionAnswerExample.createCriteria().andSchoolidEqualTo(schoolId); List questionAnswers = questionAnswerMapper.selectByExampleWithBLOBs(questionAnswerExample); @@ -106,8 +106,8 @@ public class TeaTopicManageServiceImpl implements TeaTopicManageService { UserExample.Criteria criteria = userTableExample.createCriteria(); UserExample.Criteria or = userTableExample.createCriteria(); criteria.andSchoolIdEqualTo(schoolId).andRoleIdEqualTo(4); - if (StringUtils.isNotBlank(className)) { - criteria.andClassNameEqualTo(className); + if (StringUtils.isNotBlank(classId)) { + criteria.andClassIdEqualTo(classId); } if (StringUtils.isNotBlank(keyWord)) { criteria.andStudentIdEqualTo(keyWord); diff --git a/src/main/java/com/sztzjy/fund_investment/service/tea/TeaTopicManageService.java b/src/main/java/com/sztzjy/fund_investment/service/tea/TeaTopicManageService.java index 94aa25d..d96be75 100644 --- a/src/main/java/com/sztzjy/fund_investment/service/tea/TeaTopicManageService.java +++ b/src/main/java/com/sztzjy/fund_investment/service/tea/TeaTopicManageService.java @@ -16,6 +16,6 @@ public interface TeaTopicManageService { PageInfo getTopicsBySchoolId(Integer index, Integer size, String schoolId, String module, String topicContent); - PageInfo getQuestionAnswer(Integer index, Integer size,String schoolId, String className, String keyWord); + PageInfo getQuestionAnswer(Integer index, Integer size,String schoolId, String classId, String keyWord); }