From bde459401fb209d683d1cd46489c06828bb2028a Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Wed, 8 Nov 2023 17:59:01 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E5=AE=A1=E6=B8=85=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pmapi/projectdeclared/manage/ReviewChecklistManage.java | 8 ++++++-- .../com/ningdatech/pmapi/projectlib/model/entity/Project.java | 2 +- .../pmapi/projectlib/model/vo/ProjectReviewCheckListItemVO.java | 5 ++++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ReviewChecklistManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ReviewChecklistManage.java index 0c68178..67b704f 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ReviewChecklistManage.java +++ b/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 reviewChecklistApproves, - Map userMap) { + Map userMap,UserInfoDetails user) { List 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()); } }); diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/Project.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/Project.java index d446342..f681d4b 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/Project.java +++ b/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; } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectReviewCheckListItemVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectReviewCheckListItemVO.java index b35f39e..9e64f58 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectReviewCheckListItemVO.java +++ b/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;