|
|
@@ -444,10 +444,10 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
|
|
|
}
|
|
|
if (!isNewTask) {
|
|
|
CoreSafetyTask safetyTask = getById(data.getId());
|
|
|
- if (ObjectUtil.equal(data.getIsSubmit(), 0) && ObjectUtil.notEqual(safetyTask.getStatus(), SafetyCheckTaskStatus.Waiting.getValue())) {
|
|
|
+ if (ObjectUtil.equal(data.getIsSubmit(), 0) && ObjectUtil.equal(safetyTask.getStatus(), SafetyCheckTaskStatus.Completed.getValue())) {
|
|
|
throw new ServiceException("当前状态不允许修改,请退出当前页面后刷新重试!");
|
|
|
}
|
|
|
- if (ObjectUtil.equal(data.getIsSubmit(), 1) && ObjectUtil.notEqual(safetyTask.getStatus(), SafetyCheckTaskStatus.UnderWay.getValue())) {
|
|
|
+ if (ObjectUtil.equal(data.getIsSubmit(), 1) && ObjectUtil.equal(safetyTask.getStatus(), SafetyCheckTaskStatus.Completed.getValue())) {
|
|
|
throw new ServiceException("当前状态不允许修改,请退出当前页面后刷新重试!");
|
|
|
}
|
|
|
|