Commit eb0c46a1 authored by wzp's avatar wzp

修改bug

parent 964d9385
......@@ -99,7 +99,7 @@ public class Audit implements Serializable {
@TableField("model_data")
private String modelData;
@ApiModelProperty("审核人员")
@ApiModelProperty("初审人员")
@TableField(value = "audit_id")
private String auditId;
......@@ -115,7 +115,7 @@ public class Audit implements Serializable {
@TableField(exist = false)
private String name;
@ApiModelProperty("审核人名")
@ApiModelProperty("初审人名")
@TableField(exist = false)
private String auditName;
......
......@@ -117,7 +117,6 @@ public class AuditController extends BaseController {
@MethodLog(operModule = OperModule.RECHECK, operType = OperType.AUDIT)
public Map<String, Object> updateAudit(@RequestBody @Validated(value = {Update.class}) Audit audit) {
TUser tUser = getcurUser();
audit.setAuditId(tUser.getId());
boolean flag;
//如果层级是初审,设置初审时间
if (AuditStatusEnum.TBC.name().equals(audit.getLevel())) {
......@@ -126,6 +125,7 @@ public class AuditController extends BaseController {
if (!AuditStatusEnum.REFUSED.name().equals(audit.getStatus())) {
audit.setFirstRemarks("");
}
audit.setAuditId(tUser.getId());
} else {
//如果层级是复审,设置复审时间
audit.setSecondTime(LocalDateTime.now());
......@@ -332,7 +332,7 @@ public class AuditController extends BaseController {
return getFailResult("id参数有误");
}
TUser tUser = getcurUser();
audit.setAuditId(tUser.getId());
//设置修改的审核状态
audit.setStatus(auditStatusParam.getStatus());
//为啥数据库有null值
......@@ -342,6 +342,7 @@ public class AuditController extends BaseController {
//初审
if (AuditStatusEnum.TBC.name().equals(audit.getLevel())) {
audit.setFirstRemarks(auditStatusParam.getRemarks());
audit.setAuditId(tUser.getId());
}
//复审
if (AuditStatusEnum.TBCA.name().equals(audit.getLevel())) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment