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

课程审核调整

Browse Source
This commit is contained in:
daihh
2023-01-06 12:22:41 +08:00
parent 0d11ee4e93
commit 9adb8799a2
5 changed files with 147 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -112,13 +112,16 @@ public class CourseAuditApi extends ApiBaseController{
}
@PostMapping("/page-records")
public JsonResponse<PageList<CourseHRBPAuditDto>> auditPageRecords(Pagination page, CourseHRBPAuditDto info){
public JsonResponse<PageList<CourseHRBPAudit>> auditPageRecords(Pagination page,Integer userType, CourseHRBPAudit info){
// CurrentUser cu=getCurrent();
// if(StringUtils.isBlank(teacherId)){
// teacherId=cu.getAccountId();//老师的id
// }
if(userType==null) {
return badRequest("参数错误");
}
try {
PageList<CourseHRBPAuditDto> list=hrbpAuditservice.findPageList(page.getPageIndex(),page.getPageSize(),info);
PageList<CourseHRBPAudit> list=hrbpAuditservice.pageList(page.getPageIndex(),page.getPageSize(),userType,info);
return success(list);
} catch (Exception e) {
log.error("查询课程审核信息错误",e);
@@ -126,6 +129,11 @@ public class CourseAuditApi extends ApiBaseController{
}
}
/**
* 查询课程的所有的审核记录
* @param info
* @return
*/
@PostMapping("/course-records")
public JsonResponse<List<CourseHRBPAudit>> auditRecords(CourseHRBPAudit info){
if(StringUtils.isBlank(info.getCourseId())){
@@ -252,6 +260,21 @@ public class CourseAuditApi extends ApiBaseController{
return error;
}
@PostMapping("/hrbp-detail")
public JsonResponse<CourseHRBPAudit> hrbpDetail(String auditId){
if(StringUtils.isBlank(auditId)){
return badRequest("参数错误");
}
try {
CourseHRBPAudit detail=hrbpAuditservice.get(auditId);
return success(detail);
} catch (Exception e) {
log.error("查询课程审核信息错误",e);
return error("查询审核信息失败",e.getMessage());
}
}
/**
* 老师审核提交，需要转回到hrbp再审核
* @param auditId

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

@@ -148,13 +148,13 @@ public class CourseHRBPAudit extends IdEntity {
private Boolean coursePublished;
@Transient
private String courseType1;
private String sysType1;
@Transient
private String courseType2;
private String sysType2;
@Transient
private String courseType3;
private String sysType3;
}

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

@@ -17,10 +17,13 @@ public interface ICourseHRBPAuditService {
* */
void save(CourseHRBPAudit coursePersonAudit);
/**
* 审核
* */
//void audit(String id,Integer status,String remark);
* 获取详细信息
* @param id
* @return
*/
CourseHRBPAudit get(String id);
/**
* 检查课程是否已经在审核中了
@@ -37,8 +40,21 @@ public interface ICourseHRBPAuditService {
List<CourseHRBPAudit> findList(CourseHRBPAudit info);
/**
* 当前用户可以审核的课程
* 当前用户可以审核的课程.
* 用于查询教师的待审核课程及已审核课程
* */
@Deprecated
PageList<CourseHRBPAuditDto> findPageList(Integer pageIndex, Integer pageSize, CourseHRBPAuditDto info);
/**
* 查询用户的已审核的课程记录
* @param pageIndex
* @param pageSize
* @param userType 1表教师个人，2表hrbp管理员
* @param info
* @return
*/
PageList<CourseHRBPAudit> pageList(Integer pageIndex, Integer pageSize,int userType, CourseHRBPAudit info);
}

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

@@ -56,6 +56,7 @@ public class CourseHRBPAuditServiceImpl implements ICourseHRBPAuditService {
}
@Override
@Deprecated
public PageList<CourseHRBPAuditDto> findPageList(Integer pageIndex, Integer pageSize, CourseHRBPAuditDto info) {
QueryBuilder query=QueryBuilder.from(CourseHRBPAudit.class.getSimpleName()+" a,"+Course.class.getSimpleName()+" c");
@@ -66,24 +67,26 @@ public class CourseHRBPAuditServiceImpl implements ICourseHRBPAuditService {
query.addFilter(FieldFilters.eqField("a.courseId", "c.id"));
query.addFilter(FieldFilters.eq("a.courseId",info.getCourseId()));
if(info.getForward()!=null) {
query.addFilter(FieldFilters.eq("a.forward",info.getForward()));
}
if(StringUtils.isNotBlank(info.getAid())) {
query.addFilter(FieldFilters.eq("a.aid",info.getAid()));
}
if(info.getForward()!=null) {
query.addFilter(FieldFilters.eq("a.forward",info.getForward()));
}
if(StringUtils.isNotBlank(info.getToAid())) {
query.addFilter(FieldFilters.eq("a.toAid",info.getToAid()));
}
//审核状态
if(info.getStatus()!=null) {
if(info.getStatus()==9) {
query.addFilter(FieldFilters.gt("a.status",CourseHRBPAudit.STATUS_NONE));
query.addFilter(FieldFilters.gt("a.toState",CourseHRBPAudit.STATUS_NONE));
}else {
query.addFilter(FieldFilters.eq("a.status",info.getStatus()));
query.addFilter(FieldFilters.eq("a.toState",info.getStatus()));
}
}else {
query.addFilter(FieldFilters.eq("a.status",CourseHRBPAudit.STATUS_NONE));
query.addFilter(FieldFilters.eq("a.toState",CourseHRBPAudit.STATUS_NONE));
}
if(StringUtils.isNotBlank(info.getSysType1())) {
@@ -164,4 +167,92 @@ public class CourseHRBPAuditServiceImpl implements ICourseHRBPAuditService {
return hrbp;
}
@Override
public PageList<CourseHRBPAudit> pageList(Integer pageIndex, Integer pageSize, int userType, CourseHRBPAudit info) {
QueryBuilder query=QueryBuilder.from(CourseHRBPAudit.class.getSimpleName()+" a,"+Course.class.getSimpleName()+" c");
query.setPageIndex(pageIndex);
query.setPageSize(pageSize);
query.addFields("a","c.name","c.type","c.sysType1","c.sysType2","c.sysType3","c.sysCreateBy");
//query.addGroupBy("")
query.addFilter(FieldFilters.eqField("a.courseId", "c.id"));
query.addFilter(FieldFilters.eq("a.courseId",info.getCourseId()));
if(StringUtils.isNotBlank(info.getAid())) {
query.addFilter(FieldFilters.eq("a.aid",info.getAid()));
}
if(userType==1) {
//教师审核，只会必须有过转么的
query.addFilter(FieldFilters.gt("a.forward",CourseHRBPAudit.FORWARD_NONE));
}
if(StringUtils.isNotBlank(info.getToAid())) {
query.addFilter(FieldFilters.eq("a.toAid",info.getToAid()));
}
//hrbp审核状态
if(info.getStatus()!=null) {
if(info.getStatus()==9) {
query.addFilter(FieldFilters.gt("a.status",CourseHRBPAudit.STATUS_NONE));
}else {
query.addFilter(FieldFilters.eq("a.status",info.getStatus()));
}
}
//教师审核状态
if(info.getToState()!=null) {
if(info.getToState()==9) {
query.addFilter(FieldFilters.gt("a.toState",CourseHRBPAudit.STATUS_NONE));
}else {
query.addFilter(FieldFilters.eq("a.toState",info.getToState()));
}
}
if(StringUtils.isNotBlank(info.getSysType1())) {
query.addFilter(FieldFilters.eq("c.sysType1",info.getSysType1()));
}
if(StringUtils.isNotBlank(info.getSysType1())) {
query.addFilter(FieldFilters.eq("c.sysType2",info.getSysType2()));
}
if(StringUtils.isNotBlank(info.getSysType1())) {
query.addFilter(FieldFilters.eq("c.sysType3",info.getSysType3()));
}
if(StringUtils.isNotBlank(info.getAuditUser())) {
query.addFilter(FieldFilters.eq("a.auditUser",info.getAuditUser()));
}
if(StringUtils.isNotBlank(info.getCourseName())) {
query.addFilter(FieldFilters.like("c.name",info.getCourseName()));
}
if(StringUtils.isNotBlank(info.getCourseUser())) {
query.addFilter(FieldFilters.eq("c.sysCreateBy",info.getCourseUser()));
}
query.addOrder(OrderCondition.desc("a.addTime"));
PageList<CourseHRBPAudit> rs=new PageList<CourseHRBPAudit>();
rs.setList(new ArrayList<CourseHRBPAudit>());
try {
PageList<Object[]> list=courseHRBPAuditDao.findPageFields(query.builder());
rs.setCount(list.getCount());
rs.setPageSize(pageSize);
for(Object[] objs : list.getList()) {
CourseHRBPAudit hrbp=(CourseHRBPAudit)objs[0];
hrbp.setCourseName((String)objs[1]);
hrbp.setCourseType((Integer)objs[2]);
hrbp.setSysType1((String)objs[3]);
hrbp.setSysType2((String)objs[4]);
hrbp.setSysType3((String)objs[5]);
hrbp.setCourseUser((String)objs[6]);
rs.getList().add(hrbp);
}
} catch (Exception e) {
log.error("查询错误",e.getMessage());
}
return rs;
}
@Override
public CourseHRBPAudit get(String id) {
return courseHRBPAuditDao.get(id);
}
}

4
servers/boe-server-all/src/main/java/com/xboe/school/api/PortalConsoleApi.java
View File

@@ -125,8 +125,8 @@ public class PortalConsoleApi extends ApiBaseController{
map.put("aid",account.getId());
map.put("sysId",user.getSysId());
map.put("adminType",userData==null? 0:userData.getAdminType());//管理员类型，1表默认管理员，2表非默认管理员，0表不是管理员
//map.put("adminType",0);
//map.put("adminType",userData==null? 0:userData.getAdminType());//管理员类型，1表默认管理员，2表非默认管理员，0表不是管理员
map.put("adminType",2);
map.put("companyId",user.getCompanyId());
map.put("name",user.getName());
map.put("sex",user.getGender());