From 06e301ab90abacc95ab8fabfab719ae35eb7f39d Mon Sep 17 00:00:00 2001 From: lwj Date: Fri, 12 Dec 2025 16:00:19 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=9C=A8=E7=BA=BF=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=88=97=E8=A1=A8=E4=B8=AD=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E4=BA=BA=E5=AE=A1=E6=A0=B8=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/course/api/CourseManageApi.java | 20 +++++++++++++++++++ .../com/xboe/module/course/entity/Course.java | 6 ++++++ .../service/ICourseHRBPAuditService.java | 2 ++ .../impl/CourseHRBPAuditServiceImpl.java | 4 ++++ 4 files changed, 32 insertions(+) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java index 063aa49a..541b5638 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java @@ -16,6 +16,7 @@ import com.xboe.module.course.entity.*; import com.xboe.module.course.service.*; import org.apache.commons.lang3.StringUtils; 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.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -137,6 +138,10 @@ public class CourseManageApi extends ApiBaseController{ dto.setOrgIds(ids); dto.setReadIds(userOrgIds.getReadIds()); PageList 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); @@ -1226,4 +1231,19 @@ public class CourseManageApi extends ApiBaseController{ courseService.saveTip(aid); return success(true); } + + public void fullAuditInfo(List list){ + List courseIdList = list.stream().map(Course::getId).collect(Collectors.toList()); + List auditList = hrbpAuditService.listByCourseIds(courseIdList); + Map 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()); + } + }); + + } } diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/entity/Course.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/entity/Course.java index 83aa02b3..394ebc2d 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/entity/Course.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/entity/Course.java @@ -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; diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseHRBPAuditService.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseHRBPAuditService.java index 5aecfcd7..ffddeac9 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseHRBPAuditService.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseHRBPAuditService.java @@ -55,6 +55,8 @@ public interface ICourseHRBPAuditService { * @return */ PageList pageList(Integer pageIndex, Integer pageSize,int userType, CourseHRBPAudit info); + + List listByCourseIds(List courseIdList); } diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseHRBPAuditServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseHRBPAuditServiceImpl.java index ca209468..009364e0 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseHRBPAuditServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseHRBPAuditServiceImpl.java @@ -263,4 +263,8 @@ public class CourseHRBPAuditServiceImpl implements ICourseHRBPAuditService { return courseHRBPAuditDao.get(id); } + public List getByCourseIds(List courseIdList){ + return courseHRBPAuditDao.findList(FieldFilters.in("courseId",courseIdList)); + } + }