|
|
@@ -123,12 +123,12 @@ public class ResumptionServiceImpl implements ResumptionService {
|
|
|
if (sysResumption.getStatus() == 4) {
|
|
|
throw new RuntimeException("该任务已过期不能完成提交");
|
|
|
}
|
|
|
- if (ObjectUtil.equal(1, taskDetailVo.getSubType()) && ObjectUtil.notEqual(ResumptionStatus.NO_START.getCode(), sysResumption.getStatus())) {
|
|
|
+ if (ObjectUtil.equal(1, taskDetailVo.getSubType()) && ObjectUtil.notEqual(ResumptionStatus.NO_START.getCode(), sysResumption.getStatus())&&ObjectUtil.notEqual(ResumptionStatus.PROGRESS.getCode(), sysResumption.getStatus())) {
|
|
|
throw new RuntimeException("当前状态不允许修改,请退出当前页面后刷新重试!");
|
|
|
}
|
|
|
- if (ObjectUtil.equal(2, taskDetailVo.getSubType()) && ObjectUtil.notEqual(ResumptionStatus.NO_START.getCode(), sysResumption.getStatus()) && ObjectUtil.notEqual(ResumptionStatus.PROGRESS.getCode(), sysResumption.getStatus())) {
|
|
|
+ /*if (ObjectUtil.equal(2, taskDetailVo.getSubType()) && ObjectUtil.equal(ResumptionStatus.NO_START.getCode(), sysResumption.getStatus()) && ObjectUtil.notEqual(ResumptionStatus.PROGRESS.getCode(), sysResumption.getStatus())) {
|
|
|
throw new RuntimeException("当前状态不允许修改,请退出当前页面后刷新重试!");
|
|
|
- }
|
|
|
+ }*/
|
|
|
|
|
|
|
|
|
AppPlan appPlan = appPlanMapper.getById(sysResumption.getPlanId());
|