diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CoursePortalApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CoursePortalApi.java index bcfc7094..3fb3a04d 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CoursePortalApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CoursePortalApi.java @@ -15,23 +15,14 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.xboe.api.ThirdApi; -import com.xboe.api.vo.AuditList; -import com.xboe.api.vo.AuditListParam; -import com.xboe.api.vo.UserDynamic; -import com.xboe.api.vo.UserdynamicParam; -import com.xboe.common.OrderCondition; -import com.xboe.core.JsonResponseStatus; import com.xboe.core.orm.FieldFilters; -import com.xboe.module.course.dao.CourseContentDao; -import com.xboe.module.course.dao.CourseDao; -import com.xboe.module.course.dao.CourseHomeWorkDao; -import com.xboe.module.course.dao.CourseSectionDao; import com.xboe.module.course.entity.*; import com.xboe.module.course.vo.TeacherVo; -import com.xboe.module.usergroup.entity.UserGroupItem; -import com.xboe.school.study.entity.StudyHomeWork; +import com.xboe.school.study.dao.StudySignupDao; +import com.xboe.school.study.entity.StudySignup; import com.xboe.school.study.service.IStudyHomeWorkService; import com.xboe.school.study.service.IStudyService; +import com.xboe.system.user.entity.User; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.StringRedisTemplate; @@ -106,6 +97,9 @@ public class CoursePortalApi extends ApiBaseController{ @Autowired IStudyService studyService; + @Autowired + StudySignupDao signupDao; + @Autowired StringRedisTemplate redisTemplate; @@ -368,6 +362,11 @@ public class CoursePortalApi extends ApiBaseController{ @GetMapping("/export") public JsonResponse export(String courseName,String courseId,String contentId,String name,Integer status,HttpServletResponse response) throws IOException { Mapmap=new HashMap<>(); + List userIds = signupDao.findList(FieldFilters.eq("courseId", courseId)).stream().filter(Objects::nonNull).map(StudySignup::getAid).collect(Collectors.toList()); + if (userIds.isEmpty()){ + return error("查询不到用户"); + } + Listuser=studyService.getUserNo(userIds); try { List list = studyService.getList(courseId, contentId, name, status); if(list.isEmpty()){ @@ -375,10 +374,14 @@ public class CoursePortalApi extends ApiBaseController{ } list.stream().filter(Objects::nonNull).forEach(s->{ shomeworkService.getByStudyIdAndContentId(s.getStudyId(),contentId).stream().filter(e-> !Objects.equals(e.getFilePath(), "")).filter(e->e.getFilePath()!=null).forEach(e->{ - //取作业后缀名 - int dotIndex = e.getFilePath().lastIndexOf('/'); // 查找最后一个'.'的位置 - String extension = e.getFilePath().substring(dotIndex+1); - map.put(extension,"/home/www/elearning/upload"+e.getFilePath()); + user.forEach(u->{ + if(u.getId().equals(s.getAid())){ + //取后缀 + int dotIndex = e.getFilePath().lastIndexOf('.'); // 查找最后一个'.'的位置 + String extension = e.getFilePath().substring(dotIndex); + map.put(u.getName()+"-"+u.getUserNo()+extension,"/home/www/elearning/upload"+e.getFilePath()); + } + }); }); }); diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/IStudyService.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/IStudyService.java index 7e1a8ea8..7371885b 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/IStudyService.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/IStudyService.java @@ -7,6 +7,7 @@ import com.xboe.common.PageList; import com.xboe.school.study.dto.StudyContentDto; import com.xboe.school.study.entity.StudyCourseItem; import com.xboe.school.study.entity.StudyTime; +import com.xboe.system.user.entity.User; /** * 学习情况处理,比较综合一个处理类 @@ -97,4 +98,6 @@ public interface IStudyService { PageList findItemPage(int pageIndex, int pageSize, String contentId, String courseId, String name, Integer status); List getList(String courseId, String contentId, String name, Integer status); + + List getUserNo(List userIds); } diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java index 5fe7750f..9f24cf62 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java @@ -8,12 +8,12 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.annotation.Resource; import javax.transaction.Transactional; import com.xboe.module.article.entity.Article; import com.xboe.module.interaction.entity.Shares; import com.xboe.school.study.entity.StudyCourse; +import com.xboe.system.user.entity.User; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -320,6 +320,11 @@ public class StudyServiceImpl implements IStudyService{ return scItemDao.findList(query.builder()); } + @Override + public List getUserNo(List userIds) { + return userDao.findList(FieldFilters.in("id", userIds)); + } + @Override @Transactional public void updateProcess(String studyContentId,String studyId, String courseId,Integer total, Integer progress,String token) {