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

fix: 审核记录修改

Browse Source
This commit is contained in:
liu.zixi
2025-12-18 13:21:19 +08:00
parent 7e54a5244d
commit 8a1468f62a
4 changed files with 85 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
servers/boe-server-all/src/main/java/com/xboe/enums/CourseAuditTypeEnum.java Normal file
View File

@@ -0,0 +1,34 @@
package com.xboe.enums;
import lombok.Getter;
import java.util.Arrays;
/**
* 课程审核类型枚举
*/
@Getter
public enum CourseAuditTypeEnum {
CREATE(1, "创建课程"),
UPDATE(2, "更新课程"),
DISABLE(3, "停用课程"),
ENABLE(4, "启用课程"),
;
private final int code;
private final String label;
CourseAuditTypeEnum(int code, String label) {
this.code = code;
this.label = label;
}
public static CourseAuditTypeEnum getByCode(int code) {
return Arrays.stream(values()).filter(item -> item.code == code).findFirst().orElse(CREATE);
}
}

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

@@ -141,6 +141,26 @@ public class CourseHRBPAudit extends IdEntity {
@Column(name = "last_remark")
private String lastRemark;
/**
* 审核类型
* 1-创建 2-编辑 3-停用 4-启用
*/
@Column(name = "audit_type")
private Integer auditType;
/**
* 审核结果
* 1-通过, 0-驳回
*/
@Column(name = "audit_result")
private Integer auditResult;
/**
* BPM审核id
*/
@Column(name = "audit_id")
private String auditId;
@Transient
private String courseName;

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

@@ -166,6 +166,7 @@ public class CourseAuditServiceImpl implements ICourseAuditService{
//更新审核记录状态
courseHRBPAuditDao.updateMultiFieldById(auditId,
UpdateBuilder.create("status", pass? CourseHRBPAudit.STATUS_PASS:CourseHRBPAudit.STATUS_NOPASS),
UpdateBuilder.create("auditResult", pass ? 1 : 0),
UpdateBuilder.create("auditRemark", remark),
UpdateBuilder.create("auditUser", name),
UpdateBuilder.create("auditAid", aid),

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

@@ -29,12 +29,14 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.xboe.api.ThirdApi;
import com.xboe.core.orm.*;
import com.xboe.enums.CourseAuditTypeEnum;
import com.xboe.module.course.dao.*;
import com.xboe.module.course.dto.*;
import com.xboe.module.course.entity.*;
import com.xboe.module.course.dao.*;
import com.xboe.module.course.dto.CourseTagRelationDto;
import com.xboe.module.course.entity.*;
import com.xboe.module.course.service.ICourseHRBPAuditService;
import com.xboe.module.course.service.ICourseTagService;
import com.xboe.module.course.utils.HttpUtils;
import com.xboe.school.study.dao.StudyCourseDao;
@@ -110,6 +112,9 @@ public class CourseServiceImpl implements ICourseService {
@Resource
private ICourseGradeService courseGradeService;
@Resource
private ICourseHRBPAuditService courseHRBPAuditService;
@Resource
private IAccountService accountService;
@@ -1113,7 +1118,12 @@ public class CourseServiceImpl implements ICourseService {
@Override
public void submit(CourseFullDto full) throws Exception {
String courseId = full.getCourse().getId();
// 查看课程中现有的审核记录
CourseHRBPAudit query = new CourseHRBPAudit();
query.setCourseId(courseId);
query.setStatus(CourseHRBPAudit.STATUS_PASS);
List<CourseHRBPAudit> auditList = courseHRBPAuditService.findList(query);
Course c = full.getCourse();//当前的课程信息
if (c.getVisible() == null) {
c.setVisible(true);
@@ -1167,6 +1177,11 @@ public class CourseServiceImpl implements ICourseService {
hrbpAudit.setAuditRemark("");
hrbpAudit.setForward(CourseHRBPAudit.FORWARD_NONE);
hrbpAudit.setStatus(CourseHRBPAudit.STATUS_NONE);
if (auditList == null || auditList.isEmpty()) {
hrbpAudit.setAuditType(CourseAuditTypeEnum.CREATE.getCode());
} else {
hrbpAudit.setAuditType(CourseAuditTypeEnum.UPDATE.getCode());
}
courseHRBPAuditDao.save(hrbpAudit);
}
@@ -1229,8 +1244,14 @@ public class CourseServiceImpl implements ICourseService {
@Override
public void submit(CourseHRBPAudit hrbpAudit) throws Exception {
String courseId = hrbpAudit.getCourseId();
// 查看课程中现有的审核记录
CourseHRBPAudit query = new CourseHRBPAudit();
query.setCourseId(courseId);
query.setStatus(CourseHRBPAudit.STATUS_PASS);
List<CourseHRBPAudit> auditList = courseHRBPAuditService.findList(query);
courseDao.updateMultiFieldById(hrbpAudit.getCourseId(), UpdateBuilder.create("status", Course.STATUS_SUBMIT),
courseDao.updateMultiFieldById(courseId, UpdateBuilder.create("status", Course.STATUS_SUBMIT),
UpdateBuilder.create("published", false), UpdateBuilder.create("publishTime", LocalDateTime.now()));
//保存审核信息
@@ -1238,6 +1259,11 @@ public class CourseServiceImpl implements ICourseService {
hrbpAudit.setAuditRemark("");
hrbpAudit.setForward(CourseHRBPAudit.FORWARD_NONE);
hrbpAudit.setStatus(CourseHRBPAudit.STATUS_NONE);
if (auditList == null || auditList.isEmpty()) {
hrbpAudit.setAuditType(CourseAuditTypeEnum.CREATE.getCode());
} else {
hrbpAudit.setAuditType(CourseAuditTypeEnum.UPDATE.getCode());
}
courseHRBPAuditDao.save(hrbpAudit);
}
@@ -1338,6 +1364,7 @@ public class CourseServiceImpl implements ICourseService {
if (from != null) {
courseHRBPAuditDao.updateMultiFieldById(auditId,
UpdateBuilder.create("status", pass ? CourseHRBPAudit.STATUS_PASS : CourseHRBPAudit.STATUS_NOPASS),
UpdateBuilder.create("auditResult", pass ? 1 : 0),
UpdateBuilder.create("auditRemark", remark),
UpdateBuilder.create("auditUser", name),
UpdateBuilder.create("auditAid", aid),
@@ -1347,6 +1374,7 @@ public class CourseServiceImpl implements ICourseService {
} else {
courseHRBPAuditDao.updateMultiFieldById(auditId,
UpdateBuilder.create("status", pass ? CourseHRBPAudit.STATUS_PASS : CourseHRBPAudit.STATUS_NOPASS),
UpdateBuilder.create("auditResult", pass ? 1 : 0),
UpdateBuilder.create("auditRemark", remark),
UpdateBuilder.create("auditUser", name),
UpdateBuilder.create("auditAid", aid),