|
|
@@ -689,8 +689,9 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
|
|
|
|
|
|
// if (ObjectUtil.isNull(task.getGrantUserId())) {
|
|
|
Long canGrantCount = tasks.stream()
|
|
|
- .filter(t -> !ObjectUtil.equal(t.getStatus(), SafetyCheckTaskStatus.Completed.getValue()) &&
|
|
|
- ObjectUtil.notEqual(t.getStatus(),SafetyCheckTaskStatus.OverDue.getValue()))
|
|
|
+ .filter(t -> ObjectUtil.notEqual(t.getStatus(), SafetyCheckTaskStatus.Completed.getValue()) &&
|
|
|
+ ObjectUtil.notEqual(t.getStatus(),SafetyCheckTaskStatus.OverDue.getValue()) &&
|
|
|
+ (ObjectUtil.isNull(t.getGrantUserId()) || ObjectUtil.equal(t.getId(),dto.getTaskId())))
|
|
|
.count();
|
|
|
Long selfCompletedCount = tasks.stream()
|
|
|
.filter(t -> ObjectUtil.equal(t.getStatus(), SafetyCheckTaskStatus.Completed.getValue()) && ObjectUtil.isNull(t.getGrantUserId()))
|