diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/contants/DeclaredProjectContant.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/contants/DeclaredProjectContant.java index c204970..53586ae 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/contants/DeclaredProjectContant.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/contants/DeclaredProjectContant.java @@ -44,9 +44,9 @@ public interface DeclaredProjectContant { "GE_573158a366554bdbb483f8f93d594bf7","GE_fe1cd568b453456ead00f471ecddf6a2","GE_fc1e28e29b5a4cf39c7b7c83278db6f4", "GE_16580afcdf7d4d379fd3690ba47f3b58","GE_9c901c85eaeb42abbb485b7aa4d4358f","GE_a4c2c56ed3204600805e0f7b7dca9044"); - public static final List REVIEW_HUMANS_ZYD = Lists.newArrayList("GE_dce116d65ffe48a3aee6c14c1c5a3031", - "GE_573158a366554bdbb483f8f93d594bf7","GE_fe1cd568b453456ead00f471ecddf6a2","GE_fc1e28e29b5a4cf39c7b7c83278db6f4", - "GE_16580afcdf7d4d379fd3690ba47f3b58","GE_9c901c85eaeb42abbb485b7aa4d4358f","GE_a4c2c56ed3204600805e0f7b7dca9044"); + public static final List REVIEW_HUMANS_ZYD = Lists.newArrayList("GE_6dc0e5a3513d41f684b6b01aeb94d887", + "GE_39be254f6cb84ad0b30c9bd5bda657d7","GE_051f5e34c0c4467b873cde517a21669b","GE_e68c7af513474eaa959b7ce7141a4d9f", + "GE_c3e4d8e8067b4fce91b28b570cffc67a","GE_809a061236b941d281446df6f14dc8f0","GE_6168943503de45919c42d46e05b24fa1"); public static final Integer INIT_NUM = 0; } } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/ReviewChecklistController.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/ReviewChecklistController.java index e5f5018..e2380bb 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/ReviewChecklistController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/ReviewChecklistController.java @@ -4,6 +4,7 @@ import com.ningdatech.basic.model.PageVo; import com.ningdatech.log.annotation.WebLog; import com.ningdatech.pmapi.projectdeclared.manage.ReviewChecklistManage; import com.ningdatech.pmapi.projectdeclared.model.dto.ReviewChecklistApproveDTO; +import com.ningdatech.pmapi.projectdeclared.model.vo.ReviewCheckInfoVO; import com.ningdatech.pmapi.projectdeclared.model.vo.ReviewChecklistApproveVO; import com.ningdatech.pmapi.projectlib.model.req.ProjectListReq; import com.ningdatech.pmapi.projectlib.model.vo.ProjectReviewCheckListItemVO; @@ -57,4 +58,11 @@ public class ReviewChecklistController { public String summary(@PathVariable String projectCode) { return reviewChecklistManage.summary(projectCode); } + + @ApiOperation(value = "项目审查清单 审批情况", notes = "项目审查清单 审批情况") + @PostMapping("/approve-list/{projectCode}") + @WebLog("项目审查清单 审批情况") + public List approveList(@PathVariable String projectCode) { + return reviewChecklistManage.approveList(projectCode); + } } 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 0006816..640efa6 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 @@ -21,6 +21,7 @@ import com.ningdatech.pmapi.datascope.utils.DataScopeUtil; import com.ningdatech.pmapi.projectdeclared.contants.DeclaredProjectContant; import com.ningdatech.pmapi.projectdeclared.model.dto.ReviewChecklistApproveDTO; import com.ningdatech.pmapi.projectdeclared.model.entity.ReviewChecklistApprove; +import com.ningdatech.pmapi.projectdeclared.model.vo.ReviewCheckInfoVO; import com.ningdatech.pmapi.projectdeclared.model.vo.ReviewChecklistApproveVO; import com.ningdatech.pmapi.projectdeclared.service.IReviewChecklistApproveService; import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum; @@ -317,7 +318,7 @@ public class ReviewChecklistManage { List reviewChecklistApproves = groupSubMap.get(vo.getSubTitle()); StringBuffer reviewCommentsSb = new StringBuffer(); if(CollUtil.isEmpty(reviewChecklistApproves)){ - vo.setReviewComments(reviewCommentsSb.toString()); + vo.setReviewComments("通过"); }else{ for(ReviewChecklistApprove approve : reviewChecklistApproves){ reviewCommentsSb.append(approve.getCreateBy() + StrPool.COLON + approve.getReviewComments() + "\n"); @@ -335,4 +336,9 @@ public class ReviewChecklistManage { return BizConst.OP_SUCCESS; } + + public List approveList(String projectCode) { + + return Collections.emptyList(); + } } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/ReviewCheckInfoVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/ReviewCheckInfoVO.java new file mode 100644 index 0000000..8c8cf5f --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/ReviewCheckInfoVO.java @@ -0,0 +1,37 @@ +package com.ningdatech.pmapi.projectdeclared.model.vo; + +import com.wflow.enums.ReviewChecklistResultEnum; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + * @Classname ReviewCheckInfoVO + * @Description + * @Date 2023/11/08 10:00 + * @Author PoffyZhang + */ +@ApiModel(value = "ReviewCheckInfoVO", description = "ReviewCheckInfoVO") +@Data +@AllArgsConstructor +public class ReviewCheckInfoVO { + + @ApiModelProperty("审批人名") + private String username; + + @ApiModelProperty("项目编号") + private String projectCode; + + @ApiModelProperty("员工号") + private String employeeCode; + + @ApiModelProperty("结果编号") + private Integer result; + + @ApiModelProperty("结果描述") + private String resultName; +}