评审清单

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ReviewChecklistManage.java

@@ -16,13 +16,12 @@ import com.ningdatech.basic.util.StrPool;
 import com.ningdatech.pmapi.common.constant.BizConst;
 import com.ningdatech.pmapi.common.constant.RegionConst;
 import com.ningdatech.pmapi.common.helper.RegionCacheHelper;
+import com.ningdatech.pmapi.common.helper.UserInfoHelper;
 import com.ningdatech.pmapi.datascope.model.DataScopeDTO;
 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;
 import com.ningdatech.pmapi.projectlib.helper.ProjectHelper;
@@ -35,12 +34,10 @@ import com.ningdatech.pmapi.user.security.auth.model.UserInfoDetails;
 import com.ningdatech.pmapi.user.util.LoginUserUtil;
 import com.wflow.bean.dto.FormsReviewChecklistDto;
 import com.wflow.bean.dto.ReviewChecklistModuleDto;
-import com.wflow.bean.dto.WflowFormsDto;
 import com.wflow.enums.ReviewChecklistResultEnum;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.dom4j.dtd.Decl;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import java.util.*;
@@ -66,6 +63,8 @@ public class ReviewChecklistManage {
 
     private final IReviewChecklistApproveService reviewChecklistApproveService;
 
+    private final UserInfoHelper userInfoHelper;
+
     public PageVo<ProjectReviewCheckListItemVO> projectLibList(ProjectListReq req) {
         LambdaQueryWrapper<Project> query = ProjectHelper.projectQuery(req);
         //项目查最新
@@ -353,7 +352,15 @@ public class ReviewChecklistManage {
         for(ReviewChecklistApprove approve : approves){
             computeHumanSet.remove(approve.getCreateByCode());
         }
-        return computeHumanSet.stream().collect(Collectors.toList());
+        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) {