mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git
synced 2025-12-14 05:16:49 +08:00
fix:在线课程管理列表中添加审核人审核时间
This commit is contained in:
@@ -16,6 +16,7 @@ import com.xboe.module.course.entity.*;
|
|||||||
import com.xboe.module.course.service.*;
|
import com.xboe.module.course.service.*;
|
||||||
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.util.CollectionUtils;
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
import org.springframework.web.bind.annotation.PostMapping;
|
||||||
import org.springframework.web.bind.annotation.RequestBody;
|
import org.springframework.web.bind.annotation.RequestBody;
|
||||||
@@ -137,6 +138,10 @@ public class CourseManageApi extends ApiBaseController{
|
|||||||
dto.setOrgIds(ids);
|
dto.setOrgIds(ids);
|
||||||
dto.setReadIds(userOrgIds.getReadIds());
|
dto.setReadIds(userOrgIds.getReadIds());
|
||||||
PageList<Course> coursePageList = courseService.findPage(pager.getPageIndex(), pager.getPageSize(),dto);
|
PageList<Course> coursePageList = courseService.findPage(pager.getPageIndex(), pager.getPageSize(),dto);
|
||||||
|
//补充审核人,审核时间字段
|
||||||
|
if(CollectionUtils.isEmpty(coursePageList.getList())){
|
||||||
|
fullAuditInfo(coursePageList.getList());
|
||||||
|
}
|
||||||
return success(coursePageList);
|
return success(coursePageList);
|
||||||
}catch(Exception e) {
|
}catch(Exception e) {
|
||||||
log.error("管理课程列表查询错误",e);
|
log.error("管理课程列表查询错误",e);
|
||||||
@@ -1226,4 +1231,19 @@ public class CourseManageApi extends ApiBaseController{
|
|||||||
courseService.saveTip(aid);
|
courseService.saveTip(aid);
|
||||||
return success(true);
|
return success(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void fullAuditInfo(List<Course> list){
|
||||||
|
List<String> courseIdList = list.stream().map(Course::getId).collect(Collectors.toList());
|
||||||
|
List<CourseHRBPAudit> auditList = hrbpAuditService.listByCourseIds(courseIdList);
|
||||||
|
Map<String,CourseHRBPAudit> map = auditList.stream().collect(Collectors.toMap(CourseHRBPAudit::getCourseId, i->i));
|
||||||
|
list.forEach(item ->{
|
||||||
|
CourseHRBPAudit audit = map.get(item.getId());
|
||||||
|
if(audit != null){
|
||||||
|
//暂时获取这两个字段,之后看是否需要调整
|
||||||
|
item.setAuditUser(audit.getAuditUser());
|
||||||
|
item.setAuditTime(audit.getAuditTime());
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -406,6 +406,12 @@ public class Course extends BaseEntity {
|
|||||||
@Transient
|
@Transient
|
||||||
private Boolean isTip;
|
private Boolean isTip;
|
||||||
|
|
||||||
|
@Transient
|
||||||
|
private String auditUser;
|
||||||
|
|
||||||
|
@Transient
|
||||||
|
private LocalDateTime auditTime;
|
||||||
|
|
||||||
public Course(String id,String name,String summary,String coverImg,String sysCreateAid,String sysCreateBy,Integer type,LocalDateTime publishTime){
|
public Course(String id,String name,String summary,String coverImg,String sysCreateAid,String sysCreateBy,Integer type,LocalDateTime publishTime){
|
||||||
super.setId(id);
|
super.setId(id);
|
||||||
this.name=name;
|
this.name=name;
|
||||||
|
|||||||
@@ -55,6 +55,8 @@ public interface ICourseHRBPAuditService {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
PageList<CourseHRBPAudit> pageList(Integer pageIndex, Integer pageSize,int userType, CourseHRBPAudit info);
|
PageList<CourseHRBPAudit> pageList(Integer pageIndex, Integer pageSize,int userType, CourseHRBPAudit info);
|
||||||
|
|
||||||
|
List<CourseHRBPAudit> listByCourseIds(List<String> courseIdList);
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -263,4 +263,8 @@ public class CourseHRBPAuditServiceImpl implements ICourseHRBPAuditService {
|
|||||||
return courseHRBPAuditDao.get(id);
|
return courseHRBPAuditDao.get(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public List<CourseHRBPAudit> getByCourseIds(List<String> courseIdList){
|
||||||
|
return courseHRBPAuditDao.findList(FieldFilters.in("courseId",courseIdList));
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user