Commit 634f2036 authored by 刘林's avatar 刘林

fix(JG):撤回添加状态校验

parent 2f0d62f1
...@@ -783,7 +783,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN ...@@ -783,7 +783,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
String expectedStatus = String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()); String expectedStatus = String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode());
// 检查实际状态是否不等于期望状态 // 检查实际状态是否不等于期望状态
if (!expectedStatus.equals(jgInstallationNotice.getNoticeStatus())) { if (!expectedStatus.equals(jgInstallationNotice.getNoticeStatus())) {
throw new BadRequest("当前业务状态不是待处理状态,请刷新页面后重试操作!"); throw new BadRequest("当前业务状态不是待处理状态,请重新打开页面后操作!");
} }
ProcessTaskDTO processTaskDTO = iCmWorkflowService.rollBack(jgInstallationNotice.getInstanceId()); ProcessTaskDTO processTaskDTO = iCmWorkflowService.rollBack(jgInstallationNotice.getInstanceId());
......
...@@ -679,7 +679,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto ...@@ -679,7 +679,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
String expectedStatus = String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()); String expectedStatus = String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode());
// 检查实际状态是否不等于期望状态 // 检查实际状态是否不等于期望状态
if (!expectedStatus.equals(jgMaintainNotice.getNoticeStatus())) { if (!expectedStatus.equals(jgMaintainNotice.getNoticeStatus())) {
throw new BadRequest("当前业务状态不是待处理状态,请刷新页面后重试操作!"); throw new BadRequest("当前业务状态不是待处理状态,请重新打开页面后操作!");
} }
ProcessTaskDTO processTaskDTO = cmWorkflowService.rollBack(jgMaintainNotice.getInstanceId()); ProcessTaskDTO processTaskDTO = cmWorkflowService.rollBack(jgMaintainNotice.getInstanceId());
// 提取节点等信息 // 提取节点等信息
......
...@@ -642,7 +642,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg ...@@ -642,7 +642,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
String expectedStatus = String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()); String expectedStatus = String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode());
// 检查实际状态是否不等于期望状态 // 检查实际状态是否不等于期望状态
if (!expectedStatus.equals(notice.getNoticeStatus())) { if (!expectedStatus.equals(notice.getNoticeStatus())) {
throw new BadRequest("当前业务状态不是待处理状态,请刷新页面后重试操作!"); throw new BadRequest("当前业务状态不是待处理状态,请重新打开页面后操作!");
} }
// 回滚工作流 // 回滚工作流
ProcessTaskDTO processTaskDTO = cmWorkflowService.rollBack(noticeDto.getInstanceId()); ProcessTaskDTO processTaskDTO = cmWorkflowService.rollBack(noticeDto.getInstanceId());
......
...@@ -616,7 +616,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto ...@@ -616,7 +616,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
String expectedStatus = String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()); String expectedStatus = String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode());
// 检查实际状态是否不等于期望状态 // 检查实际状态是否不等于期望状态
if (!expectedStatus.equals(jgInstallationNotice.getNoticeStatus())) { if (!expectedStatus.equals(jgInstallationNotice.getNoticeStatus())) {
throw new BadRequest("当前业务状态不是待处理状态,请刷新页面后重试操作!"); throw new BadRequest("当前业务状态不是待处理状态,请重新打开页面后操作!");
} }
ProcessTaskDTO processTaskDTO = iCmWorkflowService.rollBack(jgInstallationNotice.getInstanceId()); ProcessTaskDTO processTaskDTO = iCmWorkflowService.rollBack(jgInstallationNotice.getInstanceId());
......
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