浏览代码

评审清单

tags/24080901
PoffyZhang 1年前
父节点
当前提交
600f142986
共有 2 个文件被更改,包括 0 次插入40 次删除
  1. +0
    -7
      pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/ReviewChecklistController.java
  2. +0
    -33
      pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ReviewChecklistManage.java

+ 0
- 7
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<String> approveList(@PathVariable String projectCode) {
return reviewChecklistManage.approveList(projectCode);
}
}

+ 0
- 33
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<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) {
//做成map
Map<String, List<ReviewChecklistApprove>> groupSubTitleMap = reviewChecklistApproves.stream()


正在加载...
取消
保存