Skip to content

A
amos-boot-biz
Commit 86704053 authored by tangwei's avatar tangwei
Browse files
Options

Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

parents b445c3a8 d45c4927
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/PlanAuditServiceImpl.java
View file @ 86704053
...@@ -141,8 +141,7 @@ public class PlanAuditServiceImpl implements IPlanAuditService { ...@@ -141,8 +141,7 @@ public class PlanAuditServiceImpl implements IPlanAuditService {
workflowExcuteService.setTaskAssign(instanceId, checkLeaderId); workflowExcuteService.setTaskAssign(instanceId, checkLeaderId);
} }
int status = statusEnum != null ? statusEnum.getNextStatus() : PlanStatusEnum.DRAFT.getValue(); int status = statusEnum != null ? statusEnum.getNextStatus() : PlanStatusEnum.DRAFT.getValue();
// bug 5139 if (nextCondition.equals(conditionValue) && PlanStatusEnum.EXAMINE_THREE.getNextStatus() == status) {
if (nextCondition.equals(conditionValue) && PlanStatusEnum.EXAMINE_DEVELOPED.getNextStatus() == status) {
status = PlanStatusEnum.IN_EXECUTION.getValue(); status = PlanStatusEnum.IN_EXECUTION.getValue();
} }
planDao.updatePlanStatus(status, plan.getId()); planDao.updatePlanStatus(status, plan.getId());
......
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