Merge remote-tracking branch 'origin/stat' into stat

This commit is contained in:
86182
2022-10-19 13:14:32 +08:00
3 changed files with 7 additions and 7 deletions

View File

@@ -20,7 +20,7 @@ public interface ICourseHRBPAuditService {
/** /**
* 审核 * 审核
* */ * */
void audit(String id,Integer status,String remark); //void audit(String id,Integer status,String remark);
/** /**
* 根据课程、id获取课程的审核记录 * 根据课程、id获取课程的审核记录

View File

@@ -33,10 +33,10 @@ public class CourseHRBPAuditServiceImpl implements ICourseHRBPAuditService {
courseHRBPAuditDao.save(coursePersonAudit); courseHRBPAuditDao.save(coursePersonAudit);
} }
@Override // @Override
public void audit(String id, Integer status, String remark) { // public void audit(String id, Integer status, String remark) {
courseHRBPAuditDao.updateMultiFieldById(id, UpdateBuilder.create("status",status),UpdateBuilder.create("auditRemark",remark)); // courseHRBPAuditDao.updateMultiFieldById(id, UpdateBuilder.create("status",status),UpdateBuilder.create("auditRemark",remark));
} // }
private CourseHRBPAuditDto convert(CourseHRBPAudit hrbp) { private CourseHRBPAuditDto convert(CourseHRBPAudit hrbp) {
CourseHRBPAuditDto dto=new CourseHRBPAuditDto(); CourseHRBPAuditDto dto=new CourseHRBPAuditDto();

View File

@@ -360,7 +360,7 @@ public class CourseServiceImpl implements ICourseService {
courseDao.updateFieldById(id,"name","已删除"+name); courseDao.updateFieldById(id,"name","已删除"+name);
//同时添加发布事件,这里的创建人需要修改为教师 //同时添加发布事件,这里的创建人需要修改为教师
Course c=courseDao.get(id); Course c=courseDao.get(id);
eventSender.send("发布课程","PublishCourse", "删除课程【"+c.getName()+"", c.getId(), "1", c.getName(), c.getSysCreateAid(), c.getSysCreateBy(),""); eventSender.send("删除课程","PublishCourse", "删除课程【"+c.getName()+"", c.getId(), "1", c.getName(), c.getSysCreateAid(), c.getSysCreateBy(),"");
}else { }else {
//彻底删除,课件设置为无课程状态 //彻底删除,课件设置为无课程状态
courseDao.setDeleted(id); courseDao.setDeleted(id);
@@ -700,7 +700,7 @@ public class CourseServiceImpl implements ICourseService {
this.fullTextPublish(c); this.fullTextPublish(c);
} }
//同时添加发布事件,这里的创建人需要修改为教师 //同时添加发布事件,这里的创建人需要修改为教师
eventSender.send("发布课程","PublishCourse", "删除课程【"+c.getName()+"", c.getId(), "1", c.getName(), c.getSysCreateAid(), c.getSysCreateBy(),""); eventSender.send("发布课程","PublishCourse", "发布课程【"+c.getName()+"", c.getId(), "1", c.getName(), c.getSysCreateAid(), c.getSysCreateBy(),"");
} }