Commit 4ae472f5 authored by wzp's avatar wzp

修改bug

parent 307725e5
...@@ -88,32 +88,42 @@ public class AuditController extends BaseController { ...@@ -88,32 +88,42 @@ public class AuditController extends BaseController {
@ApiOperation(value = "修改禁用审核信息", notes = "修改禁用审核信息") @ApiOperation(value = "修改禁用审核信息", notes = "修改禁用审核信息")
public Map<String, Object> updateAudit(@RequestBody @Validated(value = {Update.class}) Audit audit) { public Map<String, Object> updateAudit(@RequestBody @Validated(value = {Update.class}) Audit audit) {
boolean flag; boolean flag;
if (AuditStatusEnum.APPROVED_FINAL.name().equals(audit.getStatus())&&AuditStatusEnum.TBC.name().equals(audit.getLevel())) { //如果当前审核状态为通过,并且审核层级为初审
if (AuditStatusEnum.APPROVED_FINAL.name().equals(audit.getStatus()) && AuditStatusEnum.TBC.name().equals(audit.getLevel())) {
//初审通过,提交复审,设置层级为复审
audit.setLevel(AuditStatusEnum.TBCA.name()); audit.setLevel(AuditStatusEnum.TBCA.name());
audit.setStatus(AuditStatusEnum.TBCA.name()); audit.setStatus(AuditStatusEnum.TBCA.name());
} }
//如果层级是初审,设置初审时间
if (AuditStatusEnum.TBC.name().equals(audit.getLevel())) { if (AuditStatusEnum.TBC.name().equals(audit.getLevel())) {
audit.setFirstTime(LocalDateTime.now()); audit.setFirstTime(LocalDateTime.now());
//如果审核状态不是驳回,清空驳回原因
if (!AuditStatusEnum.REFUSED.name().equals(audit.getStatus())) { if (!AuditStatusEnum.REFUSED.name().equals(audit.getStatus())) {
audit.setFirstRemarks(""); audit.setFirstRemarks("");
} }
}else{ } else {
//如果层级是复审,设置复审时间
audit.setSecondTime(LocalDateTime.now()); audit.setSecondTime(LocalDateTime.now());
//如果审核状态不是驳回,清空驳回原因
if (!AuditStatusEnum.REFUSED.name().equals(audit.getStatus())) { if (!AuditStatusEnum.REFUSED.name().equals(audit.getStatus())) {
audit.setSecondRemarks(""); audit.setSecondRemarks("");
} }
} }
try { try {
//如果类型是用户禁用审核
if (AuditTypeEnum.ACCOUNT.name().equals(audit.getType())) { if (AuditTypeEnum.ACCOUNT.name().equals(audit.getType())) {
Audit audit1 = auditService.getById(audit.getId()); Audit audit1 = auditService.getById(audit.getId());
//设置用户原始数据状态
TUser user = new TUser(); TUser user = new TUser();
user.setId(audit1.getRefItemId()); user.setId(audit1.getRefItemId());
user.setAuditStatus(audit.getStatus()); user.setAuditStatus(audit.getStatus());
//如果复审通过,真正禁用用户
if (AuditStatusEnum.APPROVED_FINAL.name().equals(audit.getStatus())) { if (AuditStatusEnum.APPROVED_FINAL.name().equals(audit.getStatus())) {
user.setStatus(AuditOperationEnum.DISABLE.name()); user.setStatus(AuditOperationEnum.DISABLE.name());
} }
userService.updateById(user); userService.updateById(user);
} }
//更新审核数据
flag = auditService.updateById(audit); flag = auditService.updateById(audit);
if (!flag) { if (!flag) {
return getFailResult(); return getFailResult();
...@@ -191,7 +201,12 @@ public class AuditController extends BaseController { ...@@ -191,7 +201,12 @@ public class AuditController extends BaseController {
Audit audit = new Audit(); Audit audit = new Audit();
UpdateWrapper<Audit> wrapper = new UpdateWrapper<>(); UpdateWrapper<Audit> wrapper = new UpdateWrapper<>();
wrapper.eq("ref_item_id", id); wrapper.eq("ref_item_id", id);
audit = auditService.getOne(wrapper); wrapper.orderByDesc("create_time");
//只获取最新的一条审核数据
List<Audit> list = auditService.list(wrapper);
if (list.size()>0){
audit=list.get(0);
}
resultMap.put("resultCode", "200"); resultMap.put("resultCode", "200");
resultMap.put("message", "操作成功"); resultMap.put("message", "操作成功");
resultMap.put("data", audit); resultMap.put("data", audit);
......
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