From e1e11abb43168c870124eb3ce4ca702b090275b5 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 27 Sep 2021 09:29:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E6=96=B0=E5=A2=9E=E9=83=A8=E9=97=A8=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/UserProjectResultServiceImpl.java     | 10 ++++++++++
 .../tduck/cloud/project/vo/ExportProjectResultVO.java  |  8 ++++++++
 .../cloud/project/vo/PrUserProjectResultExtDTO.java    |  4 ++--
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectResultServiceImpl.java b/tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectResultServiceImpl.java
index 564bdfc..4e2bd17 100644
--- a/tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectResultServiceImpl.java
+++ b/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<>();
diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/vo/ExportProjectResultVO.java b/tduck-project/src/main/java/com/tduck/cloud/project/vo/ExportProjectResultVO.java
index 88cb027..7f6056b 100644
--- a/tduck-project/src/main/java/com/tduck/cloud/project/vo/ExportProjectResultVO.java
+++ b/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("组织名称");
             }});
 
     /**
diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/vo/PrUserProjectResultExtDTO.java b/tduck-project/src/main/java/com/tduck/cloud/project/vo/PrUserProjectResultExtDTO.java
index d33c68a..f153dde 100644
--- a/tduck-project/src/main/java/com/tduck/cloud/project/vo/PrUserProjectResultExtDTO.java
+++ b/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 java.util.Date;
+import lombok.experimental.FieldNameConstants;
 
 
 /**
@@ -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;