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

master
xiaoCJ 1 year ago
parent 9312056347
commit 975f204150

@ -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();
userTableExample.createCriteria().andSchoolIdEqualTo(schoolId);
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);
List<String> className = userMapper.selectClassNameBySchoolId(schoolId);
return new ResultEntity<>(className);
}

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

@ -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) {

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

@ -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());

Loading…
Cancel
Save