hz/java-servers
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git synced 2025-12-11 20:06:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://codeup.aliyun.com/648097ddb583fece2f059e59/boe/java-servers into zcwy-dev

Browse Source
This commit is contained in:
Your Name
2023-07-26 13:17:33 +08:00
parent a796898600 78f918ffb1
commit acdacf6402
2 changed files with 36 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
servers/boe-server-all/src/main/java/com/xboe/module/course/api/CoursePortalApi.java
View File

@@ -7,6 +7,8 @@ import java.util.Map;
import javax.annotation.Resource; import javax.annotation.Resource;
import com.xboe.core.JsonResponseStatus;
import com.xboe.module.usergroup.entity.UserGroupItem;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
@@ -250,25 +252,27 @@ public class CoursePortalApi extends ApiBaseController{
if(preview==null) { if(preview==null) {
preview=true; preview=true;
} }
boolean pass = false;
if(!preview) { if(!preview) {
if (!courseCrowdList.isEmpty()) { if (!courseCrowdList.isEmpty()) {
// boolean pass = false; for (CourseCrowd c : courseCrowdList) {
// for (CourseCrowd c : courseCrowdList) { //同一个受众，同一个只会有一条记录，所以这里就直接查询了
// //同一个受众，同一个只会有一条记录，所以这里就直接查询了 List<UserGroupItem> hasItem = userGroupService.findByGroupIdAndAid(c.getGroupId(),aid);
// List<UserGroupItem> hasItem = userGroupService.findByGroupIdAndAid(c.getGroupId(),aid); if (hasItem != null && !hasItem.isEmpty()) {
// if (hasItem != null && !hasItem.isEmpty()) { pass = true;
// pass = true; break;
// break; }
// } }
// }
// if (!pass) { // if (!pass) {
// //return badRequest("您无学习此课程的权限，请与管理员联系"); // //return badRequest("您无学习此课程的权限，请与管理员联系");
// return wrap(JsonResponseStatus.NO_CONTENT, "您无学习此课程的权限，请与管理员联系",rs); // return wrap(JsonResponseStatus.NO_CONTENT, "您无学习此课程的权限，请与管理员联系",rs);
// } // }
} }
} }
List<CourseContent> cclist=contentService.getByCourseId(id); List<CourseContent> cclist=contentService.getByCourseId(id);
List<CourseSection> sectionlist=sectionService.getByCourseId(id); List<CourseSection> sectionlist=sectionService.getByCourseId(id);
List<CourseTeacher> teachers=courseService.findTeachersByCourseId(id); List<CourseTeacher> teachers=courseService.findTeachersByCourseId(id);
@@ -282,8 +286,8 @@ public class CoursePortalApi extends ApiBaseController{
} }
} }
rs.put("isCrowd",pass);
rs.put("contents",cclist); rs.put("contents",cclist);
rs.put("sections",sectionlist); rs.put("sections",sectionlist);
rs.put("teachers",teachers); rs.put("teachers",teachers);

22
servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java
View File

@@ -6,6 +6,8 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import com.xboe.module.usergroup.entity.UserGroupItem;
import com.xboe.module.usergroup.service.IUserGroupService;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
@@ -77,6 +79,9 @@ public class StudyCourseApi extends ApiBaseController{
@Autowired @Autowired
IStudySignupService signupService; IStudySignupService signupService;
@Autowired
private IUserGroupService userGroupService;
/** /**
* 用于查询课程的学习记录 * 用于查询课程的学习记录
@@ -153,6 +158,19 @@ public class StudyCourseApi extends ApiBaseController{
if(crowd!=null && crowd) { if(crowd!=null && crowd) {
rs.put("crowds",courseCrowdList); rs.put("crowds",courseCrowdList);
} }
boolean pass = false;
if (!courseCrowdList.isEmpty()) {
for (CourseCrowd c : courseCrowdList) {
//同一个受众，同一个只会有一条记录，所以这里就直接查询了
List<UserGroupItem> hasItem = userGroupService.findByGroupIdAndAid(c.getGroupId(),aid);
if (hasItem != null && !hasItem.isEmpty()) {
pass = true;
break;
}
}
}
List<CourseContent> cclist=contentService.getByCourseId(cid); List<CourseContent> cclist=contentService.getByCourseId(cid);
List<CourseSection> sectionlist=sectionService.getByCourseId(cid); List<CourseSection> sectionlist=sectionService.getByCourseId(cid);
List<CourseTeacher> teachers=courseService.findTeachersByCourseId(cid); List<CourseTeacher> teachers=courseService.findTeachersByCourseId(cid);
@@ -165,8 +183,8 @@ public class StudyCourseApi extends ApiBaseController{
} }
} }
rs.put("isCrowd",pass);
rs.put("contents",cclist); rs.put("contents",cclist);
rs.put("sections",sectionlist); rs.put("sections",sectionlist);
rs.put("teachers",teachers); rs.put("teachers",teachers);