From 975f2041504027b0c127b4a662155dfee1e8b5c8 Mon Sep 17 00:00:00 2001 From: xiaoCJ <406612557@qq.com> Date: Wed, 20 Dec 2023 17:15:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=80=80=E5=87=BA=E6=97=B6?= =?UTF-8?q?=E6=9C=BA=E8=A1=A8=EF=BC=8C=E5=AE=8C=E6=88=90=E6=8A=95=E8=B5=84?= =?UTF-8?q?=E6=8A=A5=E5=91=8A=E9=A1=B5=E9=9D=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/tea/ClassScoreController.java | 12 +++--------- .../sztzjy/fund_investment/mapper/UserMapper.java | 5 +++++ .../serviceImpl/tea/ClassScoreServiceImpl.java | 5 +++-- .../serviceImpl/tea/TeaTopicManageServiceImpl.java | 2 +- .../java/com/sztzjy/fund_investment/task/Task.java | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/sztzjy/fund_investment/controller/tea/ClassScoreController.java b/src/main/java/com/sztzjy/fund_investment/controller/tea/ClassScoreController.java index 410e7b3..55b0948 100644 --- a/src/main/java/com/sztzjy/fund_investment/controller/tea/ClassScoreController.java +++ b/src/main/java/com/sztzjy/fund_investment/controller/tea/ClassScoreController.java @@ -78,7 +78,7 @@ public class ClassScoreController { @AnonymousAccess @GetMapping("/importExcel") - @ApiOperation("成绩管理/导出") + @ApiOperation("成绩管理/导出") //目前只导出提交了报告的学生的数据 public void importExcel(HttpServletResponse response, @RequestParam String schoolId) { classScoreService.importExcel(response, schoolId); } @@ -168,14 +168,8 @@ public class ClassScoreController { @GetMapping("/getClassNameBySchoolId") @ApiOperation("成绩管理&互动答疑/班级下拉框") public ResultEntity> getClassNameBySchoolId(@RequestParam String schoolId) { - UserExample userTableExample = new UserExample(); - userTableExample.createCriteria().andSchoolIdEqualTo(schoolId); - List userTables = userMapper.selectByExample(userTableExample); - List list = new ArrayList<>(); - for (User userTable : userTables) { - list.add(userTable.getClassName()); - } - return new ResultEntity>(list); + List className = userMapper.selectClassNameBySchoolId(schoolId); + return new ResultEntity<>(className); } diff --git a/src/main/java/com/sztzjy/fund_investment/mapper/UserMapper.java b/src/main/java/com/sztzjy/fund_investment/mapper/UserMapper.java index 0663ab7..8ca1e67 100644 --- a/src/main/java/com/sztzjy/fund_investment/mapper/UserMapper.java +++ b/src/main/java/com/sztzjy/fund_investment/mapper/UserMapper.java @@ -6,6 +6,8 @@ import java.util.List; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + @Mapper public interface UserMapper { long countByExample(UserExample example); @@ -29,4 +31,7 @@ public interface UserMapper { int updateByPrimaryKeySelective(User record); int updateByPrimaryKey(User record); + + @Select("select class_name from wx_user where school_id = #{schoolId} group by class_name") + List selectClassNameBySchoolId(@Param("schoolId") String schoolId); } \ No newline at end of file diff --git a/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/tea/ClassScoreServiceImpl.java b/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/tea/ClassScoreServiceImpl.java index 205c35f..522968e 100644 --- a/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/tea/ClassScoreServiceImpl.java +++ b/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/tea/ClassScoreServiceImpl.java @@ -78,7 +78,7 @@ public class ClassScoreServiceImpl implements ClassScoreService { } - /* + /* 班级成绩统计分析饼状图 * @author xcj * @Date 2023/11/24 */ @@ -146,6 +146,7 @@ public class ClassScoreServiceImpl implements ClassScoreService { UserExample userTableExample = new UserExample(); UserExample.Criteria criteria = userTableExample.createCriteria(); UserExample.Criteria orCriteria = userTableExample.createCriteria(); + criteria.andRoleIdEqualTo(4); if (StringUtils.isNotBlank(classId)) { criteria.andClassIdEqualTo(classId); } else { @@ -198,7 +199,7 @@ public class ClassScoreServiceImpl implements ClassScoreService { @Override public void importExcel(HttpServletResponse response, String schoolId) { UserExample userTableExample = new UserExample(); - userTableExample.createCriteria().andSchoolIdEqualTo(schoolId); + userTableExample.createCriteria().andSchoolIdEqualTo(schoolId).andRoleIdEqualTo(4); List userTables = userMapper.selectByExample(userTableExample); List userDtoList = new ArrayList<>(); for (User userTable : userTables) { 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 4df08ca..81c99d6 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 @@ -103,7 +103,7 @@ public class TeaTopicManageServiceImpl implements TeaTopicManageService { UserExample userTableExample = new UserExample(); UserExample.Criteria criteria = userTableExample.createCriteria(); UserExample.Criteria or = userTableExample.createCriteria(); - criteria.andSchoolIdEqualTo(schoolId); + criteria.andSchoolIdEqualTo(schoolId).andRoleIdEqualTo(4); if (StringUtils.isNotBlank(className)) { criteria.andClassNameEqualTo(className); } diff --git a/src/main/java/com/sztzjy/fund_investment/task/Task.java b/src/main/java/com/sztzjy/fund_investment/task/Task.java index ebbedb5..5f32e6f 100644 --- a/src/main/java/com/sztzjy/fund_investment/task/Task.java +++ b/src/main/java/com/sztzjy/fund_investment/task/Task.java @@ -106,7 +106,7 @@ public class Task { teaClassScore.setFailCount(gradeCounts.get("fail")); teaClassScore.setClassId(classId); UserExample userTableExample =new UserExample(); - userTableExample.createCriteria().andSchoolIdEqualTo(schoolId).andClassIdEqualTo(classId); + userTableExample.createCriteria().andSchoolIdEqualTo(schoolId).andClassIdEqualTo(classId).andRoleIdEqualTo(4); List userTables = userMapper.selectByExample(userTableExample); User userTable = userTables.get(0); teaClassScore.setClassName(userTable.getClassName());