审查清单 枚举匹配

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ReviewChecklistManage.java

@@ -137,27 +137,29 @@ public class ReviewChecklistManage {
         }
 
         Integer maxNums = reviewHumans.size();
-        final Integer[] finishNums = {DeclaredProjectContant.ReviewChecklist.INIT_NUM};
+        Integer finishNums = 0;
         Set<String> computeHumanSet = reviewHumans.stream().collect(Collectors.toSet());
 
         if(CollUtil.isEmpty(reviewChecklistApproves)){
             item.setReviewCheckNotApprove(convertUser(userMap,computeHumanSet));
-            return finishNums[0] + StrPool.SLASH + maxNums;
+            return finishNums + StrPool.SLASH + maxNums;
         }
-        reviewChecklistApproves.forEach(r -> {
-            if(StringUtils.isNotBlank(r.getCreateByCode()) ||
-                    computeHumanSet.contains(r.getCreateByCode())){
-                //说明 有指定人 审核过
-                finishNums[0]++;
-                if(StringUtils.isNotBlank(user.getEmployeeCode()) && user.getEmployeeCode().equals(r.getCreateByCode())){
+        for(ReviewChecklistApprove approve : reviewChecklistApproves){
+            if(StringUtils.isNotBlank(approve.getCreateByCode()) ||
+                    computeHumanSet.contains(approve.getCreateByCode())){
+                if(StringUtils.isNotBlank(user.getEmployeeCode()) &&
+                        user.getEmployeeCode().equals(approve.getCreateByCode())){
                     item.setApproved(Boolean.TRUE);
                 }
-                computeHumanSet.remove(r.getCreateByCode());
+                if(computeHumanSet.remove(approve.getCreateByCode())){
+                    //说明 有指定人 审核过
+                    finishNums++;
+                }
             }
-        });
+        }
         item.setReviewCheckNotApprove(convertUser(userMap,computeHumanSet));
 
-        return finishNums[0] + StrPool.SLASH + maxNums;
+        return finishNums + StrPool.SLASH + maxNums;
     }
 
     private String convertUser(Map<String, String> userMap, Set<String> computeHumanSet) {