mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git
synced 2025-12-10 19:36:50 +08:00
Merge remote-tracking branch 'origin/stat' into stat
This commit is contained in:
@@ -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获取课程的审核记录
|
||||||
|
|||||||
@@ -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();
|
||||||
|
|||||||
@@ -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(),"");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user