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 extList = prUserProjectResultExtDao.selectResultExtList(request.getProjectKey()); + List> resultList = resultEntityList.stream().map(item -> { Map processData = item.getProcessData(); Iterator iterator = processData.keySet().iterator(); @@ -148,6 +150,14 @@ public class UserProjectResultServiceImpl extends ServiceImpl{ + 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 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;