From 7ccd651c142500007ac81c9cc588b6c2f8a19478 Mon Sep 17 00:00:00 2001
From: liuchuang <123456>
Date: Wed, 15 Sep 2021 17:59:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=8A=A5=E5=90=8D=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E5=AF=BC=E5=87=BA=E5=8F=82=E4=B8=8E=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=AE=B5=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../result/ActUserRelationResultDTO.java      |  5 +++++
 .../controller/ActUserRelationController.java | 19 +++++++++++++++++++
 .../activity/excel/ActUserRelationExcel.java  |  3 +++
 3 files changed, 27 insertions(+)

diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActUserRelationResultDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActUserRelationResultDTO.java
index 78ffbf31..4afdfdbc 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActUserRelationResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActUserRelationResultDTO.java
@@ -132,4 +132,9 @@ public class ActUserRelationResultDTO implements Serializable {
      * 活动详细时间段
      */
     private List<ActPeriodDTO> periods;
+
+    /**
+     * 活动详细时间段拼接字符串
+     */
+    private String actPeriodStr;
 }
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActUserRelationController.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActUserRelationController.java
index ac5f97e2..33388888 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActUserRelationController.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActUserRelationController.java
@@ -17,10 +17,13 @@
 
 package com.elink.esua.epdc.modules.activity.controller;
 
+import cn.hutool.core.collection.CollectionUtil;
+import com.elink.esua.epdc.activity.ActPeriodDTO;
 import com.elink.esua.epdc.activity.ActUserRelationDTO;
 import com.elink.esua.epdc.activity.form.ActUserRelationAuditFormDTO;
 import com.elink.esua.epdc.activity.result.ActUserRelationResultDTO;
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.DateUtils;
 import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
@@ -138,6 +141,22 @@ public class ActUserRelationController {
             } else if ("6".equals(sourceList.get(i).getStatus())){
                 sourceList.get(i).setStatus("拒绝加积分");
             }
+
+            List<ActPeriodDTO> periods = sourceList.get(i).getPeriods();
+            if (CollectionUtil.isNotEmpty(periods)) {
+                StringBuilder stringBuilder = new StringBuilder();
+                for (int j=0; j<periods.size(); j++) {
+                    String actPeriodStartTime = DateUtils.format(periods.get(j).getActPeriodStartTime(), DateUtils.DATE_TIME_PATTERN);
+                    stringBuilder.append(actPeriodStartTime);
+                    stringBuilder.append(" 至 ");
+                    String actPeriodEndTime = DateUtils.format(periods.get(j).getActPeriodEndTime(), DateUtils.DATE_TIME_PATTERN);
+                    stringBuilder.append(actPeriodEndTime);
+                    if (j != periods.size()-1) {
+                        stringBuilder.append("、");
+                    }
+                }
+                sourceList.get(i).setActPeriodStr(stringBuilder.toString());
+            }
         }
         return sourceList;
     }
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/excel/ActUserRelationExcel.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/excel/ActUserRelationExcel.java
index 2d9de806..d947e040 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/excel/ActUserRelationExcel.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/excel/ActUserRelationExcel.java
@@ -49,6 +49,9 @@ public class ActUserRelationExcel {
     @Excel(name = "报名时间")
     private String signupTimeString;
 
+    @Excel(name = "活动参与时间")
+    private String actPeriodStr;
+
     @Excel(name = "状态")
     private String status;