Commit 0133756f authored by jiawei's avatar jiawei

bug fixed====>审核只要操作,就需要更新其它审核项表中的审核状态

parent f45ad58f
......@@ -168,9 +168,13 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
audit.setFirstRemarks("");
}
audit.setSecondRemarks("");
//初审驳回时,不做状态修改
//通过与不通过时 都修改
boolean updateRefItemByRefItemId = updateRefItemByRefItemId(audit);
int update = auditMapper.updateById(audit);
return update >= 1;
return updateRefItemByRefItemId && update >= 1;
//初审驳回时,不做状态修改
// int update = auditMapper.updateById(audit);
// return update >= 1;
}
/**
......@@ -187,13 +191,14 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
}
audit.setFirstRemarks("");
//复审通过时,
boolean updateRefItemByRefItemId = true;
if (AuditStatusEnum.APPROVED_FINAL.equals(auditStatusEnum)) {
//修改对应审核项中的信息
updateRefItemByRefItemId = updateRefItemByRefItemId(audit);
}
// boolean updateRefItemByRefItemId = true;
// if (AuditStatusEnum.APPROVED_FINAL.equals(auditStatusEnum)) {
// //修改对应审核项中的信息
// updateRefItemByRefItemId = updateRefItemByRefItemId(audit);
// }
//复审不通过时,不做状态修改
//通过与不通过时 都修改
boolean updateRefItemByRefItemId = updateRefItemByRefItemId(audit);
int update = auditMapper.updateById(audit);
return updateRefItemByRefItemId && update >= 1;
}
......@@ -239,6 +244,12 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
VideoContent videoContent = new VideoContent();
videoContent.setId(audit.getRefItemId());
videoContent.setAuditStatus(audit.getStatus());
//当审核级别为复审,审核状态为通过是,会修改审核项其它表中的 发布与删除字段,不是此情况下是直接修改审核状态
boolean continueFill = AuditStatusEnum.APPROVED_FINAL.name().equals(audit.getStatus()) &&
AuditStatusEnum.TBCA.name().equals(audit.getLevel());
if (!continueFill) {
return videoContent;
}
//
String operation = audit.getOperation();
AuditOperationEnum auditOperationEnum = AuditOperationEnum.valueOf(operation);
......@@ -275,6 +286,12 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
ExhibitionBoard exhibitionBoard = new ExhibitionBoard();
exhibitionBoard.setId(audit.getRefItemId());
exhibitionBoard.setAuditStatus(audit.getStatus());
//当审核级别为复审,审核状态为通过是,会修改审核项其它表中的 发布与删除字段,不是此情况下是直接修改审核状态
boolean continueFill = AuditStatusEnum.APPROVED_FINAL.name().equals(audit.getStatus()) &&
AuditStatusEnum.TBCA.name().equals(audit.getLevel());
if (!continueFill) {
return exhibitionBoard;
}
//
String operation = audit.getOperation();
AuditOperationEnum auditOperationEnum = AuditOperationEnum.valueOf(operation);
......@@ -311,6 +328,12 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
LearningContent learningContent = new LearningContent();
learningContent.setAuditStatus(audit.getStatus());
learningContent.setId(audit.getRefItemId());
//当审核级别为复审,审核状态为通过是,会修改审核项其它表中的 发布与删除字段,不是此情况下是直接修改审核状态
boolean continueFill = AuditStatusEnum.APPROVED_FINAL.name().equals(audit.getStatus()) &&
AuditStatusEnum.TBCA.name().equals(audit.getLevel());
if (!continueFill) {
return learningContent;
}
//
String operation = audit.getOperation();
AuditOperationEnum auditOperationEnum = AuditOperationEnum.valueOf(operation);
......
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