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

1155增加审批人审批时间

Browse Source
This commit is contained in:
肖建涛
2025-12-19 17:16:45 +08:00
parent 9ba9cf2157
commit 02788430e9
4 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -138,6 +138,10 @@ public class CourseManageApi extends ApiBaseController{
dto.setOrgIds(ids);
dto.setReadIds(userOrgIds.getReadIds());
PageList<Course> coursePageList = courseService.findPage(pager.getPageIndex(), pager.getPageSize(),dto);
//补充审核人,审核时间字段
if(CollectionUtils.isEmpty(coursePageList.getList())){
fullAuditInfo(coursePageList.getList());
}
return success(coursePageList);
}catch(Exception e) {
log.error("管理课程列表查询错误",e);
@@ -145,6 +149,21 @@ public class CourseManageApi extends ApiBaseController{
}
}
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());
}
});
}
@GetMapping("/detail")
public JsonResponse<Map<String,Object>> detail(String id){

6
servers/boe-server-all/src/main/java/com/xboe/module/course/entity/Course.java
View File

@@ -406,6 +406,12 @@ public class Course extends BaseEntity {
@Transient
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){
super.setId(id);
this.name=name;

4
servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseHRBPAuditService.java
View File

@@ -55,6 +55,8 @@ public interface ICourseHRBPAuditService {
* @return
*/
PageList<CourseHRBPAudit> pageList(Integer pageIndex, Integer pageSize,int userType, CourseHRBPAudit info);
List<CourseHRBPAudit> listByCourseIds(List<String> courseIdList);
}

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

@@ -263,4 +263,7 @@ public class CourseHRBPAuditServiceImpl implements ICourseHRBPAuditService {
return courseHRBPAuditDao.get(id);
}
public List<CourseHRBPAudit> listByCourseIds(List<String> courseIdList){
return courseHRBPAuditDao.findList(FieldFilters.in("courseId",courseIdList));
}
}