数据统计导出新增部门字段

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

@@ -135,6 +135,8 @@ public class UserProjectResultServiceImpl extends ServiceImpl<UserProjectResultM
         if (CollectionUtil.isEmpty(resultEntityList)) {
             throw new BaseException("此表单无有效反馈，不能导出");
         }
+        List<PrUserProjectResultExtDTO> extList = prUserProjectResultExtDao.selectResultExtList(request.getProjectKey());
+
         List<Map<String, Object>> resultList = resultEntityList.stream().map(item -> {
             Map<String, Object> processData = item.getProcessData();
             Iterator<String> iterator = processData.keySet().iterator();
@@ -148,6 +150,14 @@ public class UserProjectResultServiceImpl extends ServiceImpl<UserProjectResultM
 
             processData.put(BaseEntity.Fields.createdTime, item.getCreatedTime());
             processData.put(UserProjectResultEntity.Fields.submitAddress, item.getSubmitAddress());
+            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<>();

tduck-project/src/main/java/com/tduck/cloud/project/vo/ExportProjectResultVO.java

@@ -36,6 +36,14 @@ public class ExportProjectResultVO {
             new ExcelHeader() {{
                 setFieldKey(UserProjectResultEntity.Fields.submitAddress);
                 setTitle("提交地址");
+            }},
+            new ExcelHeader() {{
+                setFieldKey(PrUserProjectResultExtDTO.Fields.realName);
+                setTitle("填写人姓名");
+            }},
+            new ExcelHeader() {{
+                setFieldKey(PrUserProjectResultExtDTO.Fields.orgName);
+                setTitle("组织名称");
             }});
 
     /**

tduck-project/src/main/java/com/tduck/cloud/project/vo/PrUserProjectResultExtDTO.java

@@ -18,8 +18,7 @@
 package com.tduck.cloud.project.vo;
 
 import lombok.Data;
-
+import lombok.experimental.FieldNameConstants;
-import java.util.Date;
 
 
 /**
@@ -29,6 +28,7 @@ import java.util.Date;
  * @since v1.0.0 2021-09-17
  */
 @Data
+@FieldNameConstants
 public class PrUserProjectResultExtDTO {
 
     private static final long serialVersionUID = 1L;