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 29b7b6c..c04684a 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 @@ -59,11 +59,4 @@ 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 932e774..81b5574 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 @@ -352,39 +352,6 @@ public class ReviewChecklistManage { return BizConst.OP_SUCCESS; } - /** - * 查询 未审批人员 - * @param projectCode - * @return - */ - public List approveList(String projectCode) { - List reviewHumans = Lists.newArrayList();; - if(BizConst.DEV.equals(active)){ - reviewHumans = DeclaredProjectContant.ReviewChecklist.REVIEW_HUMANS_ZYD; - }else{ - reviewHumans = DeclaredProjectContant.ReviewChecklist.REVIEW_HUMANS_ZZD; - } - Set computeHumanSet = reviewHumans.stream().collect(Collectors.toSet()); - List approves = reviewChecklistApproveService.list(Wrappers.lambdaQuery(ReviewChecklistApprove.class) - .eq(ReviewChecklistApprove::getProjectCode, projectCode) - .orderByAsc(ReviewChecklistApprove::getCreateOn)); - if(CollUtil.isEmpty(approves)){ - return Collections.emptyList(); - } - for(ReviewChecklistApprove approve : approves){ - computeHumanSet.remove(approve.getCreateByCode()); - } - if(CollUtil.isEmpty(computeHumanSet)){ - return Collections.emptyList(); - } - List employeeCodes = computeHumanSet.stream().collect(Collectors.toList()); - List users = userInfoHelper.getUserFullInfoByEmployeeCodes(employeeCodes); - if(CollUtil.isEmpty(users)){ - return Collections.emptyList(); - } - return users.stream().map(UserFullInfoDTO::getUsername).collect(Collectors.toList()); - } - private List convertModules(List reviewChecklistApproves) { //做成map Map> groupSubTitleMap = reviewChecklistApproves.stream()