新增退出时机表，完成投资报告页面接口

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<List<String>> getClassNameBySchoolId(@RequestParam String schoolId) {
-        UserExample userTableExample = new UserExample();
+        List<String> className = userMapper.selectClassNameBySchoolId(schoolId);
-        userTableExample.createCriteria().andSchoolIdEqualTo(schoolId);
+        return new ResultEntity<>(className);
-        List<User> userTables = userMapper.selectByExample(userTableExample);
-        List<String> list = new ArrayList<>();
-        for (User userTable : userTables) {
-            list.add(userTable.getClassName());
-        }
-        return new ResultEntity<List<String>>(list);
     }
 
 

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<String> selectClassNameBySchoolId(@Param("schoolId") String schoolId);
 }

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<User> userTables = userMapper.selectByExample(userTableExample);
         List<UserDto> userDtoList = new ArrayList<>();
         for (User userTable : userTables) {

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

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<User> userTables = userMapper.selectByExample(userTableExample);
             User userTable = userTables.get(0);
             teaClassScore.setClassName(userTable.getClassName());