Merge branch 'zcwy-0724' into dev0525

This commit is contained in:
nisen
2024-08-01 16:42:38 +08:00

View File

@@ -18,6 +18,7 @@ import com.xboe.api.ThirdApi;
import com.xboe.core.orm.FieldFilters;
import com.xboe.module.course.entity.*;
import com.xboe.module.course.vo.TeacherVo;
import com.xboe.school.study.dao.StudyCourseDao;
import com.xboe.school.study.dao.StudySignupDao;
import com.xboe.school.study.entity.StudySignup;
import com.xboe.school.study.service.IStudyHomeWorkService;
@@ -98,7 +99,7 @@ public class CoursePortalApi extends ApiBaseController{
IStudyService studyService;
@Autowired
StudySignupDao signupDao;
StudyCourseDao studyCourseDao;
@Autowired
StringRedisTemplate redisTemplate;
@@ -362,7 +363,7 @@ public class CoursePortalApi extends ApiBaseController{
@GetMapping("/export")
public JsonResponse export(String courseName,String courseId,String contentId,String name,Integer status,HttpServletResponse response) throws IOException {
Map<String, String>map=new HashMap<>();
List<String> userIds = signupDao.findList(FieldFilters.eq("courseId", courseId)).stream().filter(Objects::nonNull).map(StudySignup::getAid).collect(Collectors.toList());
List<String> userIds = studyCourseDao.findList(FieldFilters.eq("courseId", courseId)).stream().filter(Objects::nonNull).map(StudyCourse::getAid).collect(Collectors.toList());
if (userIds.isEmpty()){
return error("查询不到用户");
}