程序优化

tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectResultServiceImpl.java

@@ -40,6 +40,7 @@ import org.springframework.stereotype.Service;
 import java.io.File;
 import java.io.FileInputStream;
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import static com.tduck.cloud.project.constant.ProjectRedisKeyConstants.PROJECT_RESULT_NUMBER;
@@ -136,7 +137,7 @@ public class UserProjectResultServiceImpl extends ServiceImpl<UserProjectResultM
             throw new BaseException("此表单无有效反馈，不能导出");
         }
         List<PrUserProjectResultExtDTO> extList = prUserProjectResultExtDao.selectResultExtList(request.getProjectKey());
-
+        Map<String, PrUserProjectResultExtDTO> map = extList.stream().collect(Collectors.toMap(PrUserProjectResultExtDTO::getUserProjectResult, Function.identity()));
         List<Map<String, Object>> resultList = resultEntityList.stream().map(item -> {
             Map<String, Object> processData = item.getProcessData();
             Iterator<String> iterator = processData.keySet().iterator();
@@ -150,14 +151,13 @@ public class UserProjectResultServiceImpl extends ServiceImpl<UserProjectResultM
 
             processData.put(BaseEntity.Fields.createdTime, item.getCreatedTime());
             processData.put(UserProjectResultEntity.Fields.submitAddress, item.getSubmitAddress());
+            if (map.containsKey(item.getId())) {
+                processData.put(PrUserProjectResultExtDTO.Fields.realName, map.get(item.getId()).getRealName());
+                processData.put(PrUserProjectResultExtDTO.Fields.orgName, map.get(item.getId()).getOrgName());
+            } else {
                 processData.put(PrUserProjectResultExtDTO.Fields.realName, "");
                 processData.put(PrUserProjectResultExtDTO.Fields.orgName, "");
-            extList.forEach(e->{
-                if(e.getUserProjectResult().equals(item.getId())){
-                    processData.put(PrUserProjectResultExtDTO.Fields.realName, e.getRealName());
-                    processData.put(PrUserProjectResultExtDTO.Fields.orgName, e.getOrgName());
             }
-            });
             return processData;
         }).collect(Collectors.toList());
         List<ExportProjectResultVO.ExcelHeader> allHeaderList = new ArrayList<>();