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

Merge branch 'cloud' into xingao_0921

Browse Source
This commit is contained in:
joshen@zcwytd.com
2023-09-22 14:10:22 +08:00
parent 94c66ccd69 436088db01
commit b7ce8f9e04
6 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -128,8 +128,13 @@ public class CourseFileApi extends ApiBaseController {
//默认是查询自己的课件。
//
PageList<CourseFile> courseFilePageList = courseFileService.queryPage(pager.getPageIndex(), pager.getPageSize(), OrderCondition.desc("id"), filters);
return success(courseFilePageList);
try {
PageList<CourseFile> courseFilePageList = courseFileService.queryPage(pager.getPageIndex(), pager.getPageSize(), OrderCondition.desc("id"), filters);
return success(courseFilePageList);
}catch(Exception e) {
log.error("查询课件错误",e);
return error("查询失败",e.getMessage());
}
}
/**
@@ -217,6 +222,10 @@ public class CourseFileApi extends ApiBaseController {
if (StringUtils.isBlank(file.getFilePath())) {
return badRequest("无文件信息");
}
if(StringUtils.isBlank(file.getOrgId())) {
return badRequest("请先选择资源归属");
}
// 重设文件类型为小写
file.setFileType(file.getFileType().toLowerCase());

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

@@ -106,12 +106,12 @@ public class CourseManageApi extends ApiBaseController{
IDataUserSyncService userSyncService;
@PostMapping("/test")
public JsonResponse<PageList<Course>> findTest(Pagination pager,CourseQueryDto dto){
//dto.setOrgAid("7003708665807110150");
PageList<Course> coursePageList = courseService.findPage(pager.getPageIndex(), pager.getPageSize(),dto);
return success(coursePageList);
}
// @PostMapping("/test")
// public JsonResponse<PageList<Course>> findTest(Pagination pager,CourseQueryDto dto){
// //dto.setOrgAid("7003708665807110150");
// PageList<Course> coursePageList = courseService.findPage(pager.getPageIndex(), pager.getPageSize(),dto);
// return success(coursePageList);
// }
/**
* 管理列表的查询

5
servers/boe-server-all/src/main/java/com/xboe/module/course/dto/CourseQueryDto.java
View File

@@ -31,6 +31,11 @@ public class CourseQueryDto {
/**是否发布，无就是全部*/
private Boolean publish;
/**
* 是否启用
*/
private Boolean enabled;
/**创建人*/
private String createUser;

2
servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseFileServiceImpl.java
View File

@@ -72,6 +72,8 @@ public class CourseFileServiceImpl implements ICourseFileService {
public void updateList(List<CourseFile> cflist) {
for(CourseFile cf : cflist) {
courseFileDao.updateMultiFieldById(cf.getId(), UpdateBuilder.create("name",cf.getName()),
UpdateBuilder.create("orgId",cf.getOrgId()),
UpdateBuilder.create("orgName",cf.getOrgName()),
UpdateBuilder.create("resOwner1",cf.getResOwner1()),
UpdateBuilder.create("resOwner2",cf.getResOwner2()),
UpdateBuilder.create("resOwner3",cf.getResOwner3()),

5
servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java
View File

@@ -216,7 +216,10 @@ public class CourseServiceImpl implements ICourseService {
if(dto.getPublish()!=null){
filters.add(FieldFilters.eq("published",dto.getPublish()));
}
//是否启用
if(dto.getEnabled()!=null){
filters.add(FieldFilters.eq("enabled",dto.getEnabled()));
}
return filters;
}

3
servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyCourseServiceImpl.java
View File

@@ -114,6 +114,9 @@ public class StudyCourseServiceImpl implements IStudyCourseService{
if(StringUtils.isNotBlank(sc.getCourseName())) {
query.addFilter(FieldFilters.like("courseName", sc.getCourseName()));
}
if(StringUtils.isNotBlank(sc.getAname())) {
query.addFilter(FieldFilters.eq("aname", sc.getAname()));
}
if(sc.getStatus()!=null) {
query.addFilter(FieldFilters.eq("status", sc.getStatus()));
}