|
@@ -352,39 +352,6 @@ public class ReviewChecklistManage { |
|
|
return BizConst.OP_SUCCESS; |
|
|
return BizConst.OP_SUCCESS; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
* 查询 未审批人员 |
|
|
|
|
|
* @param projectCode |
|
|
|
|
|
* @return |
|
|
|
|
|
*/ |
|
|
|
|
|
public List<String> approveList(String projectCode) { |
|
|
|
|
|
List<String> reviewHumans = Lists.newArrayList();; |
|
|
|
|
|
if(BizConst.DEV.equals(active)){ |
|
|
|
|
|
reviewHumans = DeclaredProjectContant.ReviewChecklist.REVIEW_HUMANS_ZYD; |
|
|
|
|
|
}else{ |
|
|
|
|
|
reviewHumans = DeclaredProjectContant.ReviewChecklist.REVIEW_HUMANS_ZZD; |
|
|
|
|
|
} |
|
|
|
|
|
Set<String> computeHumanSet = reviewHumans.stream().collect(Collectors.toSet()); |
|
|
|
|
|
List<ReviewChecklistApprove> 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<String> employeeCodes = computeHumanSet.stream().collect(Collectors.toList()); |
|
|
|
|
|
List<UserFullInfoDTO> users = userInfoHelper.getUserFullInfoByEmployeeCodes(employeeCodes); |
|
|
|
|
|
if(CollUtil.isEmpty(users)){ |
|
|
|
|
|
return Collections.emptyList(); |
|
|
|
|
|
} |
|
|
|
|
|
return users.stream().map(UserFullInfoDTO::getUsername).collect(Collectors.toList()); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private List<ReviewChecklistModuleDto> convertModules(List<ReviewChecklistApprove> reviewChecklistApproves) { |
|
|
private List<ReviewChecklistModuleDto> convertModules(List<ReviewChecklistApprove> reviewChecklistApproves) { |
|
|
//做成map |
|
|
//做成map |
|
|
Map<String, List<ReviewChecklistApprove>> groupSubTitleMap = reviewChecklistApproves.stream() |
|
|
Map<String, List<ReviewChecklistApprove>> groupSubTitleMap = reviewChecklistApproves.stream() |
|
|