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:
lwj
2025-12-24 13:48:03 +08:00
parent b867c37f28
commit 35a8f6a3f8
2 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -159,13 +159,36 @@ 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));
Map<String,CourseHRBPAudit> map = new HashMap<>();
for(CourseHRBPAudit audit : auditList){
CourseHRBPAudit r = map.get(audit.getCourseId());
//可能存在多个审核记录，取时间最新的那一条
if(r == null || r.getAddTime().isBefore(audit.getAddTime())){
map.put(audit.getCourseId(),audit);
}
}
list.forEach(item ->{
CourseHRBPAudit audit = map.get(item.getId());
if(audit != null){
//暂时获取这两个字段,之后看是否需要调整
item.setAuditUser(audit.getAuditUser());
item.setAuditTime(audit.getAuditTime());
//公开课审核完成取公开课的审核信息
if(StringUtils.isNotEmpty(audit.getLastAname())){
item.setAuditUser(audit.getLastAname());
item.setAuditTime(audit.getLastTime());
}else if(CourseHRBPAudit.FORWARD_TEACHER == audit.getForward()){
//转发到教师审核取教师审核信息
item.setAuditUser(audit.getToName());
}else if (CourseHRBPAudit.FORWARD_TO_FINISH == audit.getForward()){
//老师审核完成
item.setAuditUser(audit.getAuditUser());
if(CourseHRBPAudit.STATUS_NOPASS ==audit.getStatus()){
//老师审核不通过时取老师的审核时间
item.setAuditTime(audit.getToAuditTime());
}
}else {
item.setAuditUser(audit.getAuditUser());
item.setAuditTime(audit.getAuditTime());
}
}
});

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

@@ -1164,6 +1164,7 @@ public class CourseServiceImpl implements ICourseService {
hrbpAudit.setCourseId(c.getId());
hrbpAudit.setAddTime(LocalDateTime.now());
hrbpAudit.setAid(full.getAuditUser().getAid());
hrbpAudit.setAuditUser(full.getAuditUser().getName());//提前保存审核hrbp的名字，用于显示下一步审核人
hrbpAudit.setAuditRemark("");
hrbpAudit.setForward(CourseHRBPAudit.FORWARD_NONE);
hrbpAudit.setStatus(CourseHRBPAudit.STATUS_NONE);