评审清单

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

@@ -120,14 +120,15 @@ public class ReviewChecklistManage {
             item.setApprovedAmount(w.getApprovalAmount());
             item.setAnnualPlanAmount(w.getAnnualPlanAmount());
             // 审查人员情况
-            item.setVerifiedHumans(computeVerify(item,approveMap.get(w.getProjectCode()),userMap));
+            item.setVerifiedHumans(computeVerify(item,approveMap.get(w.getProjectCode()),userMap,user));
+            item.setReviewCheckFinish(w.getReviewCheckFinish());
             return item;
         });
         return PageVo.of(records, page.getTotal());
     }
 
     private String computeVerify(ProjectReviewCheckListItemVO item,List<ReviewChecklistApprove> reviewChecklistApproves,
-                                 Map<String, String> userMap) {
+                                 Map<String, String> userMap,UserInfoDetails user) {
         List<String> reviewHumans = Lists.newArrayList();;
         if(BizConst.DEV.equals(active)){
             reviewHumans = DeclaredProjectContant.ReviewChecklist.REVIEW_HUMANS_ZYD;
@@ -148,6 +149,9 @@ public class ReviewChecklistManage {
                     computeHumanSet.contains(r.getCreateByCode())){
                 //说明 有指定人 审核过
                 finishNums[0]++;
+                if(StringUtils.isNotBlank(user.getEmployeeCode()) && user.getEmployeeCode().equals(r.getCreateByCode())){
+                    item.setApproved(Boolean.TRUE);
+                }
                 computeHumanSet.remove(r.getCreateByCode());
             }
         });

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/Project.java

@@ -562,6 +562,6 @@ public class Project implements Serializable {
     @ApiModelProperty("评审清单")
     private String reviewChecklist;
 
-    @ApiModelProperty("是否开启评审清单")
+    @ApiModelProperty("是否完成清单合并")
     private Boolean reviewCheckFinish;
 }

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectReviewCheckListItemVO.java

@@ -116,9 +116,12 @@ public class ProjectReviewCheckListItemVO {
     @JSONField(format = "yyyy-MM-dd")
     private LocalDateTime planAcceptanceTime;
 
-    @ApiModelProperty("是否开启评审清单")
+    @ApiModelProperty("是否完成评审清单合并")
     private Boolean reviewCheckFinish;
 
+    @ApiModelProperty("当前人 是否审批")
+    private Boolean approved = Boolean.FALSE;
+
     @ApiModelProperty("未审批人员")
     private String reviewCheckNotApprove;