活动报名人员导出参与时间段字段

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;
 }

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;
     }

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;